~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
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
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,
2466.11.1 by Kent Gibson
Long log format reports deltas on merge revisions.
110
             short_status=False, indent=''):
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:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
125
                    to_file.write(indent + '%s  %-30s %s\n' % (short_status_letter,
126
                        path, fid))
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
127
                else:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
128
                    to_file.write(indent + '%s  %s\n' % (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:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
132
                to_file.write(indent + 'removed:\n')
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
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:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
139
                to_file.write(indent + 'added:\n')
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
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:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
149
                to_file.write(indent + 'renamed:\n')
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
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:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
159
                    to_file.write(indent + '%s  %s => %s %s\n' % (
160
                        short_status_letter, oldpath, newpath, fid))
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
161
                else:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
162
                    to_file.write(indent + '%s  %s => %s\n' % (
163
                        short_status_letter, oldpath, newpath))
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
164
165
        if self.kind_changed:
166
            if short_status:
167
                short_status_letter = 'K'
168
            else:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
169
                to_file.write(indent + 'kind changed:\n')
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
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 = ''
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
176
                to_file.write(indent + '%s  %s (%s => %s)%s\n' % (
177
                    short_status_letter, path, old_kind, new_kind, suffix))
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
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:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
182
                to_file.write(indent + 'modified:\n')
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
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:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
189
                to_file.write(indent + 'unchanged:\n')
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
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:
2911.6.1 by Blake Winton
Change 'print >> f,'s to 'f.write('s.
195
            to_file.write(indent + 'unknown:\n')
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
196
            show_list(self.unversioned)
197
2292.1.25 by Marius Kruger
* Add utility method delta.get_changes_as_text to get the output of .show()
198
    def get_changes_as_text(self, show_ids=False, show_unchanged=False,
199
             short_status=False):
200
        import StringIO
201
        output = StringIO.StringIO()
202
        self.show(output, show_ids, show_unchanged, short_status)
203
        return output.getvalue()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
204
1731.1.33 by Aaron Bentley
Revert no-special-root changes
205
2255.2.149 by Robert Collins
Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
206
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
207
                   include_root, extra_trees=None,
2655.2.1 by Marius Kruger
InterTree.compare and delta._compare_trees did not pass its
208
                   require_versioned=False, want_unversioned=False):
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
209
    """Worker function that implements Tree.changes_from."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
210
    delta = TreeDelta()
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
211
    # mutter('start compare_trees')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
212
2012.1.2 by Aaron Bentley
reimplement compare_trees
213
    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.
214
         executable) in new_tree._iter_changes(old_tree, want_unchanged,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
215
            specific_files, extra_trees=extra_trees,
2655.2.1 by Marius Kruger
InterTree.compare and delta._compare_trees did not pass its
216
            require_versioned=require_versioned,
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
217
            want_unversioned=want_unversioned):
218
        if versioned == (False, False):
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
219
            delta.unversioned.append((path[1], None, kind[1]))
2255.7.90 by Robert Collins
Add unversioned path reporting to TreeDelta.
220
            continue
2012.1.8 by Aaron Bentley
Merge from bzr.dev
221
        if not include_root and (None, None) == parent_id:
2012.1.2 by Aaron Bentley
reimplement compare_trees
222
            continue
2012.1.4 by Aaron Bentley
Simplify add/remove code
223
        fully_present = tuple((versioned[x] and kind[x] is not None) for
224
                              x in range(2))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
225
        if fully_present[0] != fully_present[1]:
226
            if fully_present[1] is True:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
227
                delta.added.append((path[1], file_id, kind[1]))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
228
            else:
229
                assert fully_present[0] is True
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
230
                delta.removed.append((path[0], file_id, kind[0]))
2012.1.5 by Aaron Bentley
Implement specific file id and dangling id handling
231
        elif fully_present[0] is False:
232
            continue
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
233
        elif name[0] != name[1] or parent_id[0] != parent_id[1]:
2012.1.4 by Aaron Bentley
Simplify add/remove code
234
            # If the name changes, or the parent_id changes, we have a rename
235
            # (if we move a parent, that doesn't count as a rename for the
236
            # file)
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
237
            delta.renamed.append((path[0],
238
                                  path[1],
239
                                  file_id,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
240
                                  kind[1],
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
241
                                  content_change,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
242
                                  (executable[0] != executable[1])))
1551.10.6 by Aaron Bentley
Support kind changes in tree deltas
243
        elif kind[0] != kind[1]:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
244
            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)
245
        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.
246
            delta.modified.append((path[1], file_id, kind[1],
247
                                   content_change,
2012.1.3 by Aaron Bentley
Always generate tuples (because kind is always used, even when not different)
248
                                   (executable[0] != executable[1])))
2012.1.2 by Aaron Bentley
reimplement compare_trees
249
        else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
250
            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.
251
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
252
    delta.removed.sort()
253
    delta.added.sort()
254
    delta.renamed.sort()
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
255
    # TODO: jam 20060529 These lists shouldn't need to be sorted
256
    #       since we added them in alphabetical order.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
257
    delta.modified.sort()
258
    delta.unchanged.sort()
259
260
    return delta
2225.1.1 by Aaron Bentley
Added revert change display, with tests
261
262
1551.10.25 by Aaron Bentley
Make ChangeReporter private
263
class _ChangeReporter(object):
2225.1.1 by Aaron Bentley
Added revert change display, with tests
264
    """Report changes between two trees"""
265
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
266
    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.
267
                 output_file=None, unversioned_filter=None):
1551.10.7 by Aaron Bentley
Use new-style output for status
268
        """Constructor
269
270
        :param output: a function with the signature of trace.note, i.e.
271
            accepts a format and parameters.
272
        :param supress_root_add: If true, adding the root will be ignored
273
            (i.e. when a tree has just been initted)
1551.10.8 by Aaron Bentley
Make ChangeReporter interface nicer
274
        :param output_file: If supplied, a file-like object to write to.
275
            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.
276
        :param unversioned_filter: A filter function to be called on 
277
            unversioned files. This should return True to ignore a path.
278
            By default, no filtering takes place.
1551.10.7 by Aaron Bentley
Use new-style output for status
279
        """
1551.10.8 by Aaron Bentley
Make ChangeReporter interface nicer
280
        if output_file is not None:
281
            if output is not None:
282
                raise BzrError('Cannot specify both output and output_file')
283
            def output(fmt, *args):
284
                output_file.write((fmt % args) + '\n')
2225.1.1 by Aaron Bentley
Added revert change display, with tests
285
        self.output = output
286
        if self.output is None:
287
            from bzrlib import trace
288
            self.output = trace.note
1551.10.7 by Aaron Bentley
Use new-style output for status
289
        self.suppress_root_add = suppress_root_add
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
290
        self.modified_map = {'kind changed': 'K',
291
                             'unchanged': ' ',
292
                             'created': 'N',
293
                             'modified': 'M',
294
                             'deleted': 'D'}
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
295
        self.versioned_map = {'added': '+', # versioned target
296
                              'unchanged': ' ', # versioned in both
297
                              'removed': '-', # versioned in source
298
                              'unversioned': '?', # versioned in neither
299
                              }
300
        self.unversioned_filter = unversioned_filter
2225.1.1 by Aaron Bentley
Added revert change display, with tests
301
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
302
    def report(self, file_id, paths, versioned, renamed, modified, exe_change,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
303
               kind):
304
        """Report one change to a file
2225.1.5 by Aaron Bentley
Clean up whitespace changes
305
2225.1.1 by Aaron Bentley
Added revert change display, with tests
306
        :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.
307
        :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.
308
        :param versioned: may be 'added', 'removed', 'unchanged', or
309
            'unversioned.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
310
        :param renamed: may be True or False
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
311
        :param modified: may be 'created', 'deleted', 'kind changed',
2225.1.1 by Aaron Bentley
Added revert change display, with tests
312
            'modified' or 'unchanged'.
313
        :param exe_change: True if the execute bit has changed
314
        :param kind: A pair of file kinds, as generated by Tree._iter_changes.
315
            None indicates no file present.
316
        """
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
317
        if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
1551.10.7 by Aaron Bentley
Use new-style output for status
318
            return
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
319
        if versioned == 'unversioned':
320
            # skip ignored unversioned files if needed.
321
            if self.unversioned_filter is not None:
322
                if self.unversioned_filter(paths[1]):
323
                    return
324
            # dont show a content change in the output.
325
            modified = 'unchanged'
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
326
        # we show both paths in the following situations:
327
        # the file versioning is unchanged AND
328
        # ( the path is different OR
329
        #   the kind is different)
330
        if (versioned == 'unchanged' and
331
            (renamed or modified == 'kind changed')):
332
            if renamed:
333
                # on a rename, we show old and new
334
                old_path, path = paths
335
            else:
2592.3.231 by Martin Pool
typo
336
                # 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.
337
                # so only show the new path
338
                old_path, path = paths[1], paths[1]
339
            # if the file is not missing in the source, we show its kind
340
            # when we show two paths.
341
            if kind[0] is not None:
342
                old_path += osutils.kind_marker(kind[0])
343
            old_path += " => "
2255.2.231 by Robert Collins
Add test showing reverts UI working as Aaron intended it to.
344
        elif versioned == 'removed':
345
            # not present in target
346
            old_path = ""
347
            path = paths[0]
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
348
        else:
349
            old_path = ""
350
            path = paths[1]
2225.1.1 by Aaron Bentley
Added revert change display, with tests
351
        if renamed:
352
            rename = "R"
353
        else:
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
354
            rename = self.versioned_map[versioned]
355
        # 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
356
        if modified == 'deleted':
357
            path += osutils.kind_marker(kind[0])
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
358
        # 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
359
        elif kind[1] is not None:
2225.1.1 by Aaron Bentley
Added revert change display, with tests
360
            path += osutils.kind_marker(kind[1])
361
        if exe_change:
362
            exe = '*'
363
        else:
364
            exe = ' '
2255.7.96 by Robert Collins
Change _iter_changes interface to yield both old and new paths.
365
        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
366
                    old_path, path)
367
368
369
def report_changes(change_iterator, reporter):
370
    """Report the changes from a change iterator.
371
372
    This is essentially a translation from low-level to medium-level changes.
373
    Further processing may be required to produce a human-readable output.
374
    Unfortunately, some tree-changing operations are very complex
375
    :change_iterator: an iterator or sequence of changes in the format
376
        generated by Tree._iter_changes
1551.10.25 by Aaron Bentley
Make ChangeReporter private
377
    :param reporter: The _ChangeReporter that will report the changes.
2225.1.1 by Aaron Bentley
Added revert change display, with tests
378
    """
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
379
    versioned_change_map = {
380
        (True, True)  : 'unchanged',
381
        (True, False) : 'removed',
382
        (False, True) : 'added',
383
        (False, False): 'unversioned',
384
        }
2225.1.1 by Aaron Bentley
Added revert change display, with tests
385
    for (file_id, path, content_change, versioned, parent_id, name, kind,
386
         executable) in change_iterator:
387
        exe_change = False
388
        # files are "renamed" if they are moved or if name changes, as long
389
        # as it had a value
1551.11.3 by Aaron Bentley
Use tree transform to emit upcoming change list
390
        if None not in name and None not in parent_id and\
391
            (name[0] != name[1] or parent_id[0] != parent_id[1]):
2225.1.1 by Aaron Bentley
Added revert change display, with tests
392
            renamed = True
393
        else:
394
            renamed = False
395
        if kind[0] != kind[1]:
396
            if kind[0] is None:
397
                modified = "created"
398
            elif kind[1] is None:
399
                modified = "deleted"
400
            else:
401
                modified = "kind changed"
402
        else:
403
            if content_change:
404
                modified = "modified"
405
            else:
406
                modified = "unchanged"
407
            if kind[1] == "file":
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
408
                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.
409
        versioned_change = versioned_change_map[versioned]
2225.1.2 by Aaron Bentley
Ensure that changes are detected correctly
410
        reporter.report(file_id, path, versioned_change, renamed, modified,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
411
                        exe_change, kind)