/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd.
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
2
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
7
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
12
#
1 by mbp at sourcefrog
import from baz patch-364
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
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
17
import errno
18
import os
1899.1.5 by John Arbash Meinel
Always buffer the output of diff, so we can check if retcode==2 is because of Binary files
19
import re
1692.8.7 by James Henstridge
changes suggested by John Meinel
20
import subprocess
1692.8.4 by James Henstridge
move external_diff imports to top of file
21
import sys
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
22
import tempfile
1740.2.5 by Aaron Bentley
Merge from bzr.dev
23
import time
24
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
25
# compatability - plugins import compare_trees from diff!!!
26
# deprecated as of 0.10
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
27
from bzrlib.delta import compare_trees
28
from bzrlib.errors import BzrError
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
29
import bzrlib.errors as errors
1711.2.58 by John Arbash Meinel
Use osutils.pumpfile so we don't have to buffer everything in ram
30
import bzrlib.osutils
1711.2.24 by John Arbash Meinel
Late bind to PatienceSequenceMatcher to allow plugin to override.
31
from bzrlib.patiencediff import unified_diff
32
import bzrlib.patiencediff
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
33
from bzrlib.symbol_versioning import (deprecated_function,
34
        zero_eight)
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
35
from bzrlib.textfile import check_text_lines
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
36
from bzrlib.trace import mutter, warning
1 by mbp at sourcefrog
import from baz patch-364
37
1711.2.24 by John Arbash Meinel
Late bind to PatienceSequenceMatcher to allow plugin to override.
38
767 by Martin Pool
- files are only reported as modified if their name or parent has changed,
39
# TODO: Rather than building a changeset object, we should probably
40
# invoke callbacks on an object.  That object can either accumulate a
41
# list, write them out directly, etc etc.
42
1558.15.11 by Aaron Bentley
Apply merge review suggestions
43
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
1711.2.30 by John Arbash Meinel
Fix bug in internal_diff handling of unicode paths
44
                  allow_binary=False, sequence_matcher=None,
45
                  path_encoding='utf8'):
475 by Martin Pool
- rewrite diff using compare_trees()
46
    # FIXME: difflib is wrong if there is no trailing newline.
47
    # The syntax used by patch seems to be "\ No newline at
48
    # end of file" following the last diff line from that
49
    # file.  This is not trivial to insert into the
50
    # unified_diff output and it might be better to just fix
51
    # or replace that function.
52
53
    # In the meantime we at least make sure the patch isn't
54
    # mangled.
55
56
57
    # Special workaround for Python2.3, where difflib fails if
58
    # both sequences are empty.
59
    if not oldlines and not newlines:
60
        return
1558.15.2 by Aaron Bentley
Implemented binary file handling for diff
61
    
1558.15.11 by Aaron Bentley
Apply merge review suggestions
62
    if allow_binary is False:
63
        check_text_lines(oldlines)
64
        check_text_lines(newlines)
475 by Martin Pool
- rewrite diff using compare_trees()
65
1185.81.8 by John Arbash Meinel
Updating unified_diff to take a factory, using the new diff algorithm in the code.
66
    if sequence_matcher is None:
1711.2.24 by John Arbash Meinel
Late bind to PatienceSequenceMatcher to allow plugin to override.
67
        sequence_matcher = bzrlib.patiencediff.PatienceSequenceMatcher
1185.81.8 by John Arbash Meinel
Updating unified_diff to take a factory, using the new diff algorithm in the code.
68
    ud = unified_diff(oldlines, newlines,
1740.2.5 by Aaron Bentley
Merge from bzr.dev
69
                      fromfile=old_filename.encode(path_encoding),
70
                      tofile=new_filename.encode(path_encoding),
1185.81.8 by John Arbash Meinel
Updating unified_diff to take a factory, using the new diff algorithm in the code.
71
                      sequencematcher=sequence_matcher)
475 by Martin Pool
- rewrite diff using compare_trees()
72
1092.1.50 by Robert Collins
make diff lsdiff/filterdiff friendly
73
    ud = list(ud)
475 by Martin Pool
- rewrite diff using compare_trees()
74
    # work-around for difflib being too smart for its own good
75
    # if /dev/null is "1,0", patch won't recognize it as /dev/null
