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 sets import Set, ImmutableSet
20
from trace import mutter
21
from errors import BzrError
25
def _diff_one(oldlines, newlines, to_file, **kw):
28
# FIXME: difflib is wrong if there is no trailing newline.
29
# The syntax used by patch seems to be "\ No newline at
30
# end of file" following the last diff line from that
31
# file. This is not trivial to insert into the
32
# unified_diff output and it might be better to just fix
33
# or replace that function.
35
# In the meantime we at least make sure the patch isn't
39
# Special workaround for Python2.3, where difflib fails if
40
# both sequences are empty.
41
if not oldlines and not newlines:
46
if oldlines and (oldlines[-1][-1] != '\n'):
49
if newlines and (newlines[-1][-1] != '\n'):
53
ud = difflib.unified_diff(oldlines, newlines, **kw)
55
# work-around for difflib being too smart for its own good
56
# if /dev/null is "1,0", patch won't recognize it as /dev/null
59
ud[2] = ud[2].replace('-1,0', '-0,0')
62
ud[2] = ud[2].replace('+1,0', '+0,0')
64
to_file.writelines(ud)
66
print >>to_file, "\\ No newline at end of file"
70
def show_diff(b, revision, specific_files):
74
old_tree = b.basis_tree()
76
old_tree = b.revision_tree(b.lookup_revision(revision))
78
new_tree = b.working_tree()
80
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
85
# Windows users, don't panic about this filename -- it is a
86
# special signal to GNU patch that the file should be created or
87
# deleted respectively.
89
# TODO: Generation of pseudo-diffs for added/deleted files could
90
# be usefully made into a much faster special case.
92
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
93
specific_files=specific_files)
95
for path, file_id, kind in delta.removed:
96
print '*** removed %s %r' % (kind, path)
98
_diff_one(old_tree.get_file(file_id).readlines(),
101
fromfile=old_label + path,
104
for path, file_id, kind in delta.added:
105
print '*** added %s %r' % (kind, path)
108
new_tree.get_file(file_id).readlines(),
111
tofile=new_label + path)
113
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
114
print '*** renamed %s %r => %r' % (kind, old_path, new_path)
116
_diff_one(old_tree.get_file(file_id).readlines(),
117
new_tree.get_file(file_id).readlines(),
119
fromfile=old_label + old_path,
120
tofile=new_label + new_path)
122
for path, file_id, kind in delta.modified:
123
print '*** modified %s %r' % (kind, path)
125
_diff_one(old_tree.get_file(file_id).readlines(),
126
new_tree.get_file(file_id).readlines(),
128
fromfile=old_label + path,
129
tofile=new_label + path)
134
"""Describes changes from one tree to another.
143
(oldpath, newpath, id, kind, text_modified)
149
Each id is listed only once.
151
Files that are both modified and renamed are listed only in
152
renamed, with the text_modified flag true.
154
The lists are normally sorted when the delta is created.
164
def touches_file_id(self, file_id):
165
"""Return True if file_id is modified by this delta."""
166
for l in self.added, self.removed, self.modified:
170
for v in self.renamed:
176
def show(self, to_file, show_ids=False, show_unchanged=False):
177
def show_list(files):
178
for path, fid, kind in files:
179
if kind == 'directory':
181
elif kind == 'symlink':
185
print >>to_file, ' %-30s %s' % (path, fid)
187
print >>to_file, ' ', path
190
print >>to_file, 'removed:'
191
show_list(self.removed)
194
print >>to_file, 'added:'
195
show_list(self.added)
198
print >>to_file, 'renamed:'
199
for oldpath, newpath, fid, kind, text_modified in self.renamed:
201
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
203
print >>to_file, ' %s => %s' % (oldpath, newpath)
206
print >>to_file, 'modified:'
207
show_list(self.modified)
209
if show_unchanged and self.unchanged:
210
print >>to_file, 'unchanged:'
211
show_list(self.unchanged)
215
def compare_trees(old_tree, new_tree, want_unchanged, specific_files=None):
216
"""Describe changes from one tree to another.
218
Returns a TreeDelta with details of added, modified, renamed, and
221
The root entry is specifically exempt.
223
This only considers versioned files.
226
If true, also list files unchanged from one version to
230
If true, only check for changes to specified names or
234
from osutils import is_inside_any
236
old_inv = old_tree.inventory
237
new_inv = new_tree.inventory
239
mutter('start compare_trees')
241
# TODO: match for specific files can be rather smarter by finding
242
# the IDs of those files up front and then considering only that.
244
for file_id in old_tree:
245
if file_id in new_tree:
246
kind = old_inv.get_file_kind(file_id)
247
assert kind == new_inv.get_file_kind(file_id)
249
assert kind in ('file', 'directory', 'symlink', 'root_directory'), \
250
'invalid file kind %r' % kind
252
if kind == 'root_directory':
255
old_path = old_inv.id2path(file_id)
256
new_path = new_inv.id2path(file_id)
259
if (not is_inside_any(specific_files, old_path)
260
and not is_inside_any(specific_files, new_path)):
264
old_sha1 = old_tree.get_file_sha1(file_id)
265
new_sha1 = new_tree.get_file_sha1(file_id)
266
text_modified = (old_sha1 != new_sha1)
268
## mutter("no text to check for %r %r" % (file_id, kind))
269
text_modified = False
271
# TODO: Can possibly avoid calculating path strings if the
272
# two files are unchanged and their names and parents are
273
# the same and the parents are unchanged all the way up.
274
# May not be worthwhile.
276
if old_path != new_path:
277
delta.renamed.append((old_path, new_path, file_id, kind,
280
delta.modified.append((new_path, file_id, kind))
282
delta.unchanged.append((new_path, file_id, kind))
284
old_path = old_inv.id2path(file_id)
286
if not is_inside_any(specific_files, old_path):
288
delta.removed.append((old_path, file_id, kind))
290
mutter('start looking for new files')
291
for file_id in new_inv:
292
if file_id in old_inv:
294
new_path = new_inv.id2path(file_id)
296
if not is_inside_any(specific_files, new_path):
298
kind = new_inv.get_file_kind(file_id)
299
delta.added.append((new_path, file_id, kind))
304
delta.modified.sort()
305
delta.unchanged.sort()
added
removed
bzrlib/diff.py
