bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
70
by mbp at sourcefrog
 Prepare for smart recursive add.  | 
1  | 
# Copyright (C) 2005 Canonical Ltd
 | 
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
2  | 
#
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
7  | 
#
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
8  | 
# This program is distributed in the hope that it will be useful,
 | 
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
12  | 
#
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
13  | 
# You should have received a copy of the GNU General Public License
 | 
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
||
17  | 
"""Tree classes, representing directory at point in time.
 | 
|
18  | 
"""
 | 
|
19  | 
||
| 
849
by Martin Pool
 - Put files inside an exported tarball into a top-level directory rather than  | 
20  | 
import os  | 
| 
1196
by Martin Pool
 - [WIP] retrieve historical texts from weaves  | 
21  | 
from cStringIO import StringIO  | 
| 
800
by Martin Pool
 Merge John's import-speedup branch:  | 
22  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
23  | 
import bzrlib  | 
| 
2079.1.1
by John Arbash Meinel
 Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()  | 
24  | 
from bzrlib import (  | 
25  | 
delta,  | 
|
| 
2012.1.8
by Aaron Bentley
 Merge from bzr.dev  | 
26  | 
osutils,  | 
| 
2079.1.1
by John Arbash Meinel
 Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()  | 
27  | 
symbol_versioning,  | 
28  | 
    )
 | 
|
| 
1852.11.1
by Robert Collins
 Deprecate compare_trees and move its body to InterTree.changes_from.  | 
29  | 
from bzrlib.decorators import needs_read_lock  | 
| 
1196
by Martin Pool
 - [WIP] retrieve historical texts from weaves  | 
30  | 
from bzrlib.errors import BzrError, BzrCheckError  | 
| 
1551.7.14
by Aaron Bentley
 Use specified_file_ids instead of is_inside_any in compare_trees  | 
31  | 
from bzrlib import errors  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
32  | 
from bzrlib.inventory import Inventory  | 
| 
1852.8.2
by Robert Collins
 Add InterTree class to represent InterTree operations.  | 
33  | 
from bzrlib.inter import InterObject  | 
| 
1732.1.1
by John Arbash Meinel
 deprecating appendpath, it does exactly what pathjoin does  | 
34  | 
from bzrlib.osutils import fingerprint_file  | 
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
35  | 
import bzrlib.revision  | 
36  | 
from bzrlib.trace import mutter, note  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
37  | 
|
| 
1852.5.1
by Robert Collins
 Deprecate EmptyTree in favour of using Repository.revision_tree.  | 
38  | 
|
| 
558
by Martin Pool
 - All top-level classes inherit from object  | 
39  | 
class Tree(object):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
40  | 
"""Abstract file tree.  | 
41  | 
||
42  | 
    There are several subclasses:
 | 
|
43  | 
    
 | 
|
44  | 
    * `WorkingTree` exists as files on disk editable by the user.
 | 
|
45  | 
||
46  | 
    * `RevisionTree` is a tree as recorded at some point in the past.
 | 
|
47  | 
||
48  | 
    Trees contain an `Inventory` object, and also know how to retrieve
 | 
|
49  | 
    file texts mentioned in the inventory, either from a working
 | 
|
50  | 
    directory or from a store.
 | 
|
51  | 
||
52  | 
    It is possible for trees to contain files that are not described
 | 
|
53  | 
    in their inventory or vice versa; for this use `filenames()`.
 | 
|
54  | 
||
55  | 
    Trees can be compared, etc, regardless of whether they are working
 | 
|
56  | 
    trees or versioned trees.
 | 
|
57  | 
    """
 | 
|
58  | 
||
| 
1852.9.6
by Robert Collins
 Merge the change from Tree.compare to Tree.changes_from.  | 
59  | 
def changes_from(self, other, want_unchanged=False, specific_files=None,  | 
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
60  | 
extra_trees=None, require_versioned=False, include_root=False):  | 
| 
1852.8.8
by Robert Collins
 change Tree.compare to Tree.changes_from - its better for the common case.  | 
61  | 
"""Return a TreeDelta of the changes from other to this tree.  | 
| 
1852.9.3
by Robert Collins
 Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.  | 
62  | 
|
63  | 
        :param other: A tree to compare with.
 | 
|
64  | 
        :param specific_files: An optional list of file paths to restrict the
 | 
|
65  | 
            comparison to. When mapping filenames to ids, all matches in all
 | 
|
66  | 
            trees (including optional extra_trees) are used, and all children of
 | 
|
67  | 
            matched directories are included.
 | 
|
| 
1852.9.4
by Robert Collins
 Add minimal test for Tree.compare(extra_trees=...).  | 
68  | 
        :param want_unchanged: An optional boolean requesting the inclusion of
 | 
69  | 
            unchanged entries in the result.
 | 
|
70  | 
        :param extra_trees: An optional list of additional trees to use when
 | 
|
71  | 
            mapping the contents of specific_files (paths) to file_ids.
 | 
|
| 
1852.9.5
by Robert Collins
 Add tests for require_versioned to the InterTree.compare() test suite.  | 
72  | 
        :param require_versioned: An optional boolean (defaults to False). When
 | 
73  | 
            supplied and True all the 'specific_files' must be versioned, or
 | 
|
74  | 
            a PathsNotVersionedError will be thrown.
 | 
|
| 
1852.9.3
by Robert Collins
 Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.  | 
75  | 
|
| 
1852.8.4
by Robert Collins
 Hook InterTree into Tree.  | 
76  | 
        The comparison will be performed by an InterTree object looked up on 
 | 
77  | 
        self and other.
 | 
|
78  | 
        """
 | 
