/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

(John Arbash Meinel)  Fix bug #158333,
        make sure that Repository.fetch(self) is properly a no-op for all
        Repository implementations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
1
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd.
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from bzrlib.delta import compare_trees
18
 
from bzrlib.errors import BzrError
19
 
import bzrlib.errors as errors
20
 
from bzrlib.symbol_versioning import *
21
 
from bzrlib.trace import mutter
 
17
import difflib
 
18
import os
 
19
import re
 
20
import sys
 
21
 
 
22
from bzrlib.lazy_import import lazy_import
 
23
lazy_import(globals(), """
 
24
import errno
 
25
import subprocess
 
26
import tempfile
 
27
import time
 
28
 
 
29
from bzrlib import (
 
30
    errors,
 
31
    osutils,
 
32
    patiencediff,
 
33
    textfile,
 
34
    timestamp,
 
35
    )
 
36
""")
 
37
 
 
38
from bzrlib.symbol_versioning import (
 
39
        deprecated_function,
 
40
        )
 
41
from bzrlib.trace import mutter, warning
 
42
 
22
43
 
23
44
# TODO: Rather than building a changeset object, we should probably
24
45
# invoke callbacks on an object.  That object can either accumulate a
25
46
# list, write them out directly, etc etc.
26
47
 
27
 
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file):
28
 
    import difflib
29
 
    
 
48
 
 
49
class _PrematchedMatcher(difflib.SequenceMatcher):
 
50
    """Allow SequenceMatcher operations to use predetermined blocks"""
 
51
 
 
52
    def __init__(self, matching_blocks):
 
53
        difflib.SequenceMatcher(self, None, None)
 
54
        self.matching_blocks = matching_blocks
 
55
        self.opcodes = None
 
56
 
 
57
 
 
58
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
 
59
                  allow_binary=False, sequence_matcher=None,
 
60
                  path_encoding='utf8'):
30
61
    # FIXME: difflib is wrong if there is no trailing newline.
31
62
    # The syntax used by patch seems to be "\ No newline at
32
63
    # end of file" following the last diff line from that
42
73
    # both sequences are empty.
43
74
    if not oldlines and not newlines:
44
75
        return
 
76
    
 
77
    if allow_binary is False:
 
78
        textfile.check_text_lines(oldlines)
 
79
        textfile.check_text_lines(newlines)
45
80
 
46
 
    ud = difflib.unified_diff(oldlines, newlines,
47
 
                              fromfile=old_filename+'\t', 
48
 
                              tofile=new_filename+'\t')
 
81
    if sequence_matcher is None:
 
82
        sequence_matcher = patiencediff.PatienceSequenceMatcher
 
83
    ud = patiencediff.unified_diff(oldlines, newlines,
 
84
                      fromfile=old_filename.encode(path_encoding),
 
85
                      tofile=new_filename.encode(path_encoding),
 
86
                      sequencematcher=sequence_matcher)
49
87
 
50
88
    ud = list(ud)
51
89
    # work-around for difflib being too smart for its own good
62
100
        to_file.write(line)
63
101
        if not line.endswith('\n'):
64
102
            to_file.write("\n\\ No newline at end of file\n")
65
 
    print >>to_file
 
103
    to_file.write('\n')
 
104
 
 
105
 
 
106
def _spawn_external_diff(diffcmd, capture_errors=True):
 
107
    """Spawn the externall diff process, and return the child handle.
 
108
 
 
109
    :param diffcmd: The command list to spawn
 
110
    :param capture_errors: Capture stderr as well as setting LANG=C
 
111
        and LC_ALL=C. This lets us read and understand the output of diff,
 
112
        and respond to any errors.
 
113
    :return: A Popen object.
 
114
    """
 
115
    if capture_errors:
 
116
        # construct minimal environment
 
117
        env = {}
 
118
        path = os.environ.get('PATH')
 
119
        if path is not None:
 
120
            env['PATH'] = path
 
121
        env['LANGUAGE'] = 'C'   # on win32 only LANGUAGE has effect
 
122
        env['LANG'] = 'C'
 
123
        env['LC_ALL'] = 'C'
 
