~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2005-2010 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
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
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
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
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
16
2225.1.1 by Aaron Bentley
Added revert change display, with tests
17
from bzrlib import (
18
    errors,
19
    osutils,
20
    )
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
21
from bzrlib.inventory import InventoryEntry
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
22
from bzrlib.trace import mutter, is_quiet
2696.1.1 by Martin Pool
Remove things deprecated in 0.11 and earlier
23
from bzrlib.symbol_versioning import deprecated_function
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
24
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
25
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
26
class TreeDelta(object):
27
    """Describes changes from one tree to another.
28
3874.3.3 by Vincent Ladeuil
Finish TreeDelta.show() refactoring.
29
    Contains seven lists:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
30
31
    added
32
        (path, id, kind)
33
    removed
34
        (path, id, kind)
35
    renamed
1398 by Robert Collins
integrate in Gustavos x-bit patch
36
        (oldpath, newpath, id, kind, text_modified, meta_modified)
3874.3.3 by Vincent Ladeuil
Finish TreeDelta.show() refactoring.
37
    kind_changed
38
        (path, id, old_kind, new_kind)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
39
    modified
1398 by Robert Collins
integrate in Gustavos x-bit patch
40
        (path, id, kind, text_modified, meta_modified)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
41
    unchanged
42
        (path, id, kind)
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
43
    unversioned
3874.3.2 by Vincent Ladeuil
Fix typo.
44
        (path, None, kind)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
45
46
    Each id is listed only once.
47
48
    Files that are both modified and renamed are listed only in
1092.2.6 by Robert Collins
symlink support updated to work
49
    renamed, with the text_modified flag true. The text_modified
4775.1.1 by Martin Pool
Remove several 'the the' typos
50
    applies either to the content of the file or the target of the
1092.2.6 by Robert Collins
symlink support updated to work
51
    symbolic link, depending of the kind of file.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
52
53
    Files are only considered renamed if their name has changed or
54
    their parent directory has changed.  Renaming a directory
55
    does not count as renaming all its contents.
56
57
    The lists are normally sorted when the delta is created.
58
    """
59
    def __init__(self):
60
        self.added = []
61
        self.removed = []
62
        self.renamed = []
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
63
        self.kind_changed = []
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
64
        self.modified = []
65
        self.unchanged = []
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
66
        self.unversioned = []
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
67
68
    def __eq__(self, other):
69
        if not isinstance(other, TreeDelta):
70
            return False
71
        return self.added == other.added \
72
               and self.removed == other.removed \
73
               and self.renamed == other.renamed \
74
               and self.modified == other.modified \
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
75
               and self.unchanged == other.unchanged \
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
76
               and self.kind_changed == other.kind_changed \
77
               and self.unversioned == other.unversioned
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
78
79
    def __ne__(self, other):
80
        return not (self == other)
81
82
    def __repr__(self):
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
83
        return "TreeDelta(added=%r, removed=%r, renamed=%r," \
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
84
            " kind_changed=%r, modified=%r, unchanged=%r," \
85
            " unversioned=%r)" % (self.added,
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
86
            self.removed, self.renamed, self.kind_changed, self.modified,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
87
            self.unchanged, self.unversioned)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
88
89
    def has_changed(self):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
90
        return bool(self.modified
91
                    or self.added
92
                    or self.removed
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
93
                    or self.renamed
94
                    or self.kind_changed)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
95
96
    def touches_file_id(self, file_id):
97
        """Return True if file_id is modified by this delta."""
98
        for l in self.added, self.removed, self.modified:
99
            for v in l:
100
                if v[1] == file_id:
101
                    return True
102
        for v in self.renamed:
103
            if v[2] == file_id:
104
                return True
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
105
        for v in self.kind_changed:
106
            if v[1] == file_id:
107
                return True
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
108
        return False
3874.2.1 by Vincent Ladeuil
Empty lines.
109
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
110
    def get_changes_as_text(self, show_ids=False, show_unchanged=False,
5076.4.3 by Arnaud Jeansen
Port get_changes_as_text to the report callbacks
111
                            short_status=False):
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
112
        import StringIO
