~bzr-pqm/bzr/bzr.dev

2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
1
# Copyright (C) 2005, 2006 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
22
from bzrlib.trace import mutter
1904.2.1 by Martin Pool
compare_trees is deprecated in 0.9 not 0.10
23
from bzrlib.symbol_versioning import deprecated_function, zero_nine
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
29
    Contains four lists:
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)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
37
    modified
1398 by Robert Collins
integrate in Gustavos x-bit patch
38
        (path, id, kind, text_modified, meta_modified)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
39
    unchanged
40
        (path, id, kind)
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
41
    unversioned
42
        (path, kind)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
43
44
    Each id is listed only once.
45
46
    Files that are both modified and renamed are listed only in
1092.2.6 by Robert Collins
symlink support updated to work
47
    renamed, with the text_modified flag true. The text_modified
48
    applies either to the the content of the file or the target of the
49
    symbolic link, depending of the kind of file.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
50
51
    Files are only considered renamed if their name has changed or
52
    their parent directory has changed.  Renaming a directory
53
    does not count as renaming all its contents.
54
55
    The lists are normally sorted when the delta is created.
56
    """
57
    def __init__(self):
58
        self.added = []
59
        self.removed = []
60
        self.renamed = []
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
61
        self.kind_changed = []
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
62
        self.modified = []
63
        self.unchanged = []
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
64
        self.unversioned = []
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
65
66
    def __eq__(self, other):
67
        if not isinstance(other, TreeDelta):
68
            return False
69
        return self.added == other.added \
70
               and self.removed == other.removed \
71
               and self.renamed == other.renamed \
72
               and self.modified == other.modified \
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
73
               and self.unchanged == other.unchanged \
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
74
               and self.kind_changed == other.kind_changed \
75
               and self.unversioned == other.unversioned
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
76
77
    def __ne__(self, other):
78
        return not (self == other)
79
80
    def __repr__(self):
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
81
        return "TreeDelta(added=%r, removed=%r, renamed=%r," \
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
82
            " kind_changed=%r, modified=%r, unchanged=%r," \
83
            " unversioned=%r)" % (self.added,
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
84
            self.removed, self.renamed, self.kind_changed, self.modified,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
85
            self.unchanged, self.unversioned)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
86
87
    def has_changed(self):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
88
        return bool(self.modified
89
                    or self.added
90
                    or self.removed
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
91
                    or self.renamed
92
                    or self.kind_changed)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
93
94
    def touches_file_id(self, file_id):
95
        """Return True if file_id is modified by this delta."""
96
        for l in self.added, self.removed, self.modified:
97
            for v in l:
98
                if v[1] == file_id:
99
                    return True
100
        for v in self.renamed:
101
            if v[2] == file_id:
102
                return True
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
103
        for v in self.kind_changed:
104
            if v[1] == file_id:
105
                return True
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
106
        return False
107
            
108
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
109
    def show(self, to_file, show_ids=False, show_unchanged=False,
110
             short_status=False):
1780.2.1 by Robert Collins
Remove some unused imports.
111
        """output this delta in status-like form to to_file."""
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
112
        def show_list(files, short_status_letter=''):
1398 by Robert Collins
integrate in Gustavos x-bit patch
113
            for item in files:
114
                path, fid, kind = item[:3]
115
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
116
                if kind == 'directory':
117
                    path += '/'
118
                elif kind == 'symlink':
119
                    path += '@'
1398 by Robert Collins
integrate in Gustavos x-bit patch
120
121
                if len(item) == 5 and item[4]:
122
                    path += '*'
123
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
124
                if show_ids:
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
125
                    print >>to_file, '%s  %-30s %s' % (short_status_letter,
126
                        path, fid)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
127
                else:
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
128
                    print >>to_file, '%s  %s' % (short_status_letter, path)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
129
            
130
        if self.removed:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
131
            if not short_status:
132
                print >>to_file, 'removed:'
133
                show_list(self.removed)
134
            else:
135
                show_list(self.removed, 'D')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
136
                
137
        if self.added:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
138
            if not short_status:
139
                print >>to_file, 'added:'
140
                show_list(self.added)
141
            else:
142
                show_list(self.added, 'A')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
143
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
144
        extra_modified = []
145
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
146
        if self.renamed:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
147
            short_status_letter = 'R'
148
            if not short_status:
149
                print >>to_file, 'renamed:'
150
                short_status_letter = ''
1398 by Robert Collins
integrate in Gustavos x-bit patch
151
            for (oldpath, newpath, fid, kind,
152
                 text_modified, meta_modified) in self.renamed:
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
153
                if text_modified or meta_modified:
154
                    extra_modified.append((newpath, fid, kind,
155
                                           text_modified, meta_modified))
1398 by Robert Collins
integrate in Gustavos x-bit patch
156
                if meta_modified:
157
                    newpath += '*'
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
158
                if show_ids:
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
159
                    print >>to_file, '%s  %s => %s %s' % (
160
                        short_status_letter, oldpath, newpath, fid)
161
                else:
162
                    print >>to_file, '%s  %s => %s' % (
163
                        short_status_letter, oldpath, newpath)
164
165
        if self.kind_changed:
166
            if short_status:
167
                short_status_letter = 'K'
168
            else:
169
                print >>to_file, 'kind changed:'
170
                short_status_letter = ''
171
            for (path, fid, old_kind, new_kind) in self.kind_changed:
172
                if show_ids:
173
                    suffix = ' '+fid
174
                else:
175
                    suffix = ''
176
                print >>to_file, '%s  %s (%s => %s)%s' % (
177
                    short_status_letter, path, old_kind, new_kind, suffix)
178
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
179
        if self.modified or extra_modified:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
180
            short_status_letter = 'M'
181
            if not short_status:
182
                print >>to_file, 'modified:'
183
                short_status_letter = ''
184
            show_list(self.modified, short_status_letter)
185
            show_list(extra_modified, short_status_letter)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
186
            
187
        if show_unchanged and self.unchanged:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
188
            if not short_status:
189
                print >>to_file, 'unchanged:'
190
                show_list(self.unchanged)
191
            else:
192
                show_list(self.unchanged, 'S')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
193
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
194
        if self.unversioned:
195
            print >>to_file, 'unknown:'
196
            show_list(self.unversioned)
197
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
198
1904.2.1 by Martin Pool
compare_trees is deprecated in 0.9 not 0.10
199
@deprecated_function(zero_nine)
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
200
def compare_trees(old_tree, new_tree, want_unchanged=False,
201
                  specific_files=None, extra_trees=None,
1731.1.62 by Aaron Bentley
Changes from review comments
202
                  require_versioned=False):
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
203
    """compare_trees was deprecated in 0.10. Please see Tree.changes_from."""
204
    return new_tree.changes_from(old_tree,
205
        want_unchanged=want_unchanged,
206
        specific_files=specific_files,
207
        extra_trees=extra_trees,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
208
        require_versioned=require_versioned,
1731.1.62 by Aaron Bentley
Changes from review comments
209
        include_root=False)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
210
211
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
212
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
213
                   include_root, extra_trees=None,
214
                   want_unversioned=False):
215
    """Worker function that implements Tree.changes_from."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