124
        stderr = subprocess.PIPE
 
125
    else:
 
126
        env = None
 
127
        stderr = None
 
128
 
 
129
    try:
 
130
        pipe = subprocess.Popen(diffcmd,
 
131
                                stdin=subprocess.PIPE,
 
132
                                stdout=subprocess.PIPE,
 
133
                                stderr=stderr,
 
134
                                env=env)
 
135
    except OSError, e:
 
136
        if e.errno == errno.ENOENT:
 
137
            raise errors.NoDiff(str(e))
 
138
        raise
 
139
 
 
140
    return pipe
66
141
 
67
142
 
68
143
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
69
144
                  diff_opts):
70
145
    """Display a diff by calling out to the external diff program."""
71
 
    import sys
72
 
    
73
 
    if to_file != sys.stdout:
74
 
        raise NotImplementedError("sorry, can't send external diff other than to stdout yet",
75
 
                                  to_file)
76
 
 
77
146
    # make sure our own output is properly ordered before the diff
78
147
    to_file.flush()
79
148
 
80
 
    from tempfile import NamedTemporaryFile
81
 
    import os
82
 
 
83
 
    oldtmpf = NamedTemporaryFile()
84
 
    newtmpf = NamedTemporaryFile()
 
149
    oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
 
150
    newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
 
151
    oldtmpf = os.fdopen(oldtmp_fd, 'wb')
 
152
    newtmpf = os.fdopen(newtmp_fd, 'wb')
85
153
 
86
154
    try:
87
155
        # TODO: perhaps a special case for comparing to or from the empty
94
162
        oldtmpf.writelines(oldlines)
95
163
        newtmpf.writelines(newlines)
96
164
 
97
 
        oldtmpf.flush()
98
 
        newtmpf.flush()
 
165
        oldtmpf.close()
 
166
        newtmpf.close()
99
167
 
100
168
        if not diff_opts:
101
169
            diff_opts = []
102
170
        diffcmd = ['diff',
103
 
                   '--label', old_filename+'\t',
104
 
                   oldtmpf.name,
105
 
                   '--label', new_filename+'\t',
106
 
                   newtmpf.name]
 
171
                   '--label', old_filename,
 
172
                   old_abspath,
 
173
                   '--label', new_filename,
 
174
                   new_abspath,
 
175
                   '--binary',
 
176
                  ]
107
177
 
108
178
        # diff only allows one style to be specified; they don't override.
109
179
        # note that some of these take optargs, and the optargs can be
129
199
        if diff_opts:
130
200
            diffcmd.extend(diff_opts)
131
201
 
132
 
        rc = os.spawnvp(os.P_WAIT, 'diff', diffcmd)
 
202
        pipe = _spawn_external_diff(diffcmd, capture_errors=True)
 
203
        out,err = pipe.communicate()
 
204
        rc = pipe.returncode
133
205
        
134
 
        if rc != 0 and rc != 1:
 
206
        # internal_diff() adds a trailing newline, add one here for consistency
 
207
        out += '\n'
 
208
        if rc == 2:
 
209
            # 'diff' gives retcode == 2 for all sorts of errors
 
210
            # one of those is 'Binary files differ'.
 
211
            # Bad options could also be the problem.
 
212
            # 'Binary files' is not a real error, so we suppress that error.
 
213
            lang_c_out = out
 
214
 
 
215
            # Since we got here, we want to make sure to give an i18n error
 
216
            pipe = _spawn_external_diff(diffcmd, capture_errors=False)
 
217
            out, err = pipe.communicate()
 
218
 
 
219
            # Write out the new i18n diff response
 
220
            to_file.write(out+'\n')
 
221
            if pipe.returncode != 2:
 
222
                raise errors.BzrError(
 
223
                               'external diff failed with exit code 2'
 
224
                               ' when run with LANG=C and LC_ALL=C,'
 
225
                               ' but not when run natively: %r' % (diffcmd,))
 
226
 
 
227
            first_line = lang_c_out.split('\n', 1)[0]
 
228
            # Starting with diffutils 2.8.4 the word "binary" was dropped.
 
229
            m = re.match('^(binary )?files.*differ$', first_line, re.I)
 