113
        output = StringIO.StringIO()
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
114
        report_delta(output, self, short_status, show_ids, show_unchanged)
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
115
        return output.getvalue()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
116
1731.1.33 by Aaron Bentley
Revert no-special-root changes
117
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
118
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
119
                   include_root, extra_trees=None,
2655.2.1 by Marius Kruger
InterTree.compare and delta._compare_trees did not pass its
120
                   require_versioned=False, want_unversioned=False):
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
121
    """Worker function that implements Tree.changes_from."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
122
    delta = TreeDelta()
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
123
    # mutter('start compare_trees')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
124
2012.1.2 by Aaron Bentley
reimplement compare_trees
125
    for (file_id, path, content_change, versioned, parent_id, name, kind,
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
126
         executable) in new_tree.iter_changes(old_tree, want_unchanged,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
127
            specific_files, extra_trees=extra_trees,
2655.2.1 by Marius Kruger
InterTree.compare and delta._compare_trees did not pass its
128
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
129
            want_unversioned=want_unversioned):
130
        if versioned == (False, False):
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
131
            delta.unversioned.append((path[1], None, kind[1]))
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
132
            continue
2012.1.8 by Aaron Bentley
Merge from bzr.dev
133
        if not include_root and (None, None) == parent_id:
2012.1.2 by Aaron Bentley
reimplement compare_trees
134
            continue
2012.1.4 by Aaron Bentley
Simplify add/remove code
135
        fully_present = tuple((versioned[x] and kind[x] is not None) for
136
                              x in range(2))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
137
        if fully_present[0] != fully_present[1]:
138
            if fully_present[1] is True:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
139
                delta.added.append((path[1], file_id, kind[1]))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
140
            else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
141
                delta.removed.append((path[0], file_id, kind[0]))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
142
        elif fully_present[0] is False:
143
            continue
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
144
        elif name[0] != name[1] or parent_id[0] != parent_id[1]:
2012.1.4 by Aaron Bentley
Simplify add/remove code
145
            # If the name changes, or the parent_id changes, we have a rename
146
            # (if we move a parent, that doesn't count as a rename for the
147
            # file)
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
148
            delta.renamed.append((path[0],
149
                                  path[1],
150
                                  file_id,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
151
                                  kind[1],
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
152
                                  content_change,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
153
                                  (executable[0] != executable[1])))
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
154
        elif kind[0] != kind[1]:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
155
            delta.kind_changed.append((path[1], file_id, kind[0], kind[1]))
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
156
        elif content_change or executable[0] != executable[1]:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
157
            delta.modified.append((path[1], file_id, kind[1],
158
                                   content_change,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
159
                                   (executable[0] != executable[1])))
2012.1.2 by Aaron Bentley
reimplement compare_trees
160
        else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
161
            delta.unchanged.append((path[1], file_id, kind[1]))
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
162
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
163
    delta.removed.sort()
164
    delta.added.sort()
165
    delta.renamed.sort()
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
166
    # TODO: jam 20060529 These lists shouldn't need to be sorted
167
    #       since we added them in alphabetical order.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
168
    delta.modified.sort()
169
    delta.unchanged.sort()
170
171
    return delta
2225.1.1 by Aaron Bentley
Added revert change display, with tests
172
173
1551.10.25 by Aaron Bentley
Make ChangeReporter private
174
class _ChangeReporter(object):
2225.1.1 by Aaron Bentley
Added revert change display, with tests
175
    """Report changes between two trees"""
176
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
177
    def __init__(self, output=None, suppress_root_add=True,
3586.1.30 by Ian Clatworthy
add view support to change reporting
178
                 output_file=None, unversioned_filter=None, view_info=None):
1551.10.7 by Aaron Bentley
Use new-style output for status
179
        """Constructor
180
181
        :param output: a function with the signature of trace.note, i.e.
182
            accepts a format and parameters.
