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