230
            if m is None:
 
231
                raise errors.BzrError('external diff failed with exit code 2;'
 
232
                                      ' command: %r' % (diffcmd,))
 
233
            else:
 
234
                # Binary files differ, just return
 
235
                return
 
236
 
 
237
        # If we got to here, we haven't written out the output of diff
 
238
        # do so now
 
239
        to_file.write(out)
 
240
        if rc not in (0, 1):
135
241
            # returns 1 if files differ; that's OK
136
242
            if rc < 0:
137
243
                msg = 'signal %d' % (-rc)
138
244
            else:
139
245
                msg = 'exit code %d' % rc
140
246
                
141
 
            raise BzrError('external diff failed with %s; command: %r' % (rc, diffcmd))
 
247
            raise errors.BzrError('external diff failed with %s; command: %r' 
 
248
                                  % (rc, diffcmd))
 
249
 
 
250
 
142
251
    finally:
143
252
        oldtmpf.close()                 # and delete
144
253
        newtmpf.close()
145
 
 
146
 
 
147
 
@deprecated_function(zero_eight)
148
 
def show_diff(b, from_spec, specific_files, external_diff_options=None,
149
 
              revision2=None, output=None, b2=None):
150
 
    """Shortcut for showing the diff to the working tree.
151
 
 
152
 
    Please use show_diff_trees instead.
153
 
 
154
 
    b
155
 
        Branch.
156
 
 
157
 
    revision
158
 
        None for 'basis tree', or otherwise the old revision to compare against.
159
 
    
160
 
    The more general form is show_diff_trees(), where the caller
161
 
    supplies any two trees.
162
 
    """
163
 
    if output is None:
164
 
        import sys
165
 
        output = sys.stdout
166
 
 
167
 
    if from_spec is None:
168
 
        old_tree = b.bzrdir.open_workingtree()
169
 
        if b2 is None:
170
 
            old_tree = old_tree = old_tree.basis_tree()
171
 
    else:
172
 
        old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
173
 
 
174
 
    if revision2 is None:
175
 
        if b2 is None:
176
 
            new_tree = b.bzrdir.open_workingtree()
177
 
        else:
178
 
            new_tree = b2.bzrdir.open_workingtree()
179
 
    else:
180
 
        new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
181
 
 
182
 
    return show_diff_trees(old_tree, new_tree, output, specific_files,
183
 
                           external_diff_options)
 
254
        # Clean up. Warn in case the files couldn't be deleted
 
255
        # (in case windows still holds the file open, but not
 
256
        # if the files have already been deleted)
 
257
        try:
 
258
            os.remove(old_abspath)
 
259
        except OSError, e:
 
260
            if e.errno not in (errno.ENOENT,):
 
261
                warning('Failed to delete temporary file: %s %s',
 
262
                        old_abspath, e)
 
263
        try:
 
264
            os.remove(new_abspath)
 
265
        except OSError:
 
266
            if e.errno not in (errno.ENOENT,):
 
267
                warning('Failed to delete temporary file: %s %s',
 
268
                        new_abspath, e)
184
269
 
185
270
 
186
271
def diff_cmd_helper(tree, specific_files, external_diff_options, 
187
 
                    old_revision_spec=None, new_revision_spec=None):
 
272
                    old_revision_spec=None, new_revision_spec=None,
 
273
                    revision_specs=None,
 
274
                    old_label='a/', new_label='b/'):
188
275
    """Helper for cmd_diff.
189
276
 
190
 
   tree 
 
277
    :param tree:
191
278
        A WorkingTree
192
279
 
193
 
    specific_files
 
280
    :param specific_files:
194
281
        The specific files to compare, or None
195
282
 
196
 
    external_diff_options
 
283
    :param external_diff_options:
197
284
        If non-None, run an external diff, and pass it these options
198
285
 
199
 
    old_revision_spec
 
286
    :param old_revision_spec:
200
287
        If None, use basis tree as old revision, otherwise use the tree for
201
288
        the specified revision. 
202
289
 
203
 
    new_revision_spec
 
290
    :param new_revision_spec:
204
291
        If None, use working tree as new revision, otherwise use the tree for
205
292
        the specified revision.
206
293
    
 
294
    :param revision_specs: 
 
295
        Zero, one or two RevisionSpecs from the command line, saying what revisions 
 
296
        to compare.  This can be passed as an alternative to the old_revision_spec 
 
297
        and new_revision_spec parameters.
 
298
 
207
299
    The more general form is show_diff_trees(), where the caller
208
300
    supplies any two trees.
209
301
    """
