/brz/remove-bazaar

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