76
    if not oldlines:
77
        ud[2] = ud[2].replace('-1,0', '-0,0')
78
    elif not newlines:
79
        ud[2] = ud[2].replace('+1,0', '+0,0')
1092.1.50 by Robert Collins
make diff lsdiff/filterdiff friendly
80
    # work around for difflib emitting random spaces after the label
81
    ud[0] = ud[0][:-2] + '\n'
82
    ud[1] = ud[1][:-2] + '\n'
475 by Martin Pool
- rewrite diff using compare_trees()
83
804 by Martin Pool
Patch from John:
84
    for line in ud:
85
        to_file.write(line)
974.1.5 by Aaron Bentley
Fixed handling of missing newlines in udiffs
86
        if not line.endswith('\n'):
87
            to_file.write("\n\\ No newline at end of file\n")
475 by Martin Pool
- rewrite diff using compare_trees()
88
    print >>to_file
89
90
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
91
def _set_lang_C():
92
    """Set the env var LANG=C"""
93
    os.environ['LANG'] = 'C'
94
95
96
def _spawn_external_diff(diffcmd, capture_errors=True):
97
    """Spawn the externall diff process, and return the child handle.
98
99
    :param diffcmd: The command list to spawn
100
    :param capture_errors: Capture stderr as well as setting LANG=C.
101
        This lets us read and understand the output of diff, and respond 
102
        to any errors.
103
    :return: A Popen object.
104
    """
105
    if capture_errors:
1963.1.8 by John Arbash Meinel
Don't use preexec_fn on win32
106
        if sys.platform == 'win32':
107
            # Win32 doesn't support preexec_fn, but that is
108
            # okay, because it doesn't support LANG either.
109
            preexec_fn = None
110
        else:
111
            preexec_fn = _set_lang_C
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
112
        stderr = subprocess.PIPE
113
    else:
114
        preexec_fn = None
115
        stderr = None
116
117
    try:
118
        pipe = subprocess.Popen(diffcmd,
119
                                stdin=subprocess.PIPE,
120
                                stdout=subprocess.PIPE,
121
                                stderr=stderr,
122
                                preexec_fn=preexec_fn)
123
    except OSError, e:
124
        if e.errno == errno.ENOENT:
125
            raise errors.NoDiff(str(e))
126
        raise
127
128
    return pipe
129
130
1185.35.29 by Aaron Bentley
Support whitespace in diff filenames
131
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
571 by Martin Pool
- new --diff-options to pass options through to external
132
                  diff_opts):
568 by Martin Pool
- start adding support for showing diffs by calling out to
133
    """Display a diff by calling out to the external diff program."""
581 by Martin Pool
- make sure any bzr output is flushed before
134
    # make sure our own output is properly ordered before the diff
135
    to_file.flush()
136
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
137
    oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
138
    newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
139
    oldtmpf = os.fdopen(oldtmp_fd, 'wb')
140
    newtmpf = os.fdopen(newtmp_fd, 'wb')
568 by Martin Pool
- start adding support for showing diffs by calling out to
141
142
    try:
143
        # TODO: perhaps a special case for comparing to or from the empty
144
        # sequence; can just use /dev/null on Unix
145
146
        # TODO: if either of the files being compared already exists as a
147
        # regular named file (e.g. in the working directory) then we can
148
        # compare directly to that, rather than copying it.
149
150
        oldtmpf.writelines(oldlines)
151
        newtmpf.writelines(newlines)
152
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
153
        oldtmpf.close()
154
        newtmpf.close()
568 by Martin Pool
- start adding support for showing diffs by calling out to
155
571 by Martin Pool
- new --diff-options to pass options through to external
156
        if not diff_opts:
157
            diff_opts = []
158
        diffcmd = ['diff',
1740.2.5 by Aaron Bentley
Merge from bzr.dev
159
                   '--label', old_filename,
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
160
                   old_abspath,
1740.2.5 by Aaron Bentley
Merge from bzr.dev
161
                   '--label', new_filename,
1711.2.56 by John Arbash Meinel
Raise NoDiff if 'diff' not present.
162
                   new_abspath,
163
                   '--binary',
164
                  ]
571 by Martin Pool
- new --diff-options to pass options through to external
165
166
        # diff only allows one style to be specified; they don't override.