|
| 
1852.8.8
by Robert Collins
 change Tree.compare to Tree.changes_from - its better for the common case.  | 
79  | 
        # Martin observes that Tree.changes_from returns a TreeDelta and this
 | 
80  | 
        # may confuse people, because the class name of the returned object is
 | 
|
81  | 
        # a synonym of the object referenced in the method name.
 | 
|
| 
1852.9.6
by Robert Collins
 Merge the change from Tree.compare to Tree.changes_from.  | 
82  | 
return InterTree.get(other, self).compare(  | 
| 
1852.9.4
by Robert Collins
 Add minimal test for Tree.compare(extra_trees=...).  | 
83  | 
want_unchanged=want_unchanged,  | 
84  | 
specific_files=specific_files,  | 
|
| 
1852.9.5
by Robert Collins
 Add tests for require_versioned to the InterTree.compare() test suite.  | 
85  | 
extra_trees=extra_trees,  | 
86  | 
require_versioned=require_versioned,  | 
|
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
87  | 
include_root=include_root  | 
| 
1852.9.5
by Robert Collins
 Add tests for require_versioned to the InterTree.compare() test suite.  | 
88  | 
            )
 | 
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
89  | 
|
| 
2012.1.10
by Aaron Bentley
 Make iter_changes private, so it can be changed freely  | 
90  | 
def _iter_changes(self, from_tree, include_unchanged=False,  | 
| 
2012.1.5
by Aaron Bentley
 Implement specific file id and dangling id handling  | 
91  | 
specific_file_ids=None):  | 
92  | 
intertree = InterTree.get(from_tree, self)  | 
|
| 
2012.1.10
by Aaron Bentley
 Make iter_changes private, so it can be changed freely  | 
93  | 
return intertree._iter_changes(from_tree, self, include_unchanged,  | 
94  | 
specific_file_ids)  | 
|
| 
1852.8.4
by Robert Collins
 Hook InterTree into Tree.  | 
95  | 
|
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
96  | 
def conflicts(self):  | 
97  | 
"""Get a list of the conflicts in the tree.  | 
|
98  | 
||
99  | 
        Each conflict is an instance of bzrlib.conflicts.Conflict.
 | 
|
100  | 
        """
 | 
|
101  | 
return []  | 
|
102  | 
||
103  | 
def get_parent_ids(self):  | 
|
104  | 
"""Get the parent ids for this tree.  | 
|
105  | 
||
106  | 
        :return: a list of parent ids. [] is returned to indicate
 | 
|
107  | 
        a tree with no parents.
 | 
|
108  | 
        :raises: BzrError if the parents are not known.
 | 
|
109  | 
        """
 | 
|
110  | 
raise NotImplementedError(self.get_parent_ids)  | 
|
111  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
112  | 
def has_filename(self, filename):  | 
113  | 
"""True if the tree has given filename."""  | 
|
114  | 
raise NotImplementedError()  | 
|
115  | 
||
| 
1185.12.39
by abentley
 Propogated has_or_had_id to Tree  | 
116  | 
def has_id(self, file_id):  | 
117  | 
return self.inventory.has_id(file_id)  | 
|
118  | 
||
| 
1852.6.9
by Robert Collins
 Add more test trees to the tree-implementations tests.  | 
119  | 
__contains__ = has_id  | 
120  | 
||
| 
1185.12.39
by abentley
 Propogated has_or_had_id to Tree  | 
121  | 
def has_or_had_id(self, file_id):  | 
122  | 
if file_id == self.inventory.root.file_id:  | 
|
| 
1185.12.38
by abentley
 semi-broke merge  | 
123  | 
return True  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
124  | 
return self.inventory.has_id(file_id)  | 
125  | 
||
| 
462
by Martin Pool
 - New form 'file_id in tree' to check if the file is present  | 
126  | 
def __iter__(self):  | 
127  | 
return iter(self.inventory)  | 
|
128  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
129  | 
def id2path(self, file_id):  | 
130  | 
return self.inventory.id2path(file_id)  | 
|
131  | 
||
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
132  | 
def is_control_filename(self, filename):  | 
133  | 
"""True if filename is the name of a control file in this tree.  | 
|
134  | 
        
 | 
|
135  | 
        :param filename: A filename within the tree. This is a relative path
 | 
|
136  | 
        from the root of this tree.
 | 
|
137  | 
||
138  | 
        This is true IF and ONLY IF the filename is part of the meta data
 | 
|
139  | 
        that bzr controls in this tree. I.E. a random .bzr directory placed
 | 
|
140  | 
        on disk will not be a control file for this tree.
 | 
|
141  | 
        """
 | 
