Rev 2337: Merge dirstate2. in file:///home/robertc/source/baz/pathinfo/
Robert Collins
robertc at robertcollins.net
Tue Mar 13 03:20:07 GMT 2007
At file:///home/robertc/source/baz/pathinfo/
------------------------------------------------------------
revno: 2337
revision-id: robertc at robertcollins.net-20070313032004-x4arzbpo07l320r6
parent: robertc at robertcollins.net-20070313031105-75igf0l5dzw6bhq7
parent: robertc at robertcollins.net-20070313025234-3jhyogdj37n36heo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pathinfo
timestamp: Tue 2007-03-13 14:20:04 +1100
message:
Merge dirstate2.
modified:
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2326.1.8
merged: robertc at robertcollins.net-20070313025234-3jhyogdj37n36heo
parent: robertc at robertcollins.net-20070312052908-h1rm7g7pnr5zegio
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate2
timestamp: Tue 2007-03-13 13:52:34 +1100
message:
Start a dedicated low level iterator function in dirstate.
------------------------------------------------------------
revno: 2326.1.7
merged: robertc at robertcollins.net-20070312052908-h1rm7g7pnr5zegio
parent: robertc at robertcollins.net-20070312035424-swyf5foev6otm12f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate2
timestamp: Mon 2007-03-12 16:29:08 +1100
message:
Move is_ignored processing into _iter_changes, allowing optional lookup of unexpected files.
------------------------------------------------------------
revno: 2326.1.6
merged: robertc at robertcollins.net-20070312035424-swyf5foev6otm12f
parent: robertc at robertcollins.net-20070310045030-gse5bj0dshxlfgox
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate2
timestamp: Mon 2007-03-12 14:54:24 +1100
message:
Rename want_unversioned to want_unknown for InterTree.compare.
=== modified file 'bzrlib/delta.py'
--- a/bzrlib/delta.py 2007-03-06 21:45:51 +0000
+++ b/bzrlib/delta.py 2007-03-12 03:54:24 +0000
@@ -211,7 +211,7 @@
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
include_root, extra_trees=None,
- want_unversioned=False):
+ want_unknown=False):
"""Worker function that implements Tree.changes_from."""
delta = TreeDelta()
# mutter('start compare_trees')
@@ -219,7 +219,7 @@
for (file_id, path, content_change, versioned, parent_id, name, kind,
executable) in new_tree._iter_changes(old_tree, want_unchanged,
specific_files, extra_trees=extra_trees,
- want_unversioned=want_unversioned):
+ want_unknown=want_unknown):
if versioned == (False, False):
delta.unversioned.append((path[1], None, kind[1]))
continue
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py 2007-03-10 04:50:30 +0000
+++ b/bzrlib/dirstate.py 2007-03-13 02:52:34 +0000
@@ -1451,6 +1451,26 @@
raise Exception("can't pack %s" % inv_entry)
return (minikind, fingerprint, size, executable, tree_data)
+ def iter_dirs_in_trees(self, paths, trees):
+ """Iterate over directories selected by paths in some trees.
+
+ :return: An iterator that yields (full-dir, iterator-of-dir-contents)
+ items. full-dir is a boolean flag indicating whether the directory
+ is being returned because the entire directory was selected in the
+ current working tree (index 0), or because some files within it
+ were selected (from any number of trees). Each directory name *may*
+ be returned more than once, because there may be multiple parent
+ ids for the directory, but if this occurs, the iterator will return
+ partitioned output. Each path-id combination is thus only ever
+ output once.
+ """
+ self._read_dirblocks_if_needed()
+ for block in self._dirblocks:
+ if block[0] == '' and block[1] and block[1][0][0][1] == '':
+ yield (False, block)
+ else:
+ yield (True, block)
+
def _iter_entries(self):
"""Iterate over all the entries in the dirstate.
=== modified file 'bzrlib/status.py'
--- a/bzrlib/status.py 2007-03-05 03:10:21 +0000
+++ b/bzrlib/status.py 2007-03-12 05:29:08 +0000
@@ -144,18 +144,13 @@
_raise_if_nonexistent(specific_files, old, new)
if short:
changes = new._iter_changes(old, show_unchanged, specific_files,
- require_versioned=False, want_unversioned=True)
- reporter = _mod_delta.ChangeReporter(output_file=to_file,
- unversioned_filter=new.is_ignored)
+ require_versioned=False, want_unknown=True)
+ reporter = _mod_delta.ChangeReporter(output_file=to_file)
_mod_delta.report_changes(changes, reporter)
else:
delta = new.changes_from(old, want_unchanged=show_unchanged,
specific_files=specific_files,
- want_unversioned=True)
- # filter out unknown files. We may want a tree method for
- # this
- delta.unversioned = [unversioned for unversioned in
- delta.unversioned if not new.is_ignored(unversioned[0])]
+ want_unknown=True)
delta.show(to_file,
show_ids=show_ids,
show_unchanged=show_unchanged,
=== modified file 'bzrlib/tests/intertree_implementations/test_compare.py'
--- a/bzrlib/tests/intertree_implementations/test_compare.py 2007-03-09 01:52:01 +0000
+++ b/bzrlib/tests/intertree_implementations/test_compare.py 2007-03-12 05:29:08 +0000
@@ -297,7 +297,7 @@
specific_files=['d'],
require_versioned=True)
- def test_default_ignores_unversioned_files(self):
+ def test_default_ignores_unknown_files(self):
tree1 = self.make_branch_and_tree('tree1')
tree2 = self.make_to_branch_and_tree('tree2')
tree2.set_root_id(tree1.get_root_id())
@@ -316,7 +316,7 @@
self.assertEqual([], d.unchanged)
self.assertEqual([], d.unversioned)
- def test_unversioned_paths_in_tree(self):
+ def test_unknown_paths_in_tree(self):
tree1 = self.make_branch_and_tree('tree1')
tree2 = self.make_to_branch_and_tree('tree2')
tree2.set_root_id(tree1.get_root_id())
@@ -327,7 +327,7 @@
# except ???:
# links_supported = False
tree1, tree2 = self.mutable_trees_to_test_trees(tree1, tree2)
- d = self.intertree_class(tree1, tree2).compare(want_unversioned=True)
+ d = self.intertree_class(tree1, tree2).compare(want_unknown=True)
self.assertEqual([], d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
@@ -476,8 +476,8 @@
(parent, parent), (name, name), (kind, kind),
(executable, executable))
- def unversioned(self, tree, path):
- """Create an unversioned result."""
+ def unknown(self, tree, path):
+ """Create an unknown result."""
_, basename = os.path.split(path)
kind = file_kind(tree.abspath(path))
return (None, (None, path), True, (False, False), (None, None),
@@ -766,13 +766,13 @@
self.addCleanup(tree2.unlock)
# this should filter correctly from above
self.assertEqual([self.added(tree2, 'subtree-id')],
- self.do_iter_changes(tree1, tree2, want_unversioned=True))
+ self.do_iter_changes(tree1, tree2, want_unknown=True))
# and when the path is named
self.assertEqual([self.added(tree2, 'subtree-id')],
self.do_iter_changes(tree1, tree2, specific_files=['sub'],
- want_unversioned=True))
+ want_unknown=True))
- def test_default_ignores_unversioned_files(self):
+ def test_default_ignores_unknown_files(self):
tree1 = self.make_branch_and_tree('tree1')
tree2 = self.make_to_branch_and_tree('tree2')
tree2.set_root_id(tree1.get_root_id())
@@ -788,14 +788,39 @@
self.addCleanup(tree2.unlock)
# We should ignore the fact that 'b' exists in tree-2
- # because the want_unversioned parameter was not given.
+ # because the want_unknown parameter was not given.
expected = sorted([
self.content_changed(tree2, 'a-id'),
self.content_changed(tree2, 'c-id'),
])
self.assertEqual(expected, self.do_iter_changes(tree1, tree2))
- def test_unversioned_paths_in_tree(self):
+ def test_ignores_filters_unknown_paths_in_tree(self):
+ tree1 = self.make_branch_and_tree('tree1')
+ tree2 = self.make_to_branch_and_tree('tree2')
+ self.build_tree(['tree2/file', 'tree2/dir/'])
+ self.build_tree_contents([('tree1/.bzrignore', 'file\n')])
+ self.build_tree_contents([('tree2/.bzrignore', 'file\n')])
+ tree1.add(['.bzrignore'], ['ignore-id'])
+ tree2.add(['.bzrignore'], ['ignore-id'])
+ tree1.set_root_id(tree2.path2id(''))
+ tree1, tree2 = self.mutable_trees_to_test_trees(tree1, tree2)
+ tree1.lock_read()
+ self.addCleanup(tree1.unlock)
+ tree2.lock_read()
+ self.addCleanup(tree2.unlock)
+ expected = [
+ self.unknown(tree2, 'dir'),
+ ]
+ specific_files=['file', 'dir']
+ expected = sorted(expected)
+ self.assertEqual(expected, self.do_iter_changes(tree1, tree2,
+ require_versioned=False, want_unknown=True))
+ self.assertEqual(expected, self.do_iter_changes(tree1, tree2,
+ specific_files=specific_files, require_versioned=False,
+ want_unknown=True))
+
+ def test_unknown_paths_in_tree(self):
tree1 = self.make_branch_and_tree('tree1')
tree2 = self.make_to_branch_and_tree('tree2')
tree2.set_root_id(tree1.get_root_id())
@@ -811,16 +836,16 @@
tree2.lock_read()
self.addCleanup(tree2.unlock)
expected = [
- self.unversioned(tree2, 'file'),
- self.unversioned(tree2, 'dir'),
+ self.unknown(tree2, 'file'),
+ self.unknown(tree2, 'dir'),
]
if links_supported:
- expected.append(self.unversioned(tree2, 'link'))
+ expected.append(self.unknown(tree2, 'link'))
expected = sorted(expected)
self.assertEqual(expected, self.do_iter_changes(tree1, tree2,
- want_unversioned=True))
+ want_unknown=True))
- def test_unversioned_paths_in_tree_specific_files(self):
+ def test_unknown_paths_in_tree_specific_files(self):
tree1 = self.make_branch_and_tree('tree1')
tree2 = self.make_to_branch_and_tree('tree2')
self.build_tree(['tree2/file', 'tree2/dir/'])
@@ -835,20 +860,20 @@
tree2.lock_read()
self.addCleanup(tree2.unlock)
expected = [
- self.unversioned(tree2, 'file'),
- self.unversioned(tree2, 'dir'),
+ self.unknown(tree2, 'file'),
+ self.unknown(tree2, 'dir'),
]
specific_files=['file', 'dir']
if links_supported:
- expected.append(self.unversioned(tree2, 'link'))
+ expected.append(self.unknown(tree2, 'link'))
specific_files.append('link')
expected = sorted(expected)
self.assertEqual(expected, self.do_iter_changes(tree1, tree2,
specific_files=specific_files, require_versioned=False,
- want_unversioned=True))
+ want_unknown=True))
- def test_unversioned_paths_in_target_matching_source_old_names(self):
- # its likely that naive implementations of unversioned file support
+ def test_unknown_paths_in_target_matching_source_old_names(self):
+ # its likely that naive implementations of unknown file support
# will fail if the path was versioned, but is not any more,
# due to a rename, not due to unversioning it.
# That is, if the old tree has a versioned file 'foo', and
@@ -880,35 +905,35 @@
expected = [
self.renamed(tree1, tree2, 'dir-id', False),
self.renamed(tree1, tree2, 'file-id', True),
- self.unversioned(tree2, 'file'),
- self.unversioned(tree2, 'dir'),
+ self.unknown(tree2, 'file'),
+ self.unknown(tree2, 'dir'),
]
specific_files=['file', 'dir']
if links_supported:
expected.append(self.renamed(tree1, tree2, 'link-id', False))
- expected.append(self.unversioned(tree2, 'link'))
+ expected.append(self.unknown(tree2, 'link'))
specific_files.append('link')
expected = sorted(expected)
# run once with, and once without specific files, to catch
# potentially different code paths.
self.assertEqual(expected, self.do_iter_changes(tree1, tree2,
require_versioned=False,
- want_unversioned=True))
+ want_unknown=True))
self.assertEqual(expected, self.do_iter_changes(tree1, tree2,
specific_files=specific_files, require_versioned=False,
- want_unversioned=True))
+ want_unknown=True))
- def test_unversioned_subtree_only_emits_root(self):
+ def test_unknown_subtree_only_emits_root(self):
tree1 = self.make_branch_and_tree('tree1')
tree2 = self.make_to_branch_and_tree('tree2')
tree2.set_root_id(tree1.get_root_id())
self.build_tree(['tree2/dir/', 'tree2/dir/file'])
tree1, tree2 = self.mutable_trees_to_test_trees(tree1, tree2)
expected = [
- self.unversioned(tree2, 'dir'),
+ self.unknown(tree2, 'dir'),
]
self.assertEqual(expected, self.do_iter_changes(tree1, tree2,
- want_unversioned=True))
+ want_unknown=True))
def make_trees_with_symlinks(self):
tree1 = self.make_branch_and_tree('tree1')
@@ -969,14 +994,14 @@
self.kind_changed(tree1, tree2, 'fromfile'),
self.deleted(tree1, 'removed'),
self.unchanged(tree2, 'unchanged'),
- self.unversioned(tree2, 'unknown'),
+ self.unknown(tree2, 'unknown'),
self.kind_changed(tree1, tree2, 'todir'),
self.kind_changed(tree1, tree2, 'tofile'),
]
expected = sorted(expected)
self.assertEqual(expected,
self.do_iter_changes(tree1, tree2, include_unchanged=True,
- want_unversioned=True))
+ want_unknown=True))
def test_versioned_symlinks_specific_files(self):
tree1, tree2 = self.make_trees_with_symlinks()
=== modified file 'bzrlib/tests/test_dirstate.py'
--- a/bzrlib/tests/test_dirstate.py 2007-03-09 15:52:13 +0000
+++ b/bzrlib/tests/test_dirstate.py 2007-03-13 02:52:34 +0000
@@ -21,6 +21,7 @@
import time
from bzrlib import (
+ bzrdir,
dirstate,
errors,
osutils,
@@ -1902,3 +1903,107 @@
for path in paths:
self.assertBisect(dirblocks, split_dirblocks, path, cache=cache)
+
+class TestIterDirectoriesInTrees(TestCaseWithDirState):
+ """Tests for iter_dirs_in_trees.
+
+ui fan out selection:
+start with a list of (path, trees)
+ - output path, id, detail-in-each-tree for each item in the list, for all threes id is present in.
+ - for each detail-in-each-tree where there is a directory, add its children to the list to examine.
+ - always process the shortest path next.
+
+Dirblock style:
+ - gather all the information for a single directory at once.
+ - any directory is output once and only once (?for any one tree?). [corner case alert!]
+ - output may be a subset of actual dirstate raw data.
+
+
+Common case: all trees have the same information, no moves.
+
+NOTES: This explicitly does not gather all children of a directory, only those of the tree which we
+decided to gather children for. We might be gathering children for multiple trees within the same path though.
+
+Corner cases (all are symmetrical)
+ - select tree 0, tree 1 data should be totally ignored. Things that can go
+ wrong: we might include ids present in tree 1 and not tree 0. We might
+ examine the contents of a directory in tree 1 thats not versioned in 0,
+ leading to lots of unknowns rather than one unknown.
+ - a file in 0 is moved to where a directory in a tree 1 is, this should not
+ recurse into the directory even if the subdir is versioned in tree 0 (at a
+ non-selected path).
+ - a file in 0 is moved to somewhere else and becomes a directory in 1, the directory contents
+ should be gathered.
+ - several things are moved to a directory containing other things, the
+ returned directory information should only contain them
+ - a path in 0 was at path B in 1, path B in 0 contains some other id. The
+ other id should not be returned.
+ - starting at dir X, if a path is moved to dir /foo/bar, and another to /foo,
+ we should only ever emit /foo in total, not a fake /foo with bar, then /foo.
+ - if [0] /foo/bar/gam is a directory that is [1]/foo, which still contains
+ [1]/foo/bar then starting at bar, we should output the block for bar,
+ selecting [0] and [1], the block for /foo/bar/gam, selecting [0]
+ only (gam is at /foo in [1]), and the block for [1]/foo, which has the data
+ for /foo/bar, but we must not recurse into /foo/bar again. finally emit a
+ fake block for [0]/foo/bar
+ A related case is where a path /foo/bar stays constnat - its 'f', 'f' in
+ both trees, same id, but the containing directory changes id. When we choose
+ to output the directory for id A, we may filter things not present in A
+ because we dont know about id B yet, so if we then output it again, we
+ should filter things not present in B, or present in A, because we've output
+ A before. To construct this case, have a directory that links in /foo from
+ its id A in index 0, and also links in another directory /later, which
+ contains a link to /foo under id B in index 1.
+
+ - the user will be looking at each entry at a target index. If we are
+ returning an unmodified dirblock (good), we need to be able to say 'these
+ indexes are relevant in this dirblock'.
+ One confusing case of id emission is when we select a dirblock because of its id in tree 1 and it contains a file id that is present in tree 0, and redirected in tree 1
+ 0 1
+ f r
+
+ here we should not include that data in the output. This means users of the output can say:
+ for key, details in dirblock: stuff, safely.
+ """
+
+ def make_branch_and_tree(self, relpath='.'):
+ """Create format4 working trees to allow relatively easy setup."""
+ return TestCaseWithDirState.make_branch_and_tree(self, relpath,
+ format=bzrdir.format_registry.make_bzrdir('dirstate'))
+
+ def test_empty_tree(self):
+ tree = self.make_branch_and_tree()
+ tree.lock_read()
+ self.addCleanup(tree.unlock)
+ # the output for iter_dirs_in_trees for an empty tree - one with
+ # just a tree root, should be one dirblock, the one for the root.
+ # it should not claim to be a real directory - ever - because we
+ # dont want to search for unknowns in this path
+ result = list(tree.current_dirstate().iter_dirs_in_trees([''], [0]))
+ state = tree.current_dirstate()
+ expected = [(False, state._dirblocks[0]),
+ (True, state._dirblocks[1])]
+ self.assertEqual(expected, result)
+
+ def test_all_paths(self):
+ tree = self.make_branch_and_tree()
+ self.build_tree(['file', 'dir/', 'dir/file', 'dir2/', 'dir2/fileindir2'])
+ tree.add(['file', 'dir', 'dir/file', 'dir2', 'dir2/fileindir2'])
+ tree.lock_read()
+ self.addCleanup(tree.unlock)
+ # the output for iter_dirs_in_trees for this tree should be
+ # the root dirblock (marked as unreal), the contents of root (marked real),
+ # and the contents of dir and dir two, also marked real). for an empty tree - one with
+ # just a tree root, should be one dirblock, the one for the root.
+ # it should not claim to be a real directory - ever - because we
+ # dont want to search for unknowns in this path
+ result = []
+ # suck the nested iterators.
+ for details in tree.current_dirstate().iter_dirs_in_trees([''], [0]):
+ result.append((details[0], (details[1][0], list(details[1][1]))))
+ state = tree.current_dirstate()
+ expected = [(False, state._dirblocks[0]),
+ (True, state._dirblocks[1]),
+ (True, state._dirblocks[2]),
+ (True, state._dirblocks[3])]
+ self.assertEqual(expected, result)
=== modified file 'bzrlib/tests/test_tree.py'
--- a/bzrlib/tests/test_tree.py 2007-03-02 03:47:56 +0000
+++ b/bzrlib/tests/test_tree.py 2007-03-12 03:54:24 +0000
@@ -63,11 +63,11 @@
def compare(self, want_unchanged=False, specific_files=None,
extra_trees=None, require_versioned=False, include_root=False,
- want_unversioned=False):
+ want_unknown=False):
self.calls.append(
('compare', self.source, self.target, want_unchanged,
- specific_files, extra_trees, require_versioned,
- include_root, want_unversioned)
+ specific_files, extra_trees, require_versioned,
+ include_root, want_unknown)
)
@classmethod
@@ -99,7 +99,7 @@
extra_trees='extra',
require_versioned='require',
include_root=True,
- want_unversioned=True,
+ want_unknown=True,
)
finally:
InterTree._optimisers = old_optimisers
=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py 2007-03-07 03:09:14 +0000
+++ b/bzrlib/tree.py 2007-03-12 03:54:24 +0000
@@ -59,7 +59,7 @@
def changes_from(self, other, want_unchanged=False, specific_files=None,
extra_trees=None, require_versioned=False, include_root=False,
- want_unversioned=False):
+ want_unknown=False):
"""Return a TreeDelta of the changes from other to this tree.
:param other: A tree to compare with.
@@ -74,7 +74,7 @@
:param require_versioned: An optional boolean (defaults to False). When
supplied and True all the 'specific_files' must be versioned, or
a PathsNotVersionedError will be thrown.
- :param want_unversioned: Scan for unversioned paths.
+ :param want_unknown: Scan for unknown paths.
The comparison will be performed by an InterTree object looked up on
self and other.
@@ -88,15 +88,15 @@
extra_trees=extra_trees,
require_versioned=require_versioned,
include_root=include_root,
- want_unversioned=want_unversioned,
+ want_unknown=want_unknown,
)
def _iter_changes(self, from_tree, include_unchanged=False,
specific_files=None, pb=None, extra_trees=None,
- require_versioned=True, want_unversioned=False):
+ require_versioned=True, want_unknown=False):
intertree = InterTree.get(from_tree, self)
return intertree._iter_changes(include_unchanged, specific_files, pb,
- extra_trees, require_versioned, want_unversioned=want_unversioned)
+ extra_trees, require_versioned, want_unknown=want_unknown)
def conflicts(self):
"""Get a list of the conflicts in the tree.
@@ -556,7 +556,7 @@
@needs_read_lock
def compare(self, want_unchanged=False, specific_files=None,
extra_trees=None, require_versioned=False, include_root=False,
- want_unversioned=False):
+ want_unknown=False):
"""Return the changes from source to target.
:return: A TreeDelta.
@@ -571,7 +571,7 @@
:param require_versioned: An optional boolean (defaults to False). When
supplied and True all the 'specific_files' must be versioned, or
a PathsNotVersionedError will be thrown.
- :param want_unversioned: Scan for unversioned paths.
+ :param want_unknown: Scan for unknown paths.
"""
# NB: show_status depends on being able to pass in non-versioned files
# and report them as unknown
@@ -592,11 +592,11 @@
return result
return delta._compare_trees(self.source, self.target, want_unchanged,
specific_files, include_root, extra_trees=extra_trees,
- want_unversioned=want_unversioned)
+ want_unknown=want_unknown)
def _iter_changes(self, include_unchanged=False,
specific_files=None, pb=None, extra_trees=[],
- require_versioned=True, want_unversioned=False):
+ require_versioned=True, want_unknown=False):
"""Generate an iterator of changes between trees.
A tuple is returned:
@@ -620,8 +620,8 @@
:param require_versioned: Raise errors.PathsNotVersionedError if a
path in the specific_files list is not versioned in one of
source, target or extra_trees.
- :param want_unversioned: Should unversioned files be returned in the
- output. An unversioned file is defined as one with (False, False)
+ :param want_unknown: Should unknown files be returned in the
+ output. An unknown file is presented as one with (False, False)
for the versioned pair.
"""
result = []
@@ -630,13 +630,13 @@
lookup_trees.extend(extra_trees)
specific_file_ids = self.target.paths2ids(specific_files,
lookup_trees, require_versioned=require_versioned)
- if want_unversioned:
- all_unversioned = sorted([(p.split('/'), p) for p in self.target.extras()
+ if want_unknown:
+ all_unknowns = sorted([(p.split('/'), p) for p in self.target.unknowns()
if not specific_files or
osutils.is_inside_any(specific_files, p)])
- all_unversioned = deque(all_unversioned)
+ all_unknowns = deque(all_unknowns)
else:
- all_unversioned = deque()
+ all_unknowns = deque()
to_paths = {}
from_entries_by_dir = list(self.source.inventory.iter_entries_by_dir(
specific_file_ids=specific_file_ids))
@@ -650,8 +650,8 @@
# executable it values when execute is not supported.
fake_entry = InventoryFile('unused', 'unused', 'unused')
for to_path, to_entry in to_entries_by_dir:
- while all_unversioned and all_unversioned[0][0] < to_path.split('/'):
- unversioned_path = all_unversioned.popleft()
+ while all_unknowns and all_unknowns[0][0] < to_path.split('/'):
+ unversioned_path = all_unknowns.popleft()
to_kind, to_executable, to_stat = \
self.target._comparison_data(fake_entry, unversioned_path[1])
yield (None, (None, unversioned_path[1]), True, (False, False),
@@ -711,9 +711,9 @@
yield (file_id, (from_path, to_path), changed_content,
versioned, parent, name, kind, executable)
- while all_unversioned:
+ while all_unknowns:
# yield any trailing unversioned paths
- unversioned_path = all_unversioned.popleft()
+ unversioned_path = all_unknowns.popleft()
to_kind, to_executable, to_stat = \
self.target._comparison_data(fake_entry, unversioned_path[1])
yield (None, (None, unversioned_path[1]), True, (False, False),
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2007-03-10 04:50:30 +0000
+++ b/bzrlib/workingtree_4.py 2007-03-12 05:29:08 +0000
@@ -1605,7 +1605,7 @@
def _iter_changes(self, include_unchanged=False,
specific_files=None, pb=None, extra_trees=[],
- require_versioned=True, want_unversioned=False):
+ require_versioned=True, want_unknown=False):
"""Return the changes from source to target.
:return: An iterator that yields tuples. See InterTree._iter_changes
@@ -1621,7 +1621,7 @@
:param require_versioned: If True, all files in specific_files must be
versioned in one of source, target, extra_trees or
PathsNotVersionedError is raised.
- :param want_unversioned: Should unversioned files be returned in the
+ :param want_unknown: Should unversioned files be returned in the
output. An unversioned file is defined as one with (False, False)
for the versioned pair.
"""
@@ -1636,7 +1636,7 @@
# we can't fast-path these cases (yet)
for f in super(InterDirStateTree, self)._iter_changes(
include_unchanged, specific_files, pb, extra_trees,
- require_versioned, want_unversioned=want_unversioned):
+ require_versioned, want_unknown=want_unknown):
yield f
return
parent_ids = self.target.get_parent_ids()
@@ -1764,7 +1764,7 @@
last_target_parent = [None, None, None]
use_filesystem_for_exec = (sys.platform != 'win32')
-
+ is_ignored = self.target.is_ignored
def _process_entry(entry, path_info):
"""Compare an entry and real disk to generate delta information.
@@ -1993,7 +1993,7 @@
((utf8_decode(result[1][0])[0]),
utf8_decode(result[1][1])[0]),) + result[2:]
yield result
- if want_unversioned and not path_handled:
+ if want_unknown and not path_handled and not is_ignored(current_root):
yield (None, (None, current_root), True, (False, False),
(None, None),
(None, splitpath(current_root)[-1]),
@@ -2182,7 +2182,7 @@
if advance_path and current_path_info is not None:
if not path_handled:
# unversioned in all regards
- if want_unversioned:
+ if want_unknown and not is_ignored(current_path_info[0]):
yield (None, (None, current_path_info[0]),
True,
(False, False),
More information about the bazaar-commits
mailing list