2
# -*- coding: UTF-8 -*-
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd.
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
6
5
# the Free Software Foundation; either version 2 of the License, or
7
6
# (at your option) any later version.
9
8
# This program is distributed in the hope that it will be useful,
10
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
11
# GNU General Public License for more details.
14
13
# You should have received a copy of the GNU General Public License
15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from bzrlib.trace import mutter
24
from bzrlib.delta import compare_trees
19
25
from bzrlib.errors import BzrError
20
from bzrlib.delta import compare_trees
26
import bzrlib.errors as errors
28
from bzrlib.patiencediff import unified_diff
29
import bzrlib.patiencediff
30
from bzrlib.symbol_versioning import (deprecated_function,
32
from bzrlib.textfile import check_text_lines
33
from bzrlib.trace import mutter, warning
22
36
# TODO: Rather than building a changeset object, we should probably
23
37
# invoke callbacks on an object. That object can either accumulate a
24
38
# list, write them out directly, etc etc.
26
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
40
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
41
allow_binary=False, sequence_matcher=None,
42
path_encoding='utf8'):
29
43
# FIXME: difflib is wrong if there is no trailing newline.
30
44
# The syntax used by patch seems to be "\ No newline at
31
45
# end of file" following the last diff line from that
41
55
# both sequences are empty.
42
56
if not oldlines and not newlines:
45
ud = difflib.unified_diff(oldlines, newlines,
46
fromfile=old_label, tofile=new_label)
59
if allow_binary is False:
60
check_text_lines(oldlines)
61
check_text_lines(newlines)
63
if sequence_matcher is None:
64
sequence_matcher = bzrlib.patiencediff.PatienceSequenceMatcher
65
ud = unified_diff(oldlines, newlines,
66
fromfile=old_filename.encode(path_encoding),
67
tofile=new_filename.encode(path_encoding),
68
sequencematcher=sequence_matcher)
48
71
# work-around for difflib being too smart for its own good
49
72
# if /dev/null is "1,0", patch won't recognize it as /dev/null
52
74
ud[2] = ud[2].replace('-1,0', '-0,0')
55
76
ud[2] = ud[2].replace('+1,0', '+0,0')
77
# work around for difflib emitting random spaces after the label
78
ud[0] = ud[0][:-2] + '\n'
79
ud[1] = ud[1][:-2] + '\n'
58
82
to_file.write(line)
66
def external_diff(old_label, oldlines, new_label, newlines, to_file,
88
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
68
90
"""Display a diff by calling out to the external diff program."""
91
if hasattr(to_file, 'fileno'):
95
out_file = subprocess.PIPE
71
if to_file != sys.stdout:
72
raise NotImplementedError("sorry, can't send external diff other than to stdout yet",
75
98
# make sure our own output is properly ordered before the diff
78
from tempfile import NamedTemporaryFile
81
oldtmpf = NamedTemporaryFile()
82
newtmpf = NamedTemporaryFile()
101
oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
102
newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
103
oldtmpf = os.fdopen(oldtmp_fd, 'wb')
104
newtmpf = os.fdopen(newtmp_fd, 'wb')
85
107
# TODO: perhaps a special case for comparing to or from the empty
141
177
oldtmpf.close() # and delete
146
def show_diff(b, revision, specific_files, external_diff_options=None):
179
# Clean up. Warn in case the files couldn't be deleted
180
# (in case windows still holds the file open, but not
181
# if the files have already been deleted)
183
os.remove(old_abspath)
185
if e.errno not in (errno.ENOENT,):
186
warning('Failed to delete temporary file: %s %s',
189
os.remove(new_abspath)
191
if e.errno not in (errno.ENOENT,):
192
warning('Failed to delete temporary file: %s %s',
196
@deprecated_function(zero_eight)
197
def show_diff(b, from_spec, specific_files, external_diff_options=None,
198
revision2=None, output=None, b2=None):
147
199
"""Shortcut for showing the diff to the working tree.
201
Please use show_diff_trees instead.
153
None for each, or otherwise the old revision to compare against.
155
The more general form is show_diff_trees(), where the caller
156
supplies any two trees.
161
old_tree = b.basis_tree()
163
old_tree = b.revision_tree(b.lookup_revision(revision))
165
new_tree = b.working_tree()
167
show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
168
external_diff_options)
207
None for 'basis tree', or otherwise the old revision to compare against.
209
The more general form is show_diff_trees(), where the caller
210
supplies any two trees.
215
if from_spec is None:
216
old_tree = b.bzrdir.open_workingtree()
218
old_tree = old_tree = old_tree.basis_tree()
220
old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
222
if revision2 is None:
224
new_tree = b.bzrdir.open_workingtree()
226
new_tree = b2.bzrdir.open_workingtree()
228
new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
230
return show_diff_trees(old_tree, new_tree, output, specific_files,
231
external_diff_options)
234
def diff_cmd_helper(tree, specific_files, external_diff_options,
235
old_revision_spec=None, new_revision_spec=None,
236
old_label='a/', new_label='b/'):
237
"""Helper for cmd_diff.
243
The specific files to compare, or None
245
external_diff_options
246
If non-None, run an external diff, and pass it these options
249
If None, use basis tree as old revision, otherwise use the tree for
250
the specified revision.
253
If None, use working tree as new revision, otherwise use the tree for
254
the specified revision.
256
The more general form is show_diff_trees(), where the caller
257
supplies any two trees.
261
revision_id = spec.in_store(tree.branch).rev_id
262
return tree.branch.repository.revision_tree(revision_id)
263
if old_revision_spec is None:
264
old_tree = tree.basis_tree()
266
old_tree = spec_tree(old_revision_spec)
268
if new_revision_spec is None:
271
new_tree = spec_tree(new_revision_spec)
272
if new_tree is not tree:
273
extra_trees = (tree,)
277
return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
278
external_diff_options,
279
old_label=old_label, new_label=new_label,
280
extra_trees=extra_trees)
172
283
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
173
external_diff_options=None):
284
external_diff_options=None,
285
old_label='a/', new_label='b/',
174
287
"""Show in text form the changes from one tree to another.
179
292
external_diff_options
180
293
If set, use an external GNU diff and pass these options.
296
If set, more Trees to use for looking up file ids
183
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
187
DEVNULL = '/dev/null'
188
# Windows users, don't panic about this filename -- it is a
189
# special signal to GNU patch that the file should be created or
190
# deleted respectively.
302
return _show_diff_trees(old_tree, new_tree, to_file,
303
specific_files, external_diff_options,
304
old_label=old_label, new_label=new_label,
305
extra_trees=extra_trees)
312
def _show_diff_trees(old_tree, new_tree, to_file,
313
specific_files, external_diff_options,
314
old_label='a/', new_label='b/', extra_trees=None):
316
# GNU Patch uses the epoch date to detect files that are being added
317
# or removed in a diff.
318
EPOCH_DATE = '1970-01-01 00:00:00 +0000'
192
320
# TODO: Generation of pseudo-diffs for added/deleted files could
193
321
# be usefully made into a much faster special case.
201
329
diff_file = internal_diff
204
331
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
205
specific_files=specific_files)
332
specific_files=specific_files,
333
extra_trees=extra_trees, require_versioned=True)
207
336
for path, file_id, kind in delta.removed:
208
print >>to_file, '*** removed %s %r' % (kind, path)
210
diff_file(old_label + path,
211
old_tree.get_file(file_id).readlines(),
338
print >>to_file, '=== removed %s %r' % (kind, path.encode('utf8'))
339
old_name = '%s%s\t%s' % (old_label, path,
340
_patch_header_date(old_tree, file_id, path))
341
new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)
342
old_tree.inventory[file_id].diff(diff_file, old_name, old_tree,
343
new_name, None, None, to_file)
216
344
for path, file_id, kind in delta.added:
217
print >>to_file, '*** added %s %r' % (kind, path)
222
new_tree.get_file(file_id).readlines(),
225
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
226
print >>to_file, '*** renamed %s %r => %r' % (kind, old_path, new_path)
346
print >>to_file, '=== added %s %r' % (kind, path.encode('utf8'))
347
old_name = '%s%s\t%s' % (old_label, path, EPOCH_DATE)
348
new_name = '%s%s\t%s' % (new_label, path,
349
_patch_header_date(new_tree, file_id, path))
350
new_tree.inventory[file_id].diff(diff_file, new_name, new_tree,
351
old_name, None, None, to_file,
353
for (old_path, new_path, file_id, kind,
354
text_modified, meta_modified) in delta.renamed:
356
prop_str = get_prop_change(meta_modified)
357
print >>to_file, '=== renamed %s %r => %r%s' % (
358
kind, old_path.encode('utf8'),
359
new_path.encode('utf8'), prop_str)
360
old_name = '%s%s\t%s' % (old_label, old_path,
361
_patch_header_date(old_tree, file_id,
363
new_name = '%s%s\t%s' % (new_label, new_path,
364
_patch_header_date(new_tree, file_id,
366
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,
368
text_modified, kind, to_file, diff_file)
369
for path, file_id, kind, text_modified, meta_modified in delta.modified:
371
prop_str = get_prop_change(meta_modified)
372
print >>to_file, '=== modified %s %r%s' % (kind, path.encode('utf8'), prop_str)
373
old_name = '%s%s\t%s' % (old_label, path,
374
_patch_header_date(old_tree, file_id, path))
375
new_name = '%s%s\t%s' % (new_label, path,
376
_patch_header_date(new_tree, file_id, path))
227
377
if text_modified:
228
diff_file(old_label + old_path,
229
old_tree.get_file(file_id).readlines(),
230
new_label + new_path,
231
new_tree.get_file(file_id).readlines(),
234
for path, file_id, kind in delta.modified:
235
print >>to_file, '*** modified %s %r' % (kind, path)
237
diff_file(old_label + path,
238
old_tree.get_file(file_id).readlines(),
240
new_tree.get_file(file_id).readlines(),
378
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,
380
True, kind, to_file, diff_file)
385
def _patch_header_date(tree, file_id, path):
386
"""Returns a timestamp suitable for use in a patch header."""
387
tm = time.gmtime(tree.get_file_mtime(file_id, path))
388
return time.strftime('%Y-%m-%d %H:%M:%S +0000', tm)
391
def _raise_if_nonexistent(paths, old_tree, new_tree):
392
"""Complain if paths are not in either inventory or tree.
394
It's OK with the files exist in either tree's inventory, or
395
if they exist in the tree but are not versioned.
397
This can be used by operations such as bzr status that can accept
398
unknown or ignored files.
400
mutter("check paths: %r", paths)
403
s = old_tree.filter_unversioned_files(paths)
404
s = new_tree.filter_unversioned_files(s)
405
s = [path for path in s if not new_tree.has_filename(path)]
407
raise errors.PathsDoNotExist(sorted(s))
410
def get_prop_change(meta_modified):
412
return " (properties changed)"
417
def _maybe_diff_file_or_symlink(old_path, old_tree, file_id,
418
new_path, new_tree, text_modified,
419
kind, to_file, diff_file):
421
new_entry = new_tree.inventory[file_id]
422
old_tree.inventory[file_id].diff(diff_file,
added
removed
bzrlib/diff.py