|
142  | 
return self.bzrdir.is_control_filename(filename)  | 
|
143  | 
||
| 
1852.6.9
by Robert Collins
 Add more test trees to the tree-implementations tests.  | 
144  | 
def iter_entries_by_dir(self):  | 
145  | 
"""Walk the tree in 'by_dir' order.  | 
|
146  | 
||
147  | 
        This will yield each entry in the tree as a (path, entry) tuple. The
 | 
|
148  | 
        order that they are yielded is: the contents of a directory are 
 | 
|
149  | 
        preceeded by the parent of a directory, and all the contents of a 
 | 
|
150  | 
        directory are grouped together.
 | 
|
151  | 
        """
 | 
|
152  | 
return self.inventory.iter_entries_by_dir()  | 
|
153  | 
||
| 
1465
by Robert Collins
 Bugfix the new pull --clobber to not generate spurious conflicts.  | 
154  | 
def kind(self, file_id):  | 
155  | 
raise NotImplementedError("subclasses must implement kind")  | 
|
156  | 
||
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
157  | 
def _comparison_data(self, entry, path):  | 
| 
2012.1.15
by Aaron Bentley
 Minor tweaks  | 
158  | 
"""Return a tuple of kind, executable, stat_value for a file.  | 
159  | 
||
160  | 
        entry may be None if there is no inventory entry for the file, but
 | 
|
161  | 
        path must always be supplied.
 | 
|
162  | 
||
163  | 
        kind is None if there is no file present (even if an inventory id is
 | 
|
164  | 
        present).  executable is False for non-file entries.
 | 
|
165  | 
        """
 | 
|
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
166  | 
raise NotImplementedError(self._comparison_data)  | 
167  | 
||
168  | 
def _file_size(entry, stat_value):  | 
|
169  | 
raise NotImplementedError(self._file_size)  | 
|
170  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
171  | 
def _get_inventory(self):  | 
172  | 
return self._inventory  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
173  | 
|
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
174  | 
def get_file(self, file_id):  | 
175  | 
"""Return a file object for the file file_id in the tree."""  | 
|
176  | 
raise NotImplementedError(self.get_file)  | 
|
177  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
178  | 
def get_file_by_path(self, path):  | 
179  | 
return self.get_file(self._inventory.path2id(path))  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
180  | 
|
181  | 
inventory = property(_get_inventory,  | 
|
182  | 
doc="Inventory of this Tree")  | 
|
183  | 
||
184  | 
def _check_retrieved(self, ie, f):  | 
|
| 
1364
by Martin Pool
 - remove extra verification of files retrieved from tree  | 
185  | 
if not __debug__:  | 
186  | 
            return  
 | 
|
| 
130
by mbp at sourcefrog
 - fixup checks on retrieved files to cope with compression,  | 
187  | 
fp = fingerprint_file(f)  | 
188  | 
f.seek(0)  | 
|
189  | 
||
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
190  | 
if ie.text_size is not None:  | 
| 
131
by mbp at sourcefrog
 check size and sha1 of files retrieved from the tree  | 
191  | 
if ie.text_size != fp['size']:  | 
| 
694
by Martin Pool
 - weed out all remaining calls to bailout() and remove the function  | 
192  | 
raise BzrError("mismatched size for file %r in %r" % (ie.file_id, self._store),  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
193  | 
["inventory expects %d bytes" % ie.text_size,  | 
| 
130
by mbp at sourcefrog
 - fixup checks on retrieved files to cope with compression,  | 
194  | 
"file is actually %d bytes" % fp['size'],  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
195  | 
"store is probably damaged/corrupt"])  | 
196  | 
||
| 
130
by mbp at sourcefrog
 - fixup checks on retrieved files to cope with compression,  | 
197  | 
if ie.text_sha1 != fp['sha1']:  | 
| 
694
by Martin Pool
 - weed out all remaining calls to bailout() and remove the function  | 
198  | 
raise BzrError("wrong SHA-1 for file %r in %r" % (ie.file_id, self._store),  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
199  | 
["inventory expects %s" % ie.text_sha1,  | 
| 
130
by mbp at sourcefrog
 - fixup checks on retrieved files to cope with compression,  | 
200  | 
"file is actually %s" % fp['sha1'],  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
201  | 
"store is probably damaged/corrupt"])  | 
202  | 
||
| 
1986.1.2
by Robert Collins
 Various changes to allow non-workingtree specific tests to run entirely  | 
203  | 
def path2id(self, path):  | 
204  | 
"""Return the id for path in this tree."""  | 
|
205  | 
return self._inventory.path2id(path)  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
206  | 
|
| 
1196
by Martin Pool
 - [WIP] retrieve historical texts from weaves  | 
207  | 
def print_file(self, file_id):  | 
208  | 
"""Print file with id `file_id` to stdout."""  | 
|
| 
176
by mbp at sourcefrog
 New cat command contributed by janmar.  | 