216
    delta = TreeDelta()
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
217
    # mutter('start compare_trees')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
218
2012.1.2 by Aaron Bentley
reimplement compare_trees
219
    for (file_id, path, content_change, versioned, parent_id, name, kind,
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
220
         executable) in new_tree._iter_changes(old_tree, want_unchanged,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
221
            specific_files, extra_trees=extra_trees,
222
            want_unversioned=want_unversioned):
223
        if versioned == (False, False):
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
224
            delta.unversioned.append((path[1], None, kind[1]))
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
225
            continue
2012.1.8 by Aaron Bentley
Merge from bzr.dev
226
        if not include_root and (None, None) == parent_id:
2012.1.2 by Aaron Bentley
reimplement compare_trees
227
            continue
2012.1.4 by Aaron Bentley
Simplify add/remove code
228
        fully_present = tuple((versioned[x] and kind[x] is not None) for
229
                              x in range(2))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
230
        if fully_present[0] != fully_present[1]:
231
            if fully_present[1] is True:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
232
                delta.added.append((path[1], file_id, kind[1]))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
233
            else:
234
                assert fully_present[0] is True
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
235
                delta.removed.append((path[0], file_id, kind[0]))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
236
        elif fully_present[0] is False:
237
            continue
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
238
        elif name[0] != name[1] or parent_id[0] != parent_id[1]:
