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