210
 
    import sys
211
 
    output = sys.stdout
 
302
 
 
303
    # TODO: perhaps remove the old parameters old_revision_spec and
 
304
    # new_revision_spec, since this is only really for use from cmd_diff and
 
305
    # it now always passes through a sequence of revision_specs -- mbp
 
306
    # 20061221
 
307
 
212
308
    def spec_tree(spec):
213
 
        revision_id = spec.in_store(tree.branch).rev_id
214
 
        return tree.branch.repository.revision_tree(revision_id)
 
309
        if tree:
 
310
            revision = spec.in_store(tree.branch)
 
311
        else:
 
312
            revision = spec.in_store(None)
 
313
        revision_id = revision.rev_id
 
314
        branch = revision.branch
 
315
        return branch.repository.revision_tree(revision_id)
 
316
 
 
317
    if revision_specs is not None:
 
318
        assert (old_revision_spec is None
 
319
                and new_revision_spec is None)
 
320
        if len(revision_specs) > 0:
 
321
            old_revision_spec = revision_specs[0]
 
322
        if len(revision_specs) > 1:
 
323
            new_revision_spec = revision_specs[1]
 
324
 
215
325
    if old_revision_spec is None:
216
326
        old_tree = tree.basis_tree()
217
327
    else:
218
328
        old_tree = spec_tree(old_revision_spec)
219
329
 
220
 
    if new_revision_spec is None:
 
330
    if (new_revision_spec is None
 
331
        or new_revision_spec.spec is None):
221
332
        new_tree = tree
222
333
    else:
223
334
        new_tree = spec_tree(new_revision_spec)
224
335
 
 
336
    if new_tree is not tree:
 
337
        extra_trees = (tree,)
 
338
    else:
 
339
        extra_trees = None
 
340
 
225
341
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
226
 
                           external_diff_options)
 
342
                           external_diff_options,
 
343
                           old_label=old_label, new_label=new_label,
 
344
                           extra_trees=extra_trees)
227
345
 
228
346
 
229
347
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
230
 
                    external_diff_options=None):
 
348
                    external_diff_options=None,
 
349
                    old_label='a/', new_label='b/',
 
350
                    extra_trees=None,
 
351
                    path_encoding='utf8'):
231
352
    """Show in text form the changes from one tree to another.
232
353
 
233
354
    to_files
235
356
 
236
357
    external_diff_options
237
358
        If set, use an external GNU diff and pass these options.
 
359
 
 
360
    extra_trees
 
361
        If set, more Trees to use for looking up file ids
 
362
 
 
363
    path_encoding
 
364
        If set, the path will be encoded as specified, otherwise is supposed
 
365
        to be utf8
238
366
    """
239
367
    old_tree.lock_read()
240
368
    try:
 
369
        if extra_trees is not None:
 
370
            for tree in extra_trees:
 
371
                tree.lock_read()
241
372
        new_tree.lock_read()
242
373
        try:
243
374
            return _show_diff_trees(old_tree, new_tree, to_file,
244
 
                                    specific_files, external_diff_options)
 
375
                                    specific_files, external_diff_options,
 
376
                                    old_label=old_label, new_label=new_label,
 
377
                                    extra_trees=extra_trees,
 
378
                                    path_encoding=path_encoding)
245
379
        finally:
246
380
            new_tree.unlock()
 
381
            if extra_trees is not None:
 
382
                for tree in extra_trees:
 
383
                    tree.unlock()
247
384
    finally:
248
385
        old_tree.unlock()
249
386
 
250
387
 
251
388
def _show_diff_trees(old_tree, new_tree, to_file,
252
 
                     specific_files, external_diff_options):