2012.1.4 by Aaron Bentley
Simplify add/remove code
239
            # If the name changes, or the parent_id changes, we have a rename
240
            # (if we move a parent, that doesn't count as a rename for the
241
            # file)
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
242
            delta.renamed.append((path[0],
243
                                  path[1],
244
                                  file_id,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
245
                                  kind[1],
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
246
                                  content_change,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
247
                                  (executable[0] != executable[1])))
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
248
        elif kind[0] != kind[1]:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
249
            delta.kind_changed.append((path[1], file_id, kind[0], kind[1]))
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
250
        elif content_change is True or executable[0] != executable[1]:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
251
            delta.modified.append((path[1], file_id, kind[1],
252
                                   content_change,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
253
                                   (executable[0] != executable[1])))
2012.1.2 by Aaron Bentley
reimplement compare_trees
254
        else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
255
            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.
256
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
257
    delta.removed.sort()
258
    delta.added.sort()
259
    delta.renamed.sort()
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
260
    # TODO: jam 20060529 These lists shouldn't need to be sorted
261
    #       since we added them in alphabetical order.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
262
    delta.modified.sort()
263
    delta.unchanged.sort()
264
265
    return delta
2225.1.1 by Aaron Bentley
Added revert change display, with tests
266
267
1551.10.25 by Aaron Bentley
Make ChangeReporter private
268
class _ChangeReporter(object):
2225.1.1 by Aaron Bentley
Added revert change display, with tests
269
    """Report changes between two trees"""
270
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
271
    def __init__(self, output=None, suppress_root_add=True,
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
272
                 output_file=None, unversioned_filter=None):
1551.10.7 by Aaron Bentley
Use new-style output for status
273
        """Constructor
274
275
        :param output: a function with the signature of trace.note, i.e.
276
            accepts a format and parameters.
277
        :param supress_root_add: If true, adding the root will be ignored
278
            (i.e. when a tree has just been initted)
1551.10.8 by Aaron Bentley
Make ChangeReporter interface nicer
279
        :param output_file: If supplied, a file-like object to write to.
280
            Only one of output and output_file may be supplied.
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
281
        :param unversioned_filter: A filter function to be called on 
282
            unversioned files. This should return True to ignore a path.
283
            By default, no filtering takes place.
1551.10.7 by Aaron Bentley
Use new-style output for status
284
        """
1551.10.8 by Aaron Bentley
Make ChangeReporter interface nicer
285
        if output_file is not None:
286
            if output is not None:
287
                raise BzrError('Cannot specify both output and output_file')
288
            def output(fmt, *args):
289
                output_file.write((fmt % args) + '\n')
2225.1.1 by Aaron Bentley
Added revert change display, with tests
290
        self.output = output
291
        if self.output is None:
292
            from bzrlib import trace
293
            self.output = trace.note
1551.10.7 by Aaron Bentley
Use new-style output for status
294
        self.suppress_root_add = suppress_root_add
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
295
        self.modified_map = {'kind changed': 'K',
296
                             'unchanged': ' ',
297
                             'created': 'N',
298
                             'modified': 'M',
299
                             'deleted': 'D'}
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
300
        self.versioned_map = {'added': '+', # versioned target
301
                              'unchanged': ' ', # versioned in both
302
                              'removed': '-', # versioned in source
303
                              'unversioned': '?', # versioned in neither
304
                              }
305
        self.unversioned_filter = unversioned_filter
2225.1.1 by Aaron Bentley
Added revert change display, with tests
306
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
307
    def report(self, file_id, paths, versioned, renamed, modified, exe_change,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
308
               kind):
309
        """Report one change to a file
2225.1.5 by Aaron Bentley
Clean up whitespace changes
310
2225.1.1 by Aaron Bentley
Added revert change display, with tests
311
        :param file_id: The file_id of the file
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
312
        :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.
313
        :param versioned: may be 'added', 'removed', 'unchanged', or
314
            'unversioned.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
315
        :param renamed: may be True or False
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
316
        :param modified: may be 'created', 'deleted', 'kind changed',
2225.1.1 by Aaron Bentley
Added revert change display, with tests
317
            'modified' or 'unchanged'.
318
        :param exe_change: True if the execute bit has changed
319
        :param kind: A pair of file kinds, as generated by Tree._iter_changes.
320
            None indicates no file present.
321
        """
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
322
        if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