183
        :param supress_root_add: If true, adding the root will be ignored
184
            (i.e. when a tree has just been initted)
1551.10.8 by Aaron Bentley
Make ChangeReporter interface nicer
185
        :param output_file: If supplied, a file-like object to write to.
186
            Only one of output and output_file may be supplied.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
187
        :param unversioned_filter: A filter function to be called on
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
188
            unversioned files. This should return True to ignore a path.
189
            By default, no filtering takes place.
3586.1.30 by Ian Clatworthy
add view support to change reporting
190
        :param view_info: A tuple of view_name,view_files if only
191
            items inside a view are to be reported on, or None for
192
            no view filtering.
1551.10.7 by Aaron Bentley
Use new-style output for status
193
        """
1551.10.8 by Aaron Bentley
Make ChangeReporter interface nicer
194
        if output_file is not None:
195
            if output is not None:
196
                raise BzrError('Cannot specify both output and output_file')
197
            def output(fmt, *args):
198
                output_file.write((fmt % args) + '\n')
2225.1.1 by Aaron Bentley
Added revert change display, with tests
199
        self.output = output
200
        if self.output is None:
201
            from bzrlib import trace
202
            self.output = trace.note
1551.10.7 by Aaron Bentley
Use new-style output for status
203
        self.suppress_root_add = suppress_root_add
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
204
        self.modified_map = {'kind changed': 'K',
205
                             'unchanged': ' ',
206
                             'created': 'N',
207
                             'modified': 'M',
208
                             'deleted': 'D'}
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
209
        self.versioned_map = {'added': '+', # versioned target
210
                              'unchanged': ' ', # versioned in both
211
                              'removed': '-', # versioned in source
212
                              'unversioned': '?', # versioned in neither
213
                              }
214
        self.unversioned_filter = unversioned_filter
3586.1.30 by Ian Clatworthy
add view support to change reporting
215
        if view_info is None:
216
            self.view_name = None
217
            self.view_files = []
218
        else:
219
            self.view_name = view_info[0]
220
            self.view_files = view_info[1]
221
            self.output("Operating on whole tree but only reporting on "
222
                        "'%s' view." % (self.view_name,))
2225.1.1 by Aaron Bentley
Added revert change display, with tests
223
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
224
    def report(self, file_id, paths, versioned, renamed, modified, exe_change,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
225
               kind):
226
        """Report one change to a file
2225.1.5 by Aaron Bentley
Clean up whitespace changes
227
2225.1.1 by Aaron Bentley
Added revert change display, with tests
228
        :param file_id: The file_id of the file
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
229
        :param path: The old and new paths as generated by Tree.iter_changes.
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
230
        :param versioned: may be 'added', 'removed', 'unchanged', or
231
            'unversioned.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
232
        :param renamed: may be True or False
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
233
        :param modified: may be 'created', 'deleted', 'kind changed',
2225.1.1 by Aaron Bentley
Added revert change display, with tests
234
            'modified' or 'unchanged'.
235
        :param exe_change: True if the execute bit has changed
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
236
        :param kind: A pair of file kinds, as generated by Tree.iter_changes.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
237
            None indicates no file present.