209  | 
import sys  | 
| 
1196
by Martin Pool
 - [WIP] retrieve historical texts from weaves  | 
210  | 
sys.stdout.write(self.get_file_text(file_id))  | 
| 
1543.1.1
by Denys Duchier
 lock operations for trees - use them for diff  | 
211  | 
|
212  | 
def lock_read(self):  | 
|
213  | 
        pass
 | 
|
214  | 
||
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
215  | 
def unknowns(self):  | 
216  | 
"""What files are present in this tree and unknown.  | 
|
217  | 
        
 | 
|
218  | 
        :return: an iterator over the unknown files.
 | 
|
219  | 
        """
 | 
|
220  | 
return iter([])  | 
|
221  | 
||
| 
1543.1.1
by Denys Duchier
 lock operations for trees - use them for diff  | 
222  | 
def unlock(self):  | 
223  | 
        pass
 | 
|
| 
1658.1.9
by Martin Pool
 Give an error for bzr diff on an nonexistent file (Malone #3619)  | 
224  | 
|
225  | 
def filter_unversioned_files(self, paths):  | 
|
226  | 
"""Filter out paths that are not versioned.  | 
|
227  | 
||
228  | 
        :return: set of paths.
 | 
|
229  | 
        """
 | 
|
| 
1658.1.10
by Martin Pool
 diff on unversiond files should give an error (Malone #3619)  | 
230  | 
        # NB: we specifically *don't* call self.has_filename, because for
 | 
231  | 
        # WorkingTrees that can indicate files that exist on disk but that 
 | 
|
232  | 
        # are not versioned.
 | 
|
233  | 
pred = self.inventory.has_filename  | 
|
234  | 
return set((p for p in paths if not pred(p)))  | 
|
| 
1852.7.1
by Robert Collins
 Move RevisionTree out of tree.py.  | 
235  | 
|
236  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
237  | 
class EmptyTree(Tree):  | 
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
238  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
239  | 
def __init__(self):  | 
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
240  | 
self._inventory = Inventory(root_id=None)  | 
| 
2079.1.1
by John Arbash Meinel
 Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()  | 
241  | 
symbol_versioning.warn('EmptyTree is deprecated as of bzr 0.9 please'  | 
242  | 
' use repository.revision_tree instead.',  | 
|
243  | 
DeprecationWarning, stacklevel=2)  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
244  | 
|
| 
1773.2.1
by Robert Collins
 Teach all trees about unknowns, conflicts and get_parent_ids.  | 
245  | 
def get_parent_ids(self):  | 
246  | 
return []  | 
|
247  | 
||
| 
1092.2.6
by Robert Collins
 symlink support updated to work  | 
248  | 
def get_symlink_target(self, file_id):  | 
249  | 
return None  | 
|
250  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
251  | 
def has_filename(self, filename):  | 
252  | 
return False  | 
|
253  | 
||
| 
1907.1.4
by Aaron Bentley
 Restore RootEntry, but mark it deprecated, restore EmptyTree.kind  | 
254  | 
def kind(self, file_id):  | 
255  | 
assert self._inventory[file_id].kind == "directory"  | 
|
256  | 
return "directory"  | 
|
257  | 
||
| 
1731.1.56
by Aaron Bentley
 Fix EmptyTree's default include_root  | 
258  | 
def list_files(self, include_root=False):  | 
| 
1732.1.14
by John Arbash Meinel
 Some speedups by not calling pathjoin()  | 
259  | 
return iter([])  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
260  | 
|
| 
974.1.12
by aaron.bentley at utoronto
 Switched from text-id to hashcache for merge optimization  | 
261  | 
def __contains__(self, file_id):  | 
| 
1711.9.11
by John Arbash Meinel
 change return foo in bar to return (foo in bar)  | 
262  | 
return (file_id in self._inventory)  | 
| 
974.1.12
by aaron.bentley at utoronto
 Switched from text-id to hashcache for merge optimization  | 
263  | 
|
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
264  | 
def get_file_sha1(self, file_id, path=None, stat_value=None):  | 
| 
974.1.14
by aaron.bentley at utoronto
 Fixed bugs in merge optimization  | 
265  | 
return None  | 
266  | 
||
267  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
268  | 
######################################################################
 | 
269  | 
# diff
 | 
|
270  | 
||
271  | 
# TODO: Merge these two functions into a single one that can operate
 | 
|
272  | 
# on either a whole tree or a set of files.
 | 
|
273  | 
||
274  | 
# TODO: Return the diff in order by filename, not by category or in
 | 
|
275  | 
# random order.  Can probably be done by lock-stepping through the
 | 
|
276  | 
# filenames from both trees.
 | 
|
277  | 
||
278  | 
||
279  | 
def file_status(filename, old_tree, new_tree):  | 
|
280  | 
"""Return single-letter status, old and new names for a file.  | 
|
281  | 
||
282  | 
    The complexity here is in deciding how to represent renames;
 | 
|
283  | 
    many complex cases are possible.
 | 
|
284  | 
    """
 | 
|
285  | 
old_inv = old_tree.inventory  | 
|
286  | 
new_inv = new_tree.inventory  | 
|
287  | 
new_id = new_inv.path2id(filename)  | 
|
288  | 
old_id = old_inv.path2id(filename)  | 
|
289  | 
||
290  | 
if not new_id and not old_id:  | 
|
291  | 
        # easy: doesn't exist in either; not versioned at all
 | 
|
292  | 
if new_tree.is_ignored(filename):  | 
|
293  | 
return 'I', None, None  | 
|
294  | 
else:  | 
|
295  | 
return '?', None, None  | 
|
296  | 
elif new_id:  | 
|
297  | 
        # There is now a file of this name, great.
 | 
|
298  | 
        pass
 | 
|
299  | 
else:  | 
|
300  | 
        # There is no longer a file of this name, but we can describe
 | 
|
301  | 
        # what happened to the file that used to have
 | 
|
302  | 
        # this name.  There are two possibilities: either it was
 | 
|
303  | 
        # deleted entirely, or renamed.
 | 
|
304  | 
assert old_id  | 
|
305  | 
if new_inv.has_id(old_id):  | 
|
306  | 
return 'X', old_inv.id2path(old_id), new_inv.id2path(old_id)  | 
|
307  | 
else:  | 
|
308  | 
return 'D', old_inv.id2path(old_id), None  | 
|
309  | 
||
310  | 
    # if the file_id is new in this revision, it is added
 | 
|
311  | 
if new_id and not old_inv.has_id(new_id):  | 
|
312  | 
return 'A'  | 
|
313  | 
||
314  | 
    # if there used to be a file of this name, but that ID has now
 | 
|
315  | 
    # disappeared, it is deleted
 | 
|
316  | 
if old_id and not new_inv.has_id(old_id):  | 
|
317  | 
return 'D'  | 
|
318  | 
||
319  | 
return 'wtf?'  | 
|
320  | 
||
321  | 
||
322  | 
||
| 
164
by mbp at sourcefrog
 new 'renames' command  | 
323  | 
def find_renames(old_inv, new_inv):  | 
324  | 
for file_id in old_inv:  | 
|
325  | 
if file_id not in new_inv:  | 
|
326  | 
            continue
 | 
|
327  | 
old_name = old_inv.id2path(file_id)  | 
|
328  | 
new_name = new_inv.id2path(file_id)  | 
|
329  | 
if old_name != new_name:  | 
|
330  | 
yield (old_name, new_name)  | 
|
331  | 
||
| 
678
by Martin Pool
 - export to tarballs  | 
332  | 
|
| 
1551.7.22
by Aaron Bentley
 Changes from review  | 
333  | 
def find_ids_across_trees(filenames, trees, require_versioned=True):  | 
334  | 
"""Find the ids corresponding to specified filenames.  | 
|
335  | 
    
 | 
|
336  | 
    All matches in all trees will be used, and all children of matched
 | 
|
337  | 
    directories will be used.
 | 
|
338  | 
||
339  | 
    :param filenames: The filenames to find file_ids for
 | 
|
340  | 
    :param trees: The trees to find file_ids within
 | 
|
341  | 
    :param require_versioned: if true, all specified filenames must occur in
 | 
|
342  | 
    at least one tree.
 | 
|
343  | 
    :return: a set of file ids for the specified filenames and their children.
 | 
|
344  | 
    """
 | 
|
345  | 
if not filenames:  | 
|
346  | 
return None  | 
|
347  | 
specified_ids = _find_filename_ids_across_trees(filenames, trees,  | 
|
348  | 
require_versioned)  | 
|
349  | 
return _find_children_across_trees(specified_ids, trees)  | 
|
350  | 
||
351  | 
||
352  | 
def _find_filename_ids_across_trees(filenames, trees, require_versioned):  | 
|
353  | 
"""Find the ids corresponding to specified filenames.  | 
|
354  | 
    
 | 
|
355  | 
    All matches in all trees will be used.
 | 
|
356  | 
||
| 
1551.7.14
by Aaron Bentley
 Use specified_file_ids instead of is_inside_any in compare_trees  | 
357  | 
    :param filenames: The filenames to find file_ids for
 | 
358  | 
    :param trees: The trees to find file_ids within
 | 
|
| 
1551.7.16
by Aaron Bentley
 Fix docs  | 
359  | 
    :param require_versioned: if true, all specified filenames must occur in
 | 
360  | 
    at least one tree.
 | 
|
361  | 
    :return: a set of file ids for the specified filenames
 | 
|
| 
1551.7.14
by Aaron Bentley
 Use specified_file_ids instead of is_inside_any in compare_trees  | 
362  | 
    """
 | 
| 
1551.7.17
by Aaron Bentley
 Switch to PathsNotVersioned, accept extra_trees  | 
363  | 
not_versioned = []  | 
| 
1551.7.18
by Aaron Bentley
 Indentation and documentation fixes  | 
364  | 
interesting_ids = set()  | 
365  | 
for tree_path in filenames:  | 
|
366  | 
not_found = True  | 
|
367  | 
for tree in trees:  | 
|
368  | 
file_id = tree.inventory.path2id(tree_path)  | 
|
369  | 
if file_id is not None:  | 
|
370  | 
interesting_ids.add(file_id)  | 
|
371  | 
not_found = False  | 
|
372  | 
if not_found:  | 
|
373  | 
not_versioned.append(tree_path)  | 
|
| 
1551.7.22
by Aaron Bentley
 Changes from review  | 
374  | 
if len(not_versioned) > 0 and require_versioned:  | 
375  | 
raise errors.PathsNotVersionedError(not_versioned)  | 
|
376  | 
return interesting_ids  | 
|
377  | 
||
378  | 
||
379  | 
def _find_children_across_trees(specified_ids, trees):  | 
|
380  | 
"""Return a set including specified ids and their children  | 
|
| 
1551.7.18
by Aaron Bentley
 Indentation and documentation fixes  | 
381  | 
    
 | 
| 
1551.7.22
by Aaron Bentley
 Changes from review  | 
382  | 
    All matches in all trees will be used.
 | 
383  | 
||
384  | 
    :param trees: The trees to find file_ids within
 | 
|
385  | 
    :return: a set containing all specified ids and their children 
 | 
|
386  | 
    """
 | 
|
387  | 
interesting_ids = set(specified_ids)  | 
|
| 
1551.7.18
by Aaron Bentley
 Indentation and documentation fixes  | 
388  | 
pending = interesting_ids  | 
389  | 
    # now handle children of interesting ids
 | 
|
390  | 
    # we loop so that we handle all children of each id in both trees
 | 
|
391  | 
while len(pending) > 0:  | 
|
392  | 
new_pending = set()  | 
|
393  | 
for file_id in pending:  | 
|
| 
1551.7.14
by Aaron Bentley
 Use specified_file_ids instead of is_inside_any in compare_trees  | 
394  | 
for tree in trees:  | 
| 
1551.7.18
by Aaron Bentley
 Indentation and documentation fixes  | 
395  | 
if file_id not in tree:  | 
396  | 
                    continue
 | 
|
397  | 
entry = tree.inventory[file_id]  | 
|
398  | 
for child in getattr(entry, 'children', {}).itervalues():  | 
|
399  | 
if child.file_id not in interesting_ids:  | 
|
400  | 
new_pending.add(child.file_id)  | 
|
401  | 
interesting_ids.update(new_pending)  | 
|
402  | 
pending = new_pending  | 
|
| 
1551.7.14
by Aaron Bentley
 Use specified_file_ids instead of is_inside_any in compare_trees  | 
403  | 
return interesting_ids  | 
| 
1852.8.2
by Robert Collins
 Add InterTree class to represent InterTree operations.  | 
404  | 
|
405  | 
||
406  | 
class InterTree(InterObject):  | 
|
407  | 
"""This class represents operations taking place between two Trees.  | 
|
408  | 
||
409  | 
    Its instances have methods like 'compare' and contain references to the
 | 
|
410  | 
    source and target trees these operations are to be carried out on.
 | 
|
411  | 
||
412  | 
    clients of bzrlib should not need to use InterTree directly, rather they
 | 
|
413  | 
    should use the convenience methods on Tree such as 'Tree.compare()' which
 | 
|
414  | 
    will pass through to InterTree as appropriate.
 | 
|
415  | 
    """
 | 
|
416  | 
||
| 
1910.2.15
by Aaron Bentley
 Back out inter.get changes, make optimizers an ordered list  | 
417  | 
_optimisers = []  | 
| 
1852.8.2
by Robert Collins
 Add InterTree class to represent InterTree operations.  | 
418  | 
|
| 
1852.11.1
by Robert Collins
 Deprecate compare_trees and move its body to InterTree.changes_from.  | 
419  | 
    @needs_read_lock
 | 
| 
1852.9.4
by Robert Collins
 Add minimal test for Tree.compare(extra_trees=...).  | 
420  | 
def compare(self, want_unchanged=False, specific_files=None,  | 
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
421  | 
extra_trees=None, require_versioned=False, include_root=False):  | 
| 
1852.9.3
by Robert Collins
 Convert the test_delta tests to intertree_implementation and workingtree_implementation tests as appropriate.  | 
422  | 
"""Return the changes from source to target.  | 
| 
1852.8.3
by Robert Collins
 Implement an InterTreeTestProvider and a trivial test_compare test case.  | 
423  | 
|
424  | 
        :return: A TreeDelta.
 | 
|
| 
1852.9.4
by Robert Collins
 Add minimal test for Tree.compare(extra_trees=...).  | 
425  | 
        :param specific_files: An optional list of file paths to restrict the
 | 
426  | 
            comparison to. When mapping filenames to ids, all matches in all
 | 
|
427  | 
            trees (including optional extra_trees) are used, and all children of
 | 
|
428  | 
            matched directories are included.
 | 
|
429  | 
        :param want_unchanged: An optional boolean requesting the inclusion of
 | 
|
430  | 
            unchanged entries in the result.
 | 
|
431  | 
        :param extra_trees: An optional list of additional trees to use when
 | 
|
432  | 
            mapping the contents of specific_files (paths) to file_ids.
 | 
|
| 
1852.9.5
by Robert Collins
 Add tests for require_versioned to the InterTree.compare() test suite.  | 
433  | 
        :param require_versioned: An optional boolean (defaults to False). When
 | 
434  | 
            supplied and True all the 'specific_files' must be versioned, or
 | 
|
435  | 
            a PathsNotVersionedError will be thrown.
 | 
|
| 
1852.8.3
by Robert Collins
 Implement an InterTreeTestProvider and a trivial test_compare test case.  | 
436  | 
        """
 | 
| 
1852.11.1
by Robert Collins
 Deprecate compare_trees and move its body to InterTree.changes_from.  | 
437  | 
        # NB: show_status depends on being able to pass in non-versioned files and
 | 
438  | 
        # report them as unknown
 | 
|
439  | 
trees = (self.source, self.target)  | 
|
440  | 
if extra_trees is not None:  | 
|
441  | 
trees = trees + tuple(extra_trees)  | 
|
442  | 
specific_file_ids = find_ids_across_trees(specific_files,  | 
|
443  | 
trees, require_versioned=require_versioned)  | 
|
444  | 
if specific_files and not specific_file_ids:  | 
|
445  | 
            # All files are unversioned, so just return an empty delta
 | 
|
446  | 
            # _compare_trees would think we want a complete delta
 | 
|
447  | 
return delta.TreeDelta()  | 
|
448  | 
return delta._compare_trees(self.source, self.target, want_unchanged,  | 
|
| 
1910.2.56
by Aaron Bentley
 More work on bundles  | 
449  | 
specific_file_ids, include_root)  | 
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
450  | 
|
| 
2012.1.10
by Aaron Bentley
 Make iter_changes private, so it can be changed freely  | 
451  | 
def _iter_changes(self, from_tree, to_tree, include_unchanged,  | 
452  | 
specific_file_ids):  | 
|
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
453  | 
"""Generate an iterator of changes between trees.  | 
454  | 
||
455  | 
        A tuple is returned:
 | 
|
456  | 
        (file_id, path, changed_content, versioned, parent, name, kind,
 | 
|
457  | 
         executable)
 | 
|
458  | 
||
| 
2012.1.3
by Aaron Bentley
 Always generate tuples (because kind is always used, even when not different)  | 
459  | 
        Path is relative to the to_tree.  changed_content is True if the file's
 | 
460  | 
        content has changed.  This includes changes to its kind, and to
 | 
|
461  | 
        a symlink's target.
 | 
|
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
462  | 
|
| 
2012.1.15
by Aaron Bentley
 Minor tweaks  | 
463  | 
        versioned, parent, name, kind, executable are tuples of (from, to).
 | 
464  | 
        If a file is missing in a tree, its kind is None.
 | 
|
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
465  | 
|
466  | 
        Iteration is done in parent-to-child order, relative to the to_tree.
 | 
|
467  | 
        """
 | 
|
468  | 
to_paths = {}  | 
|
| 
2012.1.5
by Aaron Bentley
 Implement specific file id and dangling id handling  | 
469  | 
if specific_file_ids is not None:  | 
470  | 
specific_file_ids = set(specific_file_ids)  | 
|
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
471  | 
from_entries_by_dir = list(from_tree.iter_entries_by_dir())  | 
472  | 
from_data = dict((e.file_id, (p, e)) for p, e in from_entries_by_dir)  | 
|
473  | 
for to_path, to_entry in to_tree.iter_entries_by_dir():  | 
|
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
474  | 
file_id = to_entry.file_id  | 
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
475  | 
to_paths[file_id] = to_path  | 
| 
2012.1.5
by Aaron Bentley
 Implement specific file id and dangling id handling  | 
476  | 
if (specific_file_ids is not None and  | 
477  | 
file_id not in specific_file_ids):  | 
|
478  | 
                continue
 | 
|
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
479  | 
changed_content = False  | 
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
480  | 
from_path, from_entry = from_data.get(file_id, (None, None))  | 
481  | 
from_versioned = (from_entry is not None)  | 
|
482  | 
if from_entry is not None:  | 
|
483  | 
from_versioned = True  | 
|
484  | 
from_name = from_entry.name  | 
|
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
485  | 
from_parent = from_entry.parent_id  | 
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
486  | 
from_kind, from_executable, from_stat = \  | 
487  | 
from_tree._comparison_data(from_entry, from_path)  | 
|
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
488  | 
else:  | 
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
489  | 
from_versioned = False  | 
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
490  | 
from_kind = None  | 
491  | 
from_parent = None  | 
|
492  | 
from_name = None  | 
|
493  | 
from_executable = None  | 
|
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
494  | 
versioned = (from_versioned, True)  | 
495  | 
to_kind, to_executable, to_stat = \  | 
|
496  | 
to_tree._comparison_data(to_entry, to_path)  | 
|
| 
2012.1.3
by Aaron Bentley
 Always generate tuples (because kind is always used, even when not different)  | 
497  | 
kind = (from_kind, to_kind)  | 
498  | 
if kind[0] != kind[1]:  | 
|
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
499  | 
changed_content = True  | 
| 
2012.1.2
by Aaron Bentley
 reimplement compare_trees  | 
500  | 
elif from_kind == 'file':  | 
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
501  | 
from_size = from_tree._file_size(from_entry, from_stat)  | 
502  | 
to_size = to_tree._file_size(to_entry, to_stat)  | 
|
503  | 
if from_size != to_size:  | 
|
504  | 
changed_content = True  | 
|
505  | 
elif (from_tree.get_file_sha1(file_id, from_path, from_stat) !=  | 
|
506  | 
to_tree.get_file_sha1(file_id, to_path, to_stat)):  | 
|
| 
2012.1.2
by Aaron Bentley
 reimplement compare_trees  | 
507  | 
changed_content = True  | 
508  | 
elif from_kind == 'symlink':  | 
|
509  | 
if (from_tree.get_symlink_target(file_id) !=  | 
|
510  | 
to_tree.get_symlink_target(file_id)):  | 
|
511  | 
changed_content = True  | 
|
| 
2012.1.3
by Aaron Bentley
 Always generate tuples (because kind is always used, even when not different)  | 
512  | 
parent = (from_parent, to_entry.parent_id)  | 
513  | 
name = (from_name, to_entry.name)  | 
|
514  | 
executable = (from_executable, to_executable)  | 
|
515  | 
if (changed_content is not False or versioned[0] != versioned[1]  | 
|
516  | 
or parent[0] != parent[1] or name[0] != name[1] or  | 
|
517  | 
executable[0] != executable[1] or include_unchanged):  | 
|
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
518  | 
yield (file_id, to_path, changed_content, versioned, parent,  | 
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
519  | 
name, kind, executable)  | 
520  | 
||
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
521  | 
for path, from_entry in from_entries_by_dir:  | 
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
522  | 
file_id = from_entry.file_id  | 
523  | 
if file_id in to_paths:  | 
|
524  | 
                continue
 | 
|
| 
2012.1.8
by Aaron Bentley
 Merge from bzr.dev  | 
525  | 
if from_entry.parent_id is None:  | 
526  | 
to_path = ''  | 
|
527  | 
else:  | 
|
528  | 
to_path = osutils.pathjoin(to_paths[from_entry.parent_id],  | 
|
529  | 
from_entry.name)  | 
|
| 
2012.1.5
by Aaron Bentley
 Implement specific file id and dangling id handling  | 
530  | 
to_paths[file_id] = to_path  | 
531  | 
if (specific_file_ids is not None and  | 
|
532  | 
file_id not in specific_file_ids):  | 
|
533  | 
                continue
 | 
|
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
534  | 
versioned = (True, False)  | 
535  | 
parent = (from_entry.parent_id, None)  | 
|
536  | 
name = (from_entry.name, None)  | 
|
| 
2012.1.7
by Aaron Bentley
 Get tree._iter_changed down to ~ 1 stat per file  | 
537  | 
from_kind, from_executable, stat_value = \  | 
538  | 
from_tree._comparison_data(from_entry, path)  | 
|
539  | 
kind = (from_kind, None)  | 
|
| 
2012.1.2
by Aaron Bentley
 reimplement compare_trees  | 
540  | 
executable = (from_executable, None)  | 
| 
2012.1.1
by Aaron Bentley
 Implement change iterator  | 
541  | 
changed_content = True  | 
542  | 
            # the parent's path is necessarily known at this point.
 | 
|
543  | 
yield(file_id, to_path, changed_content, versioned, parent,  | 
|
544  | 
name, kind, executable)  | 
|
| 
2012.1.8
by Aaron Bentley
 Merge from bzr.dev  | 
545  | 
|
| 
2079.1.1
by John Arbash Meinel
 Create a deprecated bzrlib.tree.RevisionTree() in favor of bzrlib.revisiontree.RevisionTree()  | 
546  | 
|
547  | 
# This was deprecated before 0.12, but did not have an official warning
 | 
|
548  | 
@symbol_versioning.deprecated_function(symbol_versioning.zero_twelve)  | 
|
549  | 
def RevisionTree(*args, **kwargs):  | 
|
550  | 
"""RevisionTree has moved to bzrlib.revisiontree.RevisionTree()  | 
|
551  | 
||
552  | 
    Accessing it as bzrlib.tree.RevisionTree has been deprecated as of
 | 
|
553  | 
    bzr 0.12.
 | 
|
554  | 
    """
 | 
|
555  | 
from bzrlib.revisiontree import RevisionTree as _RevisionTree  | 
|
556  | 
return _RevisionTree(*args, **kwargs)  | 
|
557  | 
||
558  |