/brz/remove-bazaar

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