253
 
 
254
 
    # TODO: Options to control putting on a prefix or suffix, perhaps
255
 
    # as a format string?
256
 
    old_label = 'a/'
257
 
    new_label = 'b/'
258
 
 
259
 
    DEVNULL = '/dev/null'
260
 
    # Windows users, don't panic about this filename -- it is a
261
 
    # special signal to GNU patch that the file should be created or
262
 
    # deleted respectively.
 
389
                     specific_files, external_diff_options, path_encoding,
 
390
                     old_label='a/', new_label='b/', extra_trees=None):
 
391
 
 
392
    # GNU Patch uses the epoch date to detect files that are being added
 
393
    # or removed in a diff.
 
394
    EPOCH_DATE = '1970-01-01 00:00:00 +0000'
263
395
 
264
396
    # TODO: Generation of pseudo-diffs for added/deleted files could
265
397
    # be usefully made into a much faster special case.
266
398
 
267
 
    _raise_if_doubly_unversioned(specific_files, old_tree, new_tree)
268
 
 
269
399
    if external_diff_options:
270
400
        assert isinstance(external_diff_options, basestring)
271
401
        opts = external_diff_options.split()
274
404
    else:
275
405
        diff_file = internal_diff
276
406
    
277
 
    delta = compare_trees(old_tree, new_tree, want_unchanged=False,
278
 
                          specific_files=specific_files)
 
407
    delta = new_tree.changes_from(old_tree,
 
408
        specific_files=specific_files,
 
409
        extra_trees=extra_trees, require_versioned=True)
279
410
 
280
411
    has_changes = 0
281
412
    for path, file_id, kind in delta.removed:
282
413
        has_changes = 1
283
 
        print >>to_file, '=== removed %s %r' % (kind, old_label + path)
284
 
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
285
 
                                         DEVNULL, None, None, to_file)
 
414
        path_encoded = path.encode(path_encoding, "replace")
 
415
        to_file.write("=== removed %s '%s'\n" % (kind, path_encoded))
 
416
        old_name = '%s%s\t%s' % (old_label, path,
 
417
                                 _patch_header_date(old_tree, file_id, path))
 
418
        new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)
 
419
        old_tree.inventory[file_id].diff(diff_file, old_name, old_tree,
 
420
                                         new_name, None, None, to_file)
286
421
    for path, file_id, kind in delta.added:
287
422
        has_changes = 1
288
 
        print >>to_file, '=== added %s %r' % (kind, new_label + path)
289
 
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
290
 
                                         DEVNULL, None, None, to_file, 
 
423
        path_encoded = path.encode(path_encoding, "replace")
 
424
        to_file.write("=== added %s '%s'\n" % (kind, path_encoded))
 
425
        old_name = '%s%s\t%s' % (old_label, path, EPOCH_DATE)
 
426
        new_name = '%s%s\t%s' % (new_label, path,
 
427
                                 _patch_header_date(new_tree, file_id, path))
 
428
        new_tree.inventory[file_id].diff(diff_file, new_name, new_tree,
 
429
                                         old_name, None, None, to_file, 
291
430
                                         reverse=True)
292
431
    for (old_path, new_path, file_id, kind,
293
432
         text_modified, meta_modified) in delta.renamed:
294
433
        has_changes = 1
295
434
        prop_str = get_prop_change(meta_modified)
296
 
        print >>to_file, '=== renamed %s %r => %r%s' % (
297
 
                    kind, old_label + old_path, new_label + new_path, prop_str)
298
 
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
299
 
                                    new_label, new_path, new_tree,
 
435
        oldpath_encoded = old_path.encode(path_encoding, "replace")
 
436
        newpath_encoded = new_path.encode(path_encoding, "replace")
 
437
        to_file.write("=== renamed %s '%s' => '%s'%s\n" % (kind,
 
438
                            oldpath_encoded, newpath_encoded, prop_str))
 
439
        old_name = '%s%s\t%s' % (old_label, old_path,
 
440
                                 _patch_header_date(old_tree, file_id,
 
441
                                                    old_path))
 
