Rev 2474: [merge] bugfix for bug #111288, resolve conflicts. in http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/dirstate_fixes
John Arbash Meinel
john at arbash-meinel.com
Mon Apr 30 18:45:26 BST 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/dirstate_fixes
------------------------------------------------------------
revno: 2474
revision-id: john at arbash-meinel.com-20070430174510-qdteh5dy45gbj785
parent: john at arbash-meinel.com-20070430174107-jec5pf7b63kc2uj9
parent: john at arbash-meinel.com-20070430173412-538b3mvbh9b8db8l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_fixes
timestamp: Mon 2007-04-30 12:45:10 -0500
message:
[merge] bugfix for bug #111288, resolve conflicts.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2472.1.2
merged: john at arbash-meinel.com-20070430173412-538b3mvbh9b8db8l
parent: john at arbash-meinel.com-20070430172939-hvjgsm1pinoawdy5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: renamed_file_111288
timestamp: Mon 2007-04-30 12:34:12 -0500
message:
Now that finding a file on disk which doesn't match
the dirblock doesn't claim 'path_handled', it is identical
to the case when the dirblock entry is marked as 'a' or 'r'.
So remove the extra else clause for simplicity.
------------------------------------------------------------
revno: 2472.1.1
merged: john at arbash-meinel.com-20070430172939-hvjgsm1pinoawdy5
parent: pqm at pqm.ubuntu.com-20070430083158-pitv7lbgdu0q8g6h
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: renamed_file_111288
timestamp: Mon 2007-04-30 12:29:39 -0500
message:
Fix bug #111288. When we don't have a match
don't consider the disk file processed. Because we need to
emit an 'unknown' record for it.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2007-04-30 17:05:41 +0000
+++ b/NEWS 2007-04-30 17:45:10 +0000
@@ -1,5 +1,5 @@
IN DEVELOPMENT
-
+
BUGFIXES:
* Handle when you have 2 directories with similar names, but one has a
@@ -8,6 +8,10 @@
``'abc-2'``, but ``('abc', 'a')`` sorts before ``('abc-2',)``.
(John Arbash Meinel, #111227)
+ * Handle when someone renames a file on disk without telling bzr.
+ Previously we would report the first file as missing, but not show
+ the new unknown file. (John Arbash Meinel, #111288)
+
bzr 0.16rc2 2007-04-30
BUGFIXES:
=== modified file 'bzrlib/tests/intertree_implementations/test_compare.py'
--- a/bzrlib/tests/intertree_implementations/test_compare.py 2007-04-30 17:05:41 +0000
+++ b/bzrlib/tests/intertree_implementations/test_compare.py 2007-04-30 17:45:10 +0000
@@ -1399,3 +1399,34 @@
self.assertEqual(expected,
self.do_iter_changes(tree1, tree2,
want_unversioned=True))
+
+ def test_renamed_and_unknown(self):
+ """A file was moved on the filesystem, but not in bzr."""
+ tree1 = self.make_branch_and_tree('tree1')
+ tree2 = self.make_to_branch_and_tree('tree2')
+ root_id = tree1.get_root_id()
+ tree2.set_root_id(root_id)
+
+ # The final changes are:
+ # bzr add a b
+ # mv a a2
+
+ self.build_tree_contents([
+ ('tree1/a', 'a contents\n'),
+ ('tree1/b', 'b contents\n'),
+ ('tree2/a', 'a contents\n'),
+ ('tree2/b', 'b contents\n'),
+ ])
+ tree1.add(['a', 'b'], ['a-id', 'b-id'])
+ tree2.add(['a', 'b'], ['a-id', 'b-id'])
+ os.rename('tree2/a', 'tree2/a2')
+
+ tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
+
+ expected = sorted([
+ self.missing('a-id', 'a', 'a', tree2.get_root_id(), 'file'),
+ self.unversioned(tree2, 'a2'),
+ ])
+ self.assertEqual(expected,
+ self.do_iter_changes(tree1, tree2,
+ want_unversioned=True))
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2007-04-30 17:05:41 +0000
+++ b/bzrlib/workingtree_4.py 2007-04-30 17:45:10 +0000
@@ -2256,7 +2256,13 @@
result[6],
result[7],
)
- elif current_entry[0][1] != current_path_info[1]:
+ elif (current_entry[0][1] != current_path_info[1]
+ or current_entry[1][target_index][0] in 'ar'):
+ # The current path on disk doesn't match the dirblock
+ # record. Either the dirblock is marked as absent, or
+ # the file on disk is not present at all in the
+ # dirblock. Either way, report about the dirblock
+ # entry, and let other code handle the filesystem one.
if current_path_info[1].split('/') < current_entry[0][1].split('/'):
# extra file on disk: pass for now, but only
# increment the path, not the entry
@@ -2268,7 +2274,6 @@
# this check should probably be outside the loop: one
# 'iterate two trees' api, and then _iter_changes filters
# unchanged pairs. - RBC 20070226
- path_handled = True
if (include_unchanged
or result[2] # content change
or result[3][0] != result[3][1] # versioned status
@@ -2289,33 +2294,6 @@
result[7],
)
advance_path = False
- elif current_entry[1][target_index][0] in 'ar':
- # The path matches, but the current entry is marked as
- # not being here. So we don't want to consider this
- # as a match. We still need to process the current
- # entry, though.
- advance_path = False
- path_handled = False
- for result in _process_entry(current_entry, None):
- if (include_unchanged
- or result[2] # content change
- or result[3][0] != result[3][1] # versioned status
- or result[4][0] != result[4][1] # parent id
- or result[5][0] != result[5][1] # name
- or result[6][0] != result[6][1] # kind
- or result[7][0] != result[7][1] # executable
- ):
- yield (result[0],
- (utf8_decode_or_none(result[1][0]),
- utf8_decode_or_none(result[1][1])),
- result[2],
- result[3],
- result[4],
- (utf8_decode_or_none(result[5][0]),
- utf8_decode_or_none(result[5][1])),
- result[6],
- result[7],
- )
else:
for result in _process_entry(current_entry, current_path_info):
# this check should probably be outside the loop: one
More information about the bazaar-commits
mailing list