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"
68
def show_diff(b, revision, specific_files):
72
old_tree = b.basis_tree()
74
old_tree = b.revision_tree(b.lookup_revision(revision))
76
new_tree = b.working_tree()
78
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
83
# Windows users, don't panic about this filename -- it is a
84
# special signal to GNU patch that the file should be created or
85
# deleted respectively.
87
# TODO: Generation of pseudo-diffs for added/deleted files could
88
# be usefully made into a much faster special case.
90
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
91
specific_files=specific_files)
93
for path, file_id, kind in delta.removed:
94
print '*** removed %s %r' % (kind, path)
96
_diff_one(old_tree.get_file(file_id).readlines(),
99
fromfile=old_label + path,
102
for path, file_id, kind in delta.added:
103
print '*** added %s %r' % (kind, path)
106
new_tree.get_file(file_id).readlines(),
109
tofile=new_label + path)
111
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
112
print '*** renamed %s %r => %r' % (kind, old_path, new_path)
114
_diff_one(old_tree.get_file(file_id).readlines(),
115
new_tree.get_file(file_id).readlines(),
117
fromfile=old_label + old_path,
118
tofile=new_label + new_path)
120
for path, file_id, kind in delta.modified:
121
print '*** modified %s %r' % (kind, path)
123
_diff_one(old_tree.get_file(file_id).readlines(),
124
new_tree.get_file(file_id).readlines(),
126
fromfile=old_label + path,
127
tofile=new_label + path)
132
"""Describes changes from one tree to another.
141
(oldpath, newpath, id, kind, text_modified)
147
Each id is listed only once.
149
Files that are both modified and renamed are listed only in
150
renamed, with the text_modified flag true.
152
The lists are normally sorted when the delta is created.
162
def touches_file_id(self, file_id):
163
"""Return True if file_id is modified by this delta."""
164
for l in self.added, self.removed, self.modified:
168
for v in self.renamed:
174
def show(self, to_file, show_ids=False, show_unchanged=False):
175
def show_list(files):
176
for path, fid, kind in files:
177
if kind == 'directory':
179
elif kind == 'symlink':
183
print >>to_file, ' %-30s %s' % (path, fid)
185
print >>to_file, ' ', path
188
print >>to_file, 'removed:'
189
show_list(self.removed)
192
print >>to_file, 'added:'
193
show_list(self.added)
196
print >>to_file, 'renamed:'
197
for oldpath, newpath, fid, kind, text_modified in self.renamed:
199
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
201
print >>to_file, ' %s => %s' % (oldpath, newpath)
204
print >>to_file, 'modified:'
205
show_list(self.modified)
207
if show_unchanged and self.unchanged:
208
print >>to_file, 'unchanged:'
209
show_list(self.unchanged)
213
def compare_trees(old_tree, new_tree, want_unchanged, specific_files=None):
214
"""Describe changes from one tree to another.
216
Returns a TreeDelta with details of added, modified, renamed, and
219
The root entry is specifically exempt.
221
This only considers versioned files.
224
If true, also list files unchanged from one version to
228
If true, only check for changes to specified names or
232
from osutils import is_inside_any
234
old_inv = old_tree.inventory
235
new_inv = new_tree.inventory
237
mutter('start compare_trees')
239
# TODO: match for specific files can be rather smarter by finding
240
# the IDs of those files up front and then considering only that.
242
for file_id in old_tree:
243
if file_id in new_tree:
244
kind = old_inv.get_file_kind(file_id)
245
assert kind == new_inv.get_file_kind(file_id)
247
assert kind in ('file', 'directory', 'symlink', 'root_directory'), \
248
'invalid file kind %r' % kind
250
if kind == 'root_directory':
253
old_path = old_inv.id2path(file_id)
254
new_path = new_inv.id2path(file_id)
257
if (not is_inside_any(specific_files, old_path)
258
and not is_inside_any(specific_files, new_path)):
262
old_sha1 = old_tree.get_file_sha1(file_id)
263
new_sha1 = new_tree.get_file_sha1(file_id)
264
text_modified = (old_sha1 != new_sha1)
266
## mutter("no text to check for %r %r" % (file_id, kind))
267
text_modified = False
269
# TODO: Can possibly avoid calculating path strings if the
270
# two files are unchanged and their names and parents are
271
# the same and the parents are unchanged all the way up.
272
# May not be worthwhile.
274
if old_path != new_path:
275
delta.renamed.append((old_path, new_path, file_id, kind,
278
delta.modified.append((new_path, file_id, kind))
280
delta.unchanged.append((new_path, file_id, kind))
282
old_path = old_inv.id2path(file_id)
284
if not is_inside_any(specific_files, old_path):
286
delta.removed.append((old_path, file_id, kind))
288
mutter('start looking for new files')
289
for file_id in new_inv:
290
if file_id in old_inv:
292
new_path = new_inv.id2path(file_id)
294
if not is_inside_any(specific_files, new_path):
296
kind = new_inv.get_file_kind(file_id)
297
delta.added.append((new_path, file_id, kind))
302
delta.modified.sort()
303
delta.unchanged.sort()
added
removed
bzrlib/diff.py