167
        # note that some of these take optargs, and the optargs can be
168
        # directly appended to the options.
169
        # this is only an approximate parser; it doesn't properly understand
170
        # the grammar.
171
        for s in ['-c', '-u', '-C', '-U',
172
                  '-e', '--ed',
173
                  '-q', '--brief',
174
                  '--normal',
175
                  '-n', '--rcs',
176
                  '-y', '--side-by-side',
177
                  '-D', '--ifdef']:
178
            for j in diff_opts:
179
                if j.startswith(s):
180
                    break
181
            else:
182
                continue
183
            break
184
        else:
185
            diffcmd.append('-u')
186
                  
187
        if diff_opts:
188
            diffcmd.extend(diff_opts)
189
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
190
        pipe = _spawn_external_diff(diffcmd, capture_errors=True)
191
        out,err = pipe.communicate()
192
        rc = pipe.returncode
571 by Martin Pool
- new --diff-options to pass options through to external
193
        
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
194
        # internal_diff() adds a trailing newline, add one here for consistency
195
        out += '\n'
1899.1.5 by John Arbash Meinel
Always buffer the output of diff, so we can check if retcode==2 is because of Binary files
196
        if rc == 2:
197
            # 'diff' gives retcode == 2 for all sorts of errors
198
            # one of those is 'Binary files differ'.
199
            # Bad options could also be the problem.
1904.1.4 by Marien Zwart
Make external diff in binary mode work with recent versions of diffutils.
200
            # 'Binary files' is not a real error, so we suppress that error.
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
201
            lang_c_out = out
202
203
            # Since we got here, we want to make sure to give an i18n error
204
            pipe = _spawn_external_diff(diffcmd, capture_errors=False)
205
            out, err = pipe.communicate()
206
207
            # Write out the new i18n diff response
208
            to_file.write(out+'\n')
209
            if pipe.returncode != 2:
210
                raise BzrError('external diff failed with exit code 2'
211
                               ' when run with LANG=C, but not when run'
212
                               ' natively: %r' % (diffcmd,))
213
214
            first_line = lang_c_out.split('\n', 1)[0]
1904.1.4 by Marien Zwart
Make external diff in binary mode work with recent versions of diffutils.
215
            # Starting with diffutils 2.8.4 the word "binary" was dropped.
216
            m = re.match('^(binary )?files.*differ$', first_line, re.I)
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
217
            if m is None:
1899.1.5 by John Arbash Meinel
Always buffer the output of diff, so we can check if retcode==2 is because of Binary files
218
                raise BzrError('external diff failed with exit code 2;'
219
                               ' command: %r' % (diffcmd,))
1920.1.1 by John Arbash Meinel
fix bug #56307, handle binary files even when LANG is not english
220
            else:
221
                # Binary files differ, just return
222
                return
223
224
        # If we got to here, we haven't written out the output of diff
225
        # do so now
226
        to_file.write(out)
227
        if rc not in (0, 1):
571 by Martin Pool
- new --diff-options to pass options through to external
228
            # returns 1 if files differ; that's OK
229
            if rc < 0:
230
                msg = 'signal %d' % (-rc)
231
            else:
232
                msg = 'exit code %d' % rc
233
                
1899.1.4 by John Arbash Meinel
Just swallow a return code of 2
234
            raise BzrError('external diff failed with %s; command: %r' 
235
                           % (rc, diffcmd))
1899.1.6 by John Arbash Meinel
internal_diff always adds a trailing \n, make sure external_diff does too
236
237
568 by Martin Pool
- start adding support for showing diffs by calling out to
238
    finally:
239
        oldtmpf.close()                 # and delete
240
        newtmpf.close()
1711.2.54 by John Arbash Meinel
Use mkstemp instead of NamedTemporary file for external diff.
241
        # Clean up. Warn in case the files couldn't be deleted
242
        # (in case windows still holds the file open, but not
243
        # if the files have already been deleted)
244
        try:
245
            os.remove(old_abspath)
246
        except OSError, e:
247
            if e.errno not in (errno.ENOENT,):
248
                warning('Failed to delete temporary file: %s %s',
249
                        old_abspath, e)
250
        try:
251
            os.remove(new_abspath)