1551.10.7 by Aaron Bentley
Use new-style output for status
323
            return
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
324
        if versioned == 'unversioned':
325
            # skip ignored unversioned files if needed.
326
            if self.unversioned_filter is not None:
327
                if self.unversioned_filter(paths[1]):
328
                    return
329
            # dont show a content change in the output.
330
            modified = 'unchanged'
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
331
        # we show both paths in the following situations:
332
        # the file versioning is unchanged AND
333
        # ( the path is different OR
334
        #   the kind is different)
335
        if (versioned == 'unchanged' and
336
            (renamed or modified == 'kind changed')):
337
            if renamed:
338
                # on a rename, we show old and new
339
                old_path, path = paths
340
            else:
341
                # if its not renamed, we're showing both for kind changes
342
                # so only show the new path
343
                old_path, path = paths[1], paths[1]
344
            # if the file is not missing in the source, we show its kind
345
            # when we show two paths.
346
            if kind[0] is not None:
347
                old_path += osutils.kind_marker(kind[0])
348
            old_path += " => "
2255.2.231 by Robert Collins
Add test showing reverts UI working as Aaron intended it to.
349
        elif versioned == 'removed':
350
            # not present in target
351
            old_path = ""
352
            path = paths[0]
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
353
        else:
354
            old_path = ""
355
            path = paths[1]
2225.1.1 by Aaron Bentley
Added revert change display, with tests
356
        if renamed:
357
            rename = "R"
358
        else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
359
            rename = self.versioned_map[versioned]
360
        # 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
361
        if modified == 'deleted':
362
            path += osutils.kind_marker(kind[0])
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
363
        # 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
364
        elif kind[1] is not None:
2225.1.1 by Aaron Bentley
Added revert change display, with tests
365
            path += osutils.kind_marker(kind[1])
366
        if exe_change:
367
            exe = '*'
368
        else:
369
            exe = ' '
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
370
        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
371
                    old_path, path)
372
373
374
def report_changes(change_iterator, reporter):
375
    """Report the changes from a change iterator.
376
377
    This is essentially a translation from low-level to medium-level changes.
378
    Further processing may be required to produce a human-readable output.
379
    Unfortunately, some tree-changing operations are very complex
380
    :change_iterator: an iterator or sequence of changes in the format
381
        generated by Tree._iter_changes
1551.10.25 by Aaron Bentley
Make ChangeReporter private
382
    :param reporter: The _ChangeReporter that will report the changes.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
383
    """
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
384
    versioned_change_map = {
385
        (True, True)  : 'unchanged',
386
        (True, False) : 'removed',
387
        (False, True) : 'added',
388
        (False, False): 'unversioned',
389
        }
2225.1.1 by Aaron Bentley
Added revert change display, with tests
390
    for (file_id, path, content_change, versioned, parent_id, name, kind,
391
         executable) in change_iterator:
392
        exe_change = False
393
        # files are "renamed" if they are moved or if name changes, as long
394
        # as it had a value
1551.11.3 by Aaron Bentley
Use tree transform to emit upcoming change list
395
        if None not in name and None not in parent_id and\
396
            (name[0] != name[1] or parent_id[0] != parent_id[1]):
2225.1.1 by Aaron Bentley
Added revert change display, with tests
397
            renamed = True
398
        else:
399
            renamed = False
400
        if kind[0] != kind[1]:
401
            if kind[0] is None:
402
                modified = "created"
403
            elif kind[1] is None:
404
                modified = "deleted"
405
            else:
406
                modified = "kind changed"
407
        else:
408
            if content_change:
409
                modified = "modified"
410
            else:
411
                modified = "unchanged"
412
            if kind[1] == "file":
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
413
                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.
414
        versioned_change = versioned_change_map[versioned]
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
415
        reporter.report(file_id, path, versioned_change, renamed, modified,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
416
                        exe_change, kind)