2
# -*- coding: UTF-8 -*-
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from trace import mutter
19
from errors import BzrError
23
def _diff_one(oldlines, newlines, to_file, **kw):
26
# FIXME: difflib is wrong if there is no trailing newline.
27
# The syntax used by patch seems to be "\ No newline at
28
# end of file" following the last diff line from that
29
# file. This is not trivial to insert into the
30
# unified_diff output and it might be better to just fix
31
# or replace that function.
33
# In the meantime we at least make sure the patch isn't
37
# Special workaround for Python2.3, where difflib fails if
38
# both sequences are empty.
39
if not oldlines and not newlines:
44
if oldlines and (oldlines[-1][-1] != '\n'):
47
if newlines and (newlines[-1][-1] != '\n'):
51
ud = difflib.unified_diff(oldlines, newlines, **kw)
53
# work-around for difflib being too smart for its own good
54
# if /dev/null is "1,0", patch won't recognize it as /dev/null
57
ud[2] = ud[2].replace('-1,0', '-0,0')
60
ud[2] = ud[2].replace('+1,0', '+0,0')
62
to_file.writelines(ud)
64
print >>to_file, "\\ No newline at end of file"
69
def show_diff(b, revision, specific_files):
73
old_tree = b.basis_tree()
75
old_tree = b.revision_tree(b.lookup_revision(revision))
77
new_tree = b.working_tree()
79
show_diff_trees(old_tree, new_tree, sys.stdout, specific_files)
83
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None):
84
"""Show in text form the changes from one tree to another.
87
If set, include only changes to these files.
90
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
95
# Windows users, don't panic about this filename -- it is a
96
# special signal to GNU patch that the file should be created or
97
# deleted respectively.
99
# TODO: Generation of pseudo-diffs for added/deleted files could
100
# be usefully made into a much faster special case.
102
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
103
specific_files=specific_files)
105
for path, file_id, kind in delta.removed:
106
print '*** removed %s %r' % (kind, path)
108
_diff_one(old_tree.get_file(file_id).readlines(),
111
fromfile=old_label + path,
114
for path, file_id, kind in delta.added:
115
print '*** added %s %r' % (kind, path)
118
new_tree.get_file(file_id).readlines(),
121
tofile=new_label + path)
123
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
124
print '*** renamed %s %r => %r' % (kind, old_path, new_path)
126
_diff_one(old_tree.get_file(file_id).readlines(),
127
new_tree.get_file(file_id).readlines(),
129
fromfile=old_label + old_path,
130
tofile=new_label + new_path)
132
for path, file_id, kind in delta.modified:
133
print '*** modified %s %r' % (kind, path)
135
_diff_one(old_tree.get_file(file_id).readlines(),
136
new_tree.get_file(file_id).readlines(),
138
fromfile=old_label + path,
139
tofile=new_label + path)
143
class TreeDelta(object):
144
"""Describes changes from one tree to another.
153
(oldpath, newpath, id, kind, text_modified)
159
Each id is listed only once.
161
Files that are both modified and renamed are listed only in
162
renamed, with the text_modified flag true.
164
The lists are normally sorted when the delta is created.
174
def touches_file_id(self, file_id):
175
"""Return True if file_id is modified by this delta."""
176
for l in self.added, self.removed, self.modified:
180
for v in self.renamed:
186
def show(self, to_file, show_ids=False, show_unchanged=False):
187
def show_list(files):
188
for path, fid, kind in files:
189
if kind == 'directory':
191
elif kind == 'symlink':
195
print >>to_file, ' %-30s %s' % (path, fid)
197
print >>to_file, ' ', path
200
print >>to_file, 'removed:'
201
show_list(self.removed)
204
print >>to_file, 'added:'
205
show_list(self.added)
208
print >>to_file, 'renamed:'
209
for oldpath, newpath, fid, kind, text_modified in self.renamed:
211
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
213
print >>to_file, ' %s => %s' % (oldpath, newpath)
216
print >>to_file, 'modified:'
217
show_list(self.modified)
219
if show_unchanged and self.unchanged:
220
print >>to_file, 'unchanged:'
221
show_list(self.unchanged)
225
def compare_trees(old_tree, new_tree, want_unchanged, specific_files=None):
226
"""Describe changes from one tree to another.
228
Returns a TreeDelta with details of added, modified, renamed, and
231
The root entry is specifically exempt.
233
This only considers versioned files.
236
If true, also list files unchanged from one version to
240
If true, only check for changes to specified names or
244
from osutils import is_inside_any
246
old_inv = old_tree.inventory
247
new_inv = new_tree.inventory
249
mutter('start compare_trees')
251
# TODO: match for specific files can be rather smarter by finding
252
# the IDs of those files up front and then considering only that.
254
for file_id in old_tree:
255
if file_id in new_tree:
256
kind = old_inv.get_file_kind(file_id)
257
assert kind == new_inv.get_file_kind(file_id)
259
assert kind in ('file', 'directory', 'symlink', 'root_directory'), \
260
'invalid file kind %r' % kind
262
if kind == 'root_directory':
265
old_path = old_inv.id2path(file_id)
266
new_path = new_inv.id2path(file_id)
269
if (not is_inside_any(specific_files, old_path)
270
and not is_inside_any(specific_files, new_path)):
274
old_sha1 = old_tree.get_file_sha1(file_id)
275
new_sha1 = new_tree.get_file_sha1(file_id)
276
text_modified = (old_sha1 != new_sha1)
278
## mutter("no text to check for %r %r" % (file_id, kind))
279
text_modified = False
281
# TODO: Can possibly avoid calculating path strings if the
282
# two files are unchanged and their names and parents are
283
# the same and the parents are unchanged all the way up.
284
# May not be worthwhile.
286
if old_path != new_path:
287
delta.renamed.append((old_path, new_path, file_id, kind,
290
delta.modified.append((new_path, file_id, kind))
292
delta.unchanged.append((new_path, file_id, kind))
294
old_path = old_inv.id2path(file_id)
296
if not is_inside_any(specific_files, old_path):
298
delta.removed.append((old_path, file_id, kind))
300
mutter('start looking for new files')
301
for file_id in new_inv:
302
if file_id in old_inv:
304
new_path = new_inv.id2path(file_id)
306
if not is_inside_any(specific_files, new_path):
308
kind = new_inv.get_file_kind(file_id)
309
delta.added.append((new_path, file_id, kind))
314
delta.modified.sort()
315
delta.unchanged.sort()
added
removed
bzrlib/diff.py
