14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from bzrlib.trace import mutter
18
from bzrlib.errors import BzrError
19
19
from bzrlib.delta import compare_trees
20
from bzrlib.errors import BzrError
21
import bzrlib.errors as errors
22
from bzrlib.patiencediff import unified_diff
23
import bzrlib.patiencediff
24
from bzrlib.symbol_versioning import *
25
from bzrlib.textfile import check_text_lines
26
from bzrlib.trace import mutter
29
21
# TODO: Rather than building a changeset object, we should probably
30
22
# invoke callbacks on an object. That object can either accumulate a
31
23
# list, write them out directly, etc etc.
33
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
34
allow_binary=False, sequence_matcher=None,
35
path_encoding='utf8'):
25
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
36
28
# FIXME: difflib is wrong if there is no trailing newline.
37
29
# The syntax used by patch seems to be "\ No newline at
38
30
# end of file" following the last diff line from that
178
162
output = sys.stdout
180
if from_spec is None:
181
old_tree = b.bzrdir.open_workingtree()
183
old_tree = old_tree = old_tree.basis_tree()
165
old_tree = b.basis_tree()
185
old_tree = b.repository.revision_tree(from_spec.in_history(b).rev_id)
167
old_tree = b.revision_tree(revision.in_history(b).rev_id)
187
169
if revision2 is None:
189
new_tree = b.bzrdir.open_workingtree()
191
new_tree = b2.bzrdir.open_workingtree()
193
new_tree = b.repository.revision_tree(revision2.in_history(b).rev_id)
195
return show_diff_trees(old_tree, new_tree, output, specific_files,
196
external_diff_options)
199
def diff_cmd_helper(tree, specific_files, external_diff_options,
200
old_revision_spec=None, new_revision_spec=None,
201
old_label='a/', new_label='b/'):
202
"""Helper for cmd_diff.
208
The specific files to compare, or None
210
external_diff_options
211
If non-None, run an external diff, and pass it these options
214
If None, use basis tree as old revision, otherwise use the tree for
215
the specified revision.
218
If None, use working tree as new revision, otherwise use the tree for
219
the specified revision.
221
The more general form is show_diff_trees(), where the caller
222
supplies any two trees.
227
revision_id = spec.in_store(tree.branch).rev_id
228
return tree.branch.repository.revision_tree(revision_id)
229
if old_revision_spec is None:
230
old_tree = tree.basis_tree()
232
old_tree = spec_tree(old_revision_spec)
234
if new_revision_spec is None:
237
new_tree = spec_tree(new_revision_spec)
239
return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
240
external_diff_options,
241
old_label=old_label, new_label=new_label)
170
new_tree = b.working_tree()
172
new_tree = b.revision_tree(revision2.in_history(b).rev_id)
174
show_diff_trees(old_tree, new_tree, output, specific_files,
175
external_diff_options)
244
179
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
245
external_diff_options=None,
246
old_label='a/', new_label='b/'):
180
external_diff_options=None):
247
181
"""Show in text form the changes from one tree to another.
252
186
external_diff_options
253
187
If set, use an external GNU diff and pass these options.
259
return _show_diff_trees(old_tree, new_tree, to_file,
260
specific_files, external_diff_options,
261
old_label=old_label, new_label=new_label)
268
def _show_diff_trees(old_tree, new_tree, to_file,
269
specific_files, external_diff_options,
270
old_label='a/', new_label='b/' ):
272
# GNU Patch uses the epoch date to detect files that are being added
273
# or removed in a diff.
274
EPOCH_DATE = '1970-01-01 00:00:00 +0000'
190
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
194
DEVNULL = '/dev/null'
195
# Windows users, don't panic about this filename -- it is a
196
# special signal to GNU patch that the file should be created or
197
# deleted respectively.
276
199
# TODO: Generation of pseudo-diffs for added/deleted files could
277
200
# be usefully made into a much faster special case.
279
_raise_if_doubly_unversioned(specific_files, old_tree, new_tree)
281
202
if external_diff_options:
282
203
assert isinstance(external_diff_options, basestring)
283
204
opts = external_diff_options.split()
287
208
diff_file = internal_diff
289
211
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
290
212
specific_files=specific_files)
293
214
for path, file_id, kind in delta.removed:
295
print >>to_file, '=== removed %s %r' % (kind, path.encode('utf8'))
296
old_name = '%s%s\t%s' % (old_label, path,
297
_patch_header_date(old_tree, file_id, path))
298
new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)
299
old_tree.inventory[file_id].diff(diff_file, old_name, old_tree,
300
new_name, None, None, to_file)
215
print >>to_file, '=== removed %s %r' % (kind, path)
217
diff_file(old_label + path,
218
old_tree.get_file(file_id).readlines(),
301
223
for path, file_id, kind in delta.added:
303
print >>to_file, '=== added %s %r' % (kind, path.encode('utf8'))
304
old_name = '%s%s\t%s' % (old_label, path, EPOCH_DATE)
305
new_name = '%s%s\t%s' % (new_label, path,
306
_patch_header_date(new_tree, file_id, path))
307
new_tree.inventory[file_id].diff(diff_file, new_name, new_tree,
308
old_name, None, None, to_file,
310
for (old_path, new_path, file_id, kind,
311
text_modified, meta_modified) in delta.renamed:
313
prop_str = get_prop_change(meta_modified)
314
print >>to_file, '=== renamed %s %r => %r%s' % (
315
kind, old_path.encode('utf8'),
316
new_path.encode('utf8'), prop_str)
317
old_name = '%s%s\t%s' % (old_label, old_path,
318
_patch_header_date(old_tree, file_id,
320
new_name = '%s%s\t%s' % (new_label, new_path,
321
_patch_header_date(new_tree, file_id,
323
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,
325
text_modified, kind, to_file, diff_file)
326
for path, file_id, kind, text_modified, meta_modified in delta.modified:
328
prop_str = get_prop_change(meta_modified)
329
print >>to_file, '=== modified %s %r%s' % (kind, path.encode('utf8'), prop_str)
330
old_name = '%s%s\t%s' % (old_label, path,
331
_patch_header_date(old_tree, file_id, path))
332
new_name = '%s%s\t%s' % (new_label, path,
333
_patch_header_date(new_tree, file_id, path))
224
print >>to_file, '=== added %s %r' % (kind, path)
229
new_tree.get_file(file_id).readlines(),
232
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
233
print >>to_file, '=== renamed %s %r => %r' % (kind, old_path, new_path)
334
234
if text_modified:
335
_maybe_diff_file_or_symlink(old_name, old_tree, file_id,
337
True, kind, to_file, diff_file)
342
def _patch_header_date(tree, file_id, path):
343
"""Returns a timestamp suitable for use in a patch header."""
344
tm = time.gmtime(tree.get_file_mtime(file_id, path))
345
return time.strftime('%Y-%m-%d %H:%M:%S +0000', tm)
348
def _raise_if_doubly_unversioned(specific_files, old_tree, new_tree):
349
"""Complain if paths are not versioned in either tree."""
350
if not specific_files:
352
old_unversioned = old_tree.filter_unversioned_files(specific_files)
353
new_unversioned = new_tree.filter_unversioned_files(specific_files)
354
unversioned = old_unversioned.intersection(new_unversioned)
356
raise errors.PathsNotVersionedError(sorted(unversioned))
359
def _raise_if_nonexistent(paths, old_tree, new_tree):
360
"""Complain if paths are not in either inventory or tree.
362
It's OK with the files exist in either tree's inventory, or
363
if they exist in the tree but are not versioned.
365
This can be used by operations such as bzr status that can accept
366
unknown or ignored files.
368
mutter("check paths: %r", paths)
371
s = old_tree.filter_unversioned_files(paths)
372
s = new_tree.filter_unversioned_files(s)
373
s = [path for path in s if not new_tree.has_filename(path)]
375
raise errors.PathsDoNotExist(sorted(s))
378
def get_prop_change(meta_modified):
380
return " (properties changed)"
385
def _maybe_diff_file_or_symlink(old_path, old_tree, file_id,
386
new_path, new_tree, text_modified,
387
kind, to_file, diff_file):
389
new_entry = new_tree.inventory[file_id]
390
old_tree.inventory[file_id].diff(diff_file,
235
diff_file(old_label + old_path,
236
old_tree.get_file(file_id).readlines(),
237
new_label + new_path,
238
new_tree.get_file(file_id).readlines(),
241
for path, file_id, kind in delta.modified:
242
print >>to_file, '=== modified %s %r' % (kind, path)
244
diff_file(old_label + path,
245
old_tree.get_file(file_id).readlines(),
247
new_tree.get_file(file_id).readlines(),
added
removed
bzrlib/diff.py