238
        """
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
239
        if is_quiet():
240
            return
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
241
        if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
1551.10.7 by Aaron Bentley
Use new-style output for status
242
            return
3586.1.30 by Ian Clatworthy
add view support to change reporting
243
        if self.view_files and not osutils.is_inside_any(self.view_files,
244
            paths[1]):
245
            return
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
246
        if versioned == 'unversioned':
247
            # skip ignored unversioned files if needed.
248
            if self.unversioned_filter is not None:
249
                if self.unversioned_filter(paths[1]):
250
                    return
251
            # dont show a content change in the output.
252
            modified = 'unchanged'
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
253
        # we show both paths in the following situations:
254
        # the file versioning is unchanged AND
255
        # ( the path is different OR
256
        #   the kind is different)
257
        if (versioned == 'unchanged' and
258
            (renamed or modified == 'kind changed')):
259
            if renamed:
260
                # on a rename, we show old and new
261
                old_path, path = paths
262
            else:
2592.3.231 by Martin Pool
typo
263
                # if it's not renamed, we're showing both for kind changes
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
264
                # so only show the new path
265
                old_path, path = paths[1], paths[1]
266
            # if the file is not missing in the source, we show its kind
267
            # when we show two paths.
268
            if kind[0] is not None:
269
                old_path += osutils.kind_marker(kind[0])
270
            old_path += " => "
2255.2.231 by Robert Collins
Add test showing reverts UI working as Aaron intended it to.
271
        elif versioned == 'removed':
272
            # not present in target
273
            old_path = ""
274
            path = paths[0]
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
275
        else:
276
            old_path = ""
277
            path = paths[1]
2225.1.1 by Aaron Bentley
Added revert change display, with tests
278
        if renamed:
279
            rename = "R"
280
        else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
281
            rename = self.versioned_map[versioned]
282
        # we show the old kind on the new path when the content is deleted.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
283
        if modified == 'deleted':
284
            path += osutils.kind_marker(kind[0])
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
285
        # otherwise we always show the current kind when there is one
1551.10.11 by Aaron Bentley
Handle case where file-id only is added
286
        elif kind[1] is not None:
2225.1.1 by Aaron Bentley
Added revert change display, with tests
287
            path += osutils.kind_marker(kind[1])
288
        if exe_change:
289
            exe = '*'
290
        else:
291
            exe = ' '
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
292
        self.output("%s%s%s %s%s", rename, self.modified_map[modified], exe,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
293
                    old_path, path)
294
295
def report_changes(change_iterator, reporter):
296
    """Report the changes from a change iterator.
297
298
    This is essentially a translation from low-level to medium-level changes.
299
    Further processing may be required to produce a human-readable output.
300
    Unfortunately, some tree-changing operations are very complex
301
    :change_iterator: an iterator or sequence of changes in the format
3254.1.1 by Aaron Bentley
Make Tree.iter_changes a public method
302
        generated by Tree.iter_changes
1551.10.25 by Aaron Bentley
Make ChangeReporter private
303
    :param reporter: The _ChangeReporter that will report the changes.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
304
    """
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
305
    versioned_change_map = {
306
        (True, True)  : 'unchanged',
307
        (True, False) : 'removed',
308
        (False, True) : 'added',
309
        (False, False): 'unversioned',
310
        }
2225.1.1 by Aaron Bentley
Added revert change display, with tests
311
    for (file_id, path, content_change, versioned, parent_id, name, kind,
312
         executable) in change_iterator:
313
        exe_change = False
314
        # files are "renamed" if they are moved or if name changes, as long
315
        # as it had a value
1551.11.3 by Aaron Bentley
Use tree transform to emit upcoming change list
316
        if None not in name and None not in parent_id and\
317
            (name[0] != name[1] or parent_id[0] != parent_id[1]):
2225.1.1 by Aaron Bentley
Added revert change display, with tests
318
            renamed = True
319
        else:
320
            renamed = False
321
        if kind[0] != kind[1]:
322
            if kind[0] is None:
323
                modified = "created"
324
            elif kind[1] is None:
325
                modified = "deleted"
326
            else:
327
                modified = "kind changed"
328
        else:
329
            if content_change:
330
                modified = "modified"
331
            else:
332
                modified = "unchanged"
333
            if kind[1] == "file":
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
334
                exe_change = (executable[0] != executable[1])
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
335
        versioned_change = versioned_change_map[versioned]
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
336
        reporter.report(file_id, path, versioned_change, renamed, modified,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
337
                        exe_change, kind)
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
338
5076.4.4 by Arnaud Jeansen
Add a unified report_delta method
339
def report_delta(to_file, delta, short_status=False, show_ids=False, 
340
         show_unchanged=False, indent='', filter=None):
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
341
    """Output this delta in status-like form to to_file.
