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