252
        except OSError:
253
            if e.errno not in (errno.ENOENT,):
254
                warning('Failed to delete temporary file: %s %s',
255
                        new_abspath, e)
568 by Martin Pool
- start adding support for showing diffs by calling out to
256
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
257
258
@deprecated_function(zero_eight)
1432 by Robert Collins
branch: namespace
259
def show_diff(b, from_spec, specific_files, external_diff_options=None,
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
260
              revision2=None, output=None, b2=None):
619 by Martin Pool
doc
261
    """Shortcut for showing the diff to the working tree.
262
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
263
    Please use show_diff_trees instead.
264
619 by Martin Pool
doc
265
    b
266
        Branch.
267
268
    revision
1432 by Robert Collins
branch: namespace
269
        None for 'basis tree', or otherwise the old revision to compare against.
619 by Martin Pool
doc
270
    
271
    The more general form is show_diff_trees(), where the caller
272
    supplies any two trees.
273
    """
1092.1.47 by Robert Collins
make show_diff redirectable
274
    if output is None:
275
        output = sys.stdout
475 by Martin Pool
- rewrite diff using compare_trees()
276
1432 by Robert Collins
branch: namespace
277
    if from_spec is None:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
278
        old_tree = b.bzrdir.open_workingtree()
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
279
        if b2 is None:
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
280
            old_tree = old_tree = old_tree.basis_tree()
329 by Martin Pool
- refactor command functions into command classes
281
    else:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
282
        old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
283
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
284
    if revision2 is None:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
285
        if b2 is None:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
286
            new_tree = b.bzrdir.open_workingtree()
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
287
        else:
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
288
            new_tree = b2.bzrdir.open_workingtree()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
289
    else:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
290
        new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
329 by Martin Pool
- refactor command functions into command classes
291
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
292
    return show_diff_trees(old_tree, new_tree, output, specific_files,
293
                           external_diff_options)
571 by Martin Pool
- new --diff-options to pass options through to external
294
295
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
296
def diff_cmd_helper(tree, specific_files, external_diff_options, 
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
297
                    old_revision_spec=None, new_revision_spec=None,
298
                    old_label='a/', new_label='b/'):
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
299
    """Helper for cmd_diff.
300
301
   tree 
302
        A WorkingTree
303
304
    specific_files
305
        The specific files to compare, or None
306
307
    external_diff_options
308
        If non-None, run an external diff, and pass it these options
309
1551.2.14 by Aaron Bentley
Updated argument names, DRY fixes.
310
    old_revision_spec
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
311
        If None, use basis tree as old revision, otherwise use the tree for
312
        the specified revision. 
313
1551.2.14 by Aaron Bentley
Updated argument names, DRY fixes.
314
    new_revision_spec
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
315
        If None, use working tree as new revision, otherwise use the tree for
316
        the specified revision.
317
    
318
    The more general form is show_diff_trees(), where the caller
319
    supplies any two trees.
320
    """
1551.2.14 by Aaron Bentley
Updated argument names, DRY fixes.
321
    def spec_tree(spec):
1732.3.1 by Matthieu Moy
Implementation of -r revno:N:/path/to/branch
322
        if tree:
323
            revision = spec.in_store(tree.branch)
324
        else:
325
            revision = spec.in_store(None)
326
        revision_id = revision.rev_id
327
        branch = revision.branch
328
        return branch.repository.revision_tree(revision_id)
1551.2.14 by Aaron Bentley
Updated argument names, DRY fixes.
329
    if old_revision_spec is None:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
330
        old_tree = tree.basis_tree()
331
    else:
1551.2.14 by Aaron Bentley
Updated argument names, DRY fixes.
332
        old_tree = spec_tree(old_revision_spec)
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
333
1551.2.14 by Aaron Bentley
Updated argument names, DRY fixes.
334
    if new_revision_spec is None:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
335
        new_tree = tree
336
    else:
1551.2.14 by Aaron Bentley
Updated argument names, DRY fixes.
337
        new_tree = spec_tree(new_revision_spec)
1551.7.19 by Aaron Bentley
Always include working tree when calculating file ids for diff
338
    if new_tree is not tree:
339
        extra_trees = (tree,)
340
    else:
341
        extra_trees = None
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
342
1551.2.14 by Aaron Bentley
Updated argument names, DRY fixes.
343
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
344
                           external_diff_options,
1551.7.19 by Aaron Bentley
Always include working tree when calculating file ids for diff
345
                           old_label=old_label, new_label=new_label,
346
                           extra_trees=extra_trees)
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
347
571 by Martin Pool
- new --diff-options to pass options through to external
348
349
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
350
                    external_diff_options=None,
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
351
                    old_label='a/', new_label='b/',
352
                    extra_trees=None):
550 by Martin Pool
- Refactor diff code into one that works purely on
353
    """Show in text form the changes from one tree to another.
354
355
    to_files
356
        If set, include only changes to these files.
571 by Martin Pool
- new --diff-options to pass options through to external
357
358
    external_diff_options
359
        If set, use an external GNU diff and pass these options.
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
360
361
    extra_trees
362
        If set, more Trees to use for looking up file ids
550 by Martin Pool
- Refactor diff code into one that works purely on
363
    """
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
364
    old_tree.lock_read()
365
    try:
366
        new_tree.lock_read()
367
        try:
368
            return _show_diff_trees(old_tree, new_tree, to_file,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
369
                                    specific_files, external_diff_options,
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
370
                                    old_label=old_label, new_label=new_label,
371
                                    extra_trees=extra_trees)
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
372
        finally:
373
            new_tree.unlock()
374
    finally:
375
        old_tree.unlock()
376
377
378
def _show_diff_trees(old_tree, new_tree, to_file,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
379
                     specific_files, external_diff_options, 
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
380
                     old_label='a/', new_label='b/', extra_trees=None):
329 by Martin Pool
- refactor command functions into command classes
381
1740.2.5 by Aaron Bentley
Merge from bzr.dev
382
    # GNU Patch uses the epoch date to detect files that are being added
383
    # or removed in a diff.
384
    EPOCH_DATE = '1970-01-01 00:00:00 +0000'
1706.1.2 by James Henstridge
Simplify logic a little
385
329 by Martin Pool
- refactor command functions into command classes
386
    # TODO: Generation of pseudo-diffs for added/deleted files could
387
    # be usefully made into a much faster special case.
388
571 by Martin Pool
- new --diff-options to pass options through to external
389
    if external_diff_options:
390
        assert isinstance(external_diff_options, basestring)
391
        opts = external_diff_options.split()
392
        def diff_file(olab, olines, nlab, nlines, to_file):
393
            external_diff(olab, olines, nlab, nlines, to_file, opts)
394
    else:
395
        diff_file = internal_diff
396
    
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
397
    delta = new_tree.changes_from(old_tree,
398
        specific_files=specific_files,
399
        extra_trees=extra_trees, require_versioned=True)
475 by Martin Pool
- rewrite diff using compare_trees()
400
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
401
    has_changes = 0
475 by Martin Pool
- rewrite diff using compare_trees()
402
    for path, file_id, kind in delta.removed:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
403
        has_changes = 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.
404
        print >>to_file, '=== removed %s %r' % (kind, path.encode('utf8'))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
405
        old_name = '%s%s\t%s' % (old_label, path,
406
                                 _patch_header_date(old_tree, file_id, path))
407
        new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)
408
        old_tree.inventory[file_id].diff(diff_file, old_name, old_tree,
409
                                         new_name, None, None, to_file)
475 by Martin Pool
- rewrite diff using compare_trees()
410
    for path, file_id, kind in delta.added:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
411
        has_changes = 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.
412
        print >>to_file, '=== added %s %r' % (kind, path.encode('utf8'))
1740.2.5 by Aaron Bentley
Merge from bzr.dev
413
        old_name = '%s%s\t%s' % (old_label, path, EPOCH_DATE)
414
        new_name = '%s%s\t%s' % (new_label, path,
415
                                 _patch_header_date(new_tree, file_id, path))
416
        new_tree.inventory[file_id].diff(diff_file, new_name, new_tree,
417
                                         old_name, None, None, to_file, 
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
418
                                         reverse=True)
1398 by Robert Collins
integrate in Gustavos x-bit patch
419
    for (old_path, new_path, file_id, kind,
420
         text_modified, meta_modified) in delta.renamed:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
421
        has_changes = 1