342
343
    :param to_file: A file-like object where the output is displayed.
344
345
    :param delta: A TreeDelta containing the changes to be displayed
346
347
    :param short_status: Single-line status if True.
348
349
    :param show_ids: Output the file ids if True.
350
351
    :param show_unchanged: Output the unchanged files if True.
352
353
    :param indent: Added at the beginning of all output lines (for merged
354
        revisions).
355
356
    :param filter: A callable receiving a path and a file id and
357
        returning True if the path should be displayed.
358
    """
359
360
    def decorate_path(path, kind, meta_modified=None):
361
        if kind == 'directory':
362
            path += '/'
363
        elif kind == 'symlink':
364
            path += '@'
365
        if meta_modified:
366
            path += '*'
367
        return path
368
369
    def show_more_renamed(item):
370
        (oldpath, file_id, kind,
371
         text_modified, meta_modified, newpath) = item
372
        dec_new_path = decorate_path(newpath, kind, meta_modified)
373
        to_file.write(' => %s' % dec_new_path)
374
        if text_modified or meta_modified:
375
            extra_modified.append((newpath, file_id, kind,
376
                                   text_modified, meta_modified))
377
378
    def show_more_kind_changed(item):
379
        (path, file_id, old_kind, new_kind) = item
380
        to_file.write(' (%s => %s)' % (old_kind, new_kind))
381
382
    def show_path(path, file_id, kind, meta_modified,
383
                  default_format, with_file_id_format):
384
        dec_path = decorate_path(path, kind, meta_modified)
385
        if show_ids:
386
            to_file.write(with_file_id_format % dec_path)
387
        else:
388
            to_file.write(default_format % dec_path)
389
390
    def show_list(files, long_status_name, short_status_letter,
391
                  default_format='%s', with_file_id_format='%-30s',
392
                  show_more=None):
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
393
        if files:
394
            header_shown = False
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
395
            if short_status:
396
                prefix = short_status_letter
397
            else:
398
                prefix = ''
399
            prefix = indent + prefix + '  '
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
400
401
            for item in files:
402
                path, file_id, kind = item[:3]
403
                if (filter is not None and not filter(path, file_id)):
404
                    continue
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
405
                if not header_shown and not short_status:
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
406
                    to_file.write(indent + long_status_name + ':\n')
407
                    header_shown = True
408
                meta_modified = None
409
                if len(item) == 5:
410
                    meta_modified = item[4]
411
412
                to_file.write(prefix)
413
                show_path(path, file_id, kind, meta_modified,
414
                          default_format, with_file_id_format)
415
                if show_more is not None:
416
                    show_more(item)
417
                if show_ids:
418
                    to_file.write(' %s' % file_id)
419
                to_file.write('\n')
420
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
421
    show_list(delta.removed, 'removed', 'D')
422
    show_list(delta.added, 'added', 'A')
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
423
    extra_modified = []
424
    # Reorder delta.renamed tuples so that all lists share the same
425
    # order for their 3 first fields and that they also begin like
426
    # the delta.modified tuples
427
    renamed = [(p, i, k, tm, mm, np)
428
               for  p, np, i, k, tm, mm  in delta.renamed]
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
429
    show_list(renamed, 'renamed', 'R', with_file_id_format='%s',
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
430
              show_more=show_more_renamed)
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
431
    show_list(delta.kind_changed, 'kind changed', 'K',
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
432
              with_file_id_format='%s',
433
              show_more=show_more_kind_changed)
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
434
    show_list(delta.modified + extra_modified, 'modified', 'M')
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
435
    if show_unchanged:
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
436
        show_list(delta.unchanged, 'unchanged', 'S')
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
437
5076.4.6 by Arnaud Jeansen
Go back to unified report_delta method (i.e. former TreeDelta.show())
438
    show_list(delta.unversioned, 'unknown', ' ')
5076.4.2 by Arnaud Jeansen
Create a short show callback using the previously removed short code (it was not dead, only not used by status). Port log to directly call the callbacks.
439