442
        new_name = '%s%s\t%s' % (new_label, new_path,
 
443
                                 _patch_header_date(new_tree, file_id,
 
444
                                                    new_path))
 
445
        _maybe_diff_file_or_symlink(old_name, old_tree, file_id,
 
446
                                    new_name, new_tree,
300
447
                                    text_modified, kind, to_file, diff_file)
301
448
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
302
449
        has_changes = 1
303
450
        prop_str = get_prop_change(meta_modified)
304
 
        print >>to_file, '=== modified %s %r%s' % (kind, old_label + path,
305
 
                    prop_str)
 
451
        path_encoded = path.encode(path_encoding, "replace")
 
452
        to_file.write("=== modified %s '%s'%s\n" % (kind,
 
453
                            path_encoded, prop_str))
 
454
        # The file may be in a different location in the old tree (because
 
455
        # the containing dir was renamed, but the file itself was not)
 
456
        old_path = old_tree.id2path(file_id)
 
457
        old_name = '%s%s\t%s' % (old_label, old_path,
 
458
                                 _patch_header_date(old_tree, file_id, old_path))
 
459
        new_name = '%s%s\t%s' % (new_label, path,
 
460
                                 _patch_header_date(new_tree, file_id, path))
306
461
        if text_modified:
307
 
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
308
 
                                        new_label, path, new_tree,
 
462
            _maybe_diff_file_or_symlink(old_name, old_tree, file_id,
 
463
                                        new_name, new_tree,
309
464
                                        True, kind, to_file, diff_file)
310
465
 
311
466
    return has_changes
312
467
 
313
468
 
314
 
def _raise_if_doubly_unversioned(specific_files, old_tree, new_tree):
315
 
    """Complain if paths are not versioned in either tree."""
316
 
    if not specific_files:
 
469
def _patch_header_date(tree, file_id, path):
 
470
    """Returns a timestamp suitable for use in a patch header."""
 
471
    mtime = tree.get_file_mtime(file_id, path)
 
472
    assert mtime is not None, \
 
473
        "got an mtime of None for file-id %s, path %s in tree %s" % (
 
474
                file_id, path, tree)
 
475
    return timestamp.format_patch_date(mtime)
 
476
 
 
477
 
 
478
def _raise_if_nonexistent(paths, old_tree, new_tree):
 
479
    """Complain if paths are not in either inventory or tree.
 
480
 
 
481
    It's OK with the files exist in either tree's inventory, or 
 
482
    if they exist in the tree but are not versioned.
 
483
    
 
484
    This can be used by operations such as bzr status that can accept
 
485
    unknown or ignored files.
 
486
    """
 
487
    mutter("check paths: %r", paths)
 
488
    if not paths:
317
489
        return
318
 
    old_unversioned = old_tree.filter_unversioned_files(specific_files)
319
 
    new_unversioned = new_tree.filter_unversioned_files(specific_files)
320
 
    unversioned = old_unversioned.intersection(new_unversioned)
321
 
    if unversioned:
322
 
        raise errors.PathsNotVersionedError(sorted(unversioned))
323
 
    
 
490
    s = old_tree.filter_unversioned_files(paths)
 
491
    s = new_tree.filter_unversioned_files(s)
 
492
    s = [path for path in s if not new_tree.has_filename(path)]
 
493
    if s:
 
494
        raise errors.PathsDoNotExist(sorted(s))
 
495
 
324
496
 
325
497
def get_prop_change(meta_modified):
326
498
    if meta_modified:
329
501
        return  ""
330
502
 
331
503
 
332
 
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
333
 
                                new_label, new_path, new_tree, text_modified,
 
504
def _maybe_diff_file_or_symlink(old_path, old_tree, file_id,
 
505
                                new_path, new_tree, text_modified,
334
506
                                kind, to_file, diff_file):
335
507
    if text_modified:
336
508
        new_entry = new_tree.inventory[file_id]
337
509
        old_tree.inventory[file_id].diff(diff_file,
338
 
                                         old_label + old_path, old_tree,
339
 
                                         new_label + new_path, new_entry, 
 
510
                                         old_path, old_tree,
 
511
                                         new_path, new_entry, 
340
512
                                         new_tree, to_file)