1398 by Robert Collins
integrate in Gustavos x-bit patch
422
        prop_str = get_prop_change(meta_modified)
423
        print >>to_file, '=== renamed %s %r => %r%s' % (
1711.2.28 by John Arbash Meinel
Fix up bzrlib.diff now that compare_trees is returning unicode paths.
424
                    kind, old_path.encode('utf8'),
425
                    new_path.encode('utf8'), prop_str)
1740.2.5 by Aaron Bentley
Merge from bzr.dev
426
        old_name = '%s%s\t%s' % (old_label, old_path,
427
                                 _patch_header_date(old_tree, file_id,
428
                                                    old_path))
429
        new_name = '%s%s\t%s' % (new_label, new_path,
430
                                 _patch_header_date(new_tree, file_id,
431
                                                    new_path))
432
        _maybe_diff_file_or_symlink(old_name, old_tree, file_id,
433
                                    new_name, new_tree,
1092.2.9 by Robert Collins
bugfix _maybe_diff, the test was not catching the error
434
                                    text_modified, kind, to_file, diff_file)
1398 by Robert Collins
integrate in Gustavos x-bit patch
435
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
436
        has_changes = 1
1398 by Robert Collins
integrate in Gustavos x-bit patch
437
        prop_str = get_prop_change(meta_modified)
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
438
        print >>to_file, '=== modified %s %r%s' % (kind, path.encode('utf8'), prop_str)
1740.2.5 by Aaron Bentley
Merge from bzr.dev
439
        old_name = '%s%s\t%s' % (old_label, path,
440
                                 _patch_header_date(old_tree, file_id, path))
441
        new_name = '%s%s\t%s' % (new_label, path,
442
                                 _patch_header_date(new_tree, file_id, path))
1398 by Robert Collins
integrate in Gustavos x-bit patch
443
        if text_modified:
1740.2.5 by Aaron Bentley
Merge from bzr.dev
444
            _maybe_diff_file_or_symlink(old_name, old_tree, file_id,
445
                                        new_name, new_tree,
1398 by Robert Collins
integrate in Gustavos x-bit patch
446
                                        True, kind, to_file, diff_file)
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
447
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
448
    return has_changes
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
449
450
1740.2.5 by Aaron Bentley
Merge from bzr.dev
451
def _patch_header_date(tree, file_id, path):
452
    """Returns a timestamp suitable for use in a patch header."""
453
    tm = time.gmtime(tree.get_file_mtime(file_id, path))
454
    return time.strftime('%Y-%m-%d %H:%M:%S +0000', tm)
455
456
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
457
def _raise_if_nonexistent(paths, old_tree, new_tree):
458
    """Complain if paths are not in either inventory or tree.
459
460
    It's OK with the files exist in either tree's inventory, or 
461
    if they exist in the tree but are not versioned.
462
    
463
    This can be used by operations such as bzr status that can accept
464
    unknown or ignored files.
465
    """
466
    mutter("check paths: %r", paths)
467
    if not paths:
468
        return
469
    s = old_tree.filter_unversioned_files(paths)
470
    s = new_tree.filter_unversioned_files(s)
471
    s = [path for path in s if not new_tree.has_filename(path)]
472
    if s:
473
        raise errors.PathsDoNotExist(sorted(s))
474
475
1398 by Robert Collins
integrate in Gustavos x-bit patch
476
def get_prop_change(meta_modified):
477
    if meta_modified:
478
        return " (properties changed)"
479
    else:
480
        return  ""
481
482
1740.2.5 by Aaron Bentley
Merge from bzr.dev
483
def _maybe_diff_file_or_symlink(old_path, old_tree, file_id,
484
                                new_path, new_tree, text_modified,
1092.2.9 by Robert Collins
bugfix _maybe_diff, the test was not catching the error
485
                                kind, to_file, diff_file):
1092.2.6 by Robert Collins
symlink support updated to work
486
    if text_modified:
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
487
        new_entry = new_tree.inventory[file_id]
488
        old_tree.inventory[file_id].diff(diff_file,
1740.2.5 by Aaron Bentley
Merge from bzr.dev
489
                                         old_path, old_tree,
490
                                         new_path, new_entry, 
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
491
                                         new_tree, to_file)