bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1
by mbp at sourcefrog
import from baz patch-364 |
1 |
#! /usr/bin/env python
|
2 |
# -*- coding: UTF-8 -*-
|
|
3 |
||
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.
|
|
8 |
||
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.
|
|
13 |
||
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
|
|
17 |
||
18 |
from sets import Set |
|
19 |
||
20 |
from trace import mutter |
|
356
by Martin Pool
- pychecker fixes in bzrlib.diff |
21 |
from errors import BzrError |
1
by mbp at sourcefrog
import from baz patch-364 |
22 |
|
23 |
||
329
by Martin Pool
- refactor command functions into command classes |
24 |
|
475
by Martin Pool
- rewrite diff using compare_trees() |
25 |
def _diff_one(oldlines, newlines, to_file, **kw): |
26 |
import difflib |
|
27 |
||
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.
|
|
34 |
||
35 |
# In the meantime we at least make sure the patch isn't
|
|
36 |
# mangled.
|
|
37 |
||
38 |
||
39 |
# Special workaround for Python2.3, where difflib fails if
|
|
40 |
# both sequences are empty.
|
|
41 |
if not oldlines and not newlines: |
|
42 |
return
|
|
43 |
||
44 |
nonl = False |
|
45 |
||
46 |
if oldlines and (oldlines[-1][-1] != '\n'): |
|
47 |
oldlines[-1] += '\n' |
|
48 |
nonl = True |
|
49 |
if newlines and (newlines[-1][-1] != '\n'): |
|
50 |
newlines[-1] += '\n' |
|
51 |
nonl = True |
|
52 |
||
53 |
ud = difflib.unified_diff(oldlines, newlines, **kw) |
|
54 |
||
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
|
|
57 |
if not oldlines: |
|
58 |
ud = list(ud) |
|
59 |
ud[2] = ud[2].replace('-1,0', '-0,0') |
|
60 |
elif not newlines: |
|
61 |
ud = list(ud) |
|
62 |
ud[2] = ud[2].replace('+1,0', '+0,0') |
|
63 |
||
64 |
to_file.writelines(ud) |
|
65 |
if nonl: |
|
66 |
print >>to_file, "\\ No newline at end of file" |
|
67 |
print >>to_file |
|
68 |
||
69 |
||
329
by Martin Pool
- refactor command functions into command classes |
70 |
def show_diff(b, revision, file_list): |
475
by Martin Pool
- rewrite diff using compare_trees() |
71 |
import sys |
72 |
||
73 |
if file_list: |
|
74 |
raise NotImplementedError('diff on restricted files broken at the moment') |
|
329
by Martin Pool
- refactor command functions into command classes |
75 |
|
76 |
if revision == None: |
|
77 |
old_tree = b.basis_tree() |
|
78 |
else: |
|
79 |
old_tree = b.revision_tree(b.lookup_revision(revision)) |
|
80 |
||
81 |
new_tree = b.working_tree() |
|
82 |
||
83 |
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
|
|
84 |
old_label = '' |
|
85 |
new_label = '' |
|
86 |
||
87 |
DEVNULL = '/dev/null' |
|
88 |
# Windows users, don't panic about this filename -- it is a
|
|
89 |
# special signal to GNU patch that the file should be created or
|
|
90 |
# deleted respectively.
|
|
91 |
||
92 |
# TODO: Generation of pseudo-diffs for added/deleted files could
|
|
93 |
# be usefully made into a much faster special case.
|
|
94 |
||
475
by Martin Pool
- rewrite diff using compare_trees() |
95 |
delta = compare_trees(old_tree, new_tree, want_unchanged=False) |
96 |
||
97 |
for path, file_id, kind in delta.removed: |
|
98 |
print '*** removed %s %r' % (kind, path) |
|
99 |
if kind == 'file': |
|
100 |
_diff_one(old_tree.get_file(file_id).readlines(), |
|
101 |
[],
|
|
102 |
sys.stdout, |
|
103 |
fromfile=old_label + path, |
|
104 |
tofile=DEVNULL) |
|
105 |
||
106 |
for path, file_id, kind in delta.added: |
|
107 |
print '*** added %s %r' % (kind, path) |
|
108 |
if kind == 'file': |
|
109 |
_diff_one([], |
|
110 |
new_tree.get_file(file_id).readlines(), |
|
111 |
sys.stdout, |
|
112 |
fromfile=DEVNULL, |
|
113 |
tofile=new_label + path) |
|
114 |
||
115 |
for old_path, new_path, file_id, kind, text_modified in delta.renamed: |
|
116 |
print '*** renamed %s %r => %r' % (kind, old_path, new_path) |
|
117 |
if text_modified: |
|
118 |
_diff_one(old_tree.get_file(file_id).readlines(), |
|
119 |
new_tree.get_file(file_id).readlines(), |
|
120 |
sys.stdout, |
|
121 |
fromfile=old_label + old_path, |
|
122 |
tofile=new_label + new_path) |
|
123 |
||
124 |
for path, file_id, kind in delta.modified: |
|
125 |
print '*** modified %s %r' % (kind, path) |
|
126 |
if kind == 'file': |
|
127 |
_diff_one(old_tree.get_file(file_id).readlines(), |
|
128 |
new_tree.get_file(file_id).readlines(), |
|
129 |
sys.stdout, |
|
130 |
fromfile=old_label + path, |
|
131 |
tofile=new_label + path) |
|
329
by Martin Pool
- refactor command functions into command classes |
132 |
|
133 |
||
379
by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees |
134 |
|
135 |
class TreeDelta: |
|
136 |
"""Describes changes from one tree to another. |
|
137 |
||
138 |
Contains four lists:
|
|
139 |
||
140 |
added
|
|
475
by Martin Pool
- rewrite diff using compare_trees() |
141 |
(path, id, kind)
|
379
by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees |
142 |
removed
|
475
by Martin Pool
- rewrite diff using compare_trees() |
143 |
(path, id, kind)
|
379
by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees |
144 |
renamed
|
475
by Martin Pool
- rewrite diff using compare_trees() |
145 |
(oldpath, newpath, id, kind, text_modified)
|
379
by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees |
146 |
modified
|
475
by Martin Pool
- rewrite diff using compare_trees() |
147 |
(path, id, kind)
|
463
by Martin Pool
- compare_trees() also reports unchanged files |
148 |
unchanged
|
475
by Martin Pool
- rewrite diff using compare_trees() |
149 |
(path, id, kind)
|
379
by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees |
150 |
|
460
by Martin Pool
- new testing command compare-trees |
151 |
Each id is listed only once.
|
379
by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees |
152 |
|
460
by Martin Pool
- new testing command compare-trees |
153 |
Files that are both modified and renamed are listed only in
|
154 |
renamed, with the text_modified flag true.
|
|
463
by Martin Pool
- compare_trees() also reports unchanged files |
155 |
|
156 |
The lists are normally sorted when the delta is created.
|
|
379
by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees |
157 |
"""
|
158 |
def __init__(self): |
|
159 |
self.added = [] |
|
160 |
self.removed = [] |
|
161 |
self.renamed = [] |
|
162 |
self.modified = [] |
|
463
by Martin Pool
- compare_trees() also reports unchanged files |
163 |
self.unchanged = [] |
379
by Martin Pool
- Simpler compare_inventories() to possibly replace diff_trees |
164 |
|
465
by Martin Pool
- Move show_status() out of Branch into a new function in |
165 |
def show(self, to_file, show_ids=False, show_unchanged=False): |
166 |
def show_list(files): |
|
475
by Martin Pool
- rewrite diff using compare_trees() |
167 |
for path, fid, kind in files: |
168 |
if kind == 'directory': |
|
169 |
path += '/' |
|
170 |
elif kind == 'symlink': |
|
171 |
path += '@' |
|
172 |
||
465
by Martin Pool
- Move show_status() out of Branch into a new function in |
173 |
if show_ids: |
174 |
print >>to_file, ' %-30s %s' % (path, fid) |
|
175 |
else: |
|
176 |
print >>to_file, ' ', path |
|
177 |
||
460
by Martin Pool
- new testing command compare-trees |
178 |
if self.removed: |
475
by Martin Pool
- rewrite diff using compare_trees() |
179 |
print >>to_file, 'removed:' |
465
by Martin Pool
- Move show_status() out of Branch into a new function in |
180 |
show_list(self.removed) |
181 |
||
460
by Martin Pool
- new testing command compare-trees |
182 |
if self.added: |
475
by Martin Pool
- rewrite diff using compare_trees() |
183 |
print >>to_file, 'added:' |
465
by Martin Pool
- Move show_status() out of Branch into a new function in |
184 |
show_list(self.added) |
185 |
||
460
by Martin Pool
- new testing command compare-trees |
186 |
if self.renamed: |
475
by Martin Pool
- rewrite diff using compare_trees() |
187 |
print >>to_file, 'renamed:' |
188 |
for oldpath, newpath, fid, kind, text_modified in self.renamed: |
|
460
by Martin Pool
- new testing command compare-trees |
189 |
if show_ids: |
190 |
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid) |
|
191 |
else: |
|
192 |
print >>to_file, ' %s => %s' % (oldpath, newpath) |
|
465
by Martin Pool
- Move show_status() out of Branch into a new function in |
193 |
|
460
by Martin Pool
- new testing command compare-trees |
194 |
if self.modified: |
475
by Martin Pool
- rewrite diff using compare_trees() |
195 |
print >>to_file, 'modified:' |
465
by Martin Pool
- Move show_status() out of Branch into a new function in |
196 |
show_list(self.modified) |
197 |
||
198 |
if show_unchanged and self.unchanged: |
|
475
by Martin Pool
- rewrite diff using compare_trees() |
199 |
print >>to_file, 'unchanged:' |
465
by Martin Pool
- Move show_status() out of Branch into a new function in |
200 |
show_list(self.unchanged) |
460
by Martin Pool
- new testing command compare-trees |
201 |
|
202 |
||
203 |
||
470
by Martin Pool
- remove dead code for cmd_compare_trees |
204 |
def compare_trees(old_tree, new_tree, want_unchanged): |
460
by Martin Pool
- new testing command compare-trees |
205 |
old_inv = old_tree.inventory |
206 |
new_inv = new_tree.inventory |
|
207 |
delta = TreeDelta() |
|
475
by Martin Pool
- rewrite diff using compare_trees() |
208 |
mutter('start compare_trees') |
462
by Martin Pool
- New form 'file_id in tree' to check if the file is present |
209 |
for file_id in old_tree: |
210 |
if file_id in new_tree: |
|
460
by Martin Pool
- new testing command compare-trees |
211 |
kind = old_inv.get_file_kind(file_id) |
475
by Martin Pool
- rewrite diff using compare_trees() |
212 |
assert kind == new_inv.get_file_kind(file_id) |
213 |
||
460
by Martin Pool
- new testing command compare-trees |
214 |
assert kind in ('file', 'directory', 'symlink', 'root_directory'), \ |
215 |
'invalid file kind %r' % kind |
|
477
by Martin Pool
- fix header for listing of unknown files |
216 |
|
217 |
if kind == 'root_directory': |
|
218 |
continue
|
|
219 |
||
220 |
old_path = old_inv.id2path(file_id) |
|
221 |
new_path = new_inv.id2path(file_id) |
|
222 |
||
460
by Martin Pool
- new testing command compare-trees |
223 |
if kind == 'file': |
224 |
old_sha1 = old_tree.get_file_sha1(file_id) |
|
225 |
new_sha1 = new_tree.get_file_sha1(file_id) |
|
226 |
text_modified = (old_sha1 != new_sha1) |
|
227 |
else: |
|
228 |
## mutter("no text to check for %r %r" % (file_id, kind))
|
|
229 |
text_modified = False |
|
471
by Martin Pool
- actually avoid reporting unchanged files if not required |
230 |
|
231 |
# TODO: Can possibly avoid calculating path strings if the
|
|
232 |
# two files are unchanged and their names and parents are
|
|
233 |
# the same and the parents are unchanged all the way up.
|
|
234 |
# May not be worthwhile.
|
|
460
by Martin Pool
- new testing command compare-trees |
235 |
|
236 |
if old_path != new_path: |
|
475
by Martin Pool
- rewrite diff using compare_trees() |
237 |
delta.renamed.append((old_path, new_path, file_id, kind, |
238 |
text_modified)) |
|
460
by Martin Pool
- new testing command compare-trees |
239 |
elif text_modified: |
475
by Martin Pool
- rewrite diff using compare_trees() |
240 |
delta.modified.append((new_path, file_id, kind)) |
471
by Martin Pool
- actually avoid reporting unchanged files if not required |
241 |
elif want_unchanged: |
475
by Martin Pool
- rewrite diff using compare_trees() |
242 |
delta.unchanged.append((new_path, file_id, kind)) |
460
by Martin Pool
- new testing command compare-trees |
243 |
else: |
475
by Martin Pool
- rewrite diff using compare_trees() |
244 |
delta.removed.append((old_inv.id2path(file_id), file_id, kind)) |
245 |
||
246 |
mutter('start looking for new files') |
|
460
by Martin Pool
- new testing command compare-trees |
247 |
for file_id in new_inv: |
248 |
if file_id in old_inv: |
|
249 |
continue
|
|
475
by Martin Pool
- rewrite diff using compare_trees() |
250 |
kind = new_inv.get_file_kind(file_id) |
251 |
delta.added.append((new_inv.id2path(file_id), file_id, kind)) |
|
460
by Martin Pool
- new testing command compare-trees |
252 |
|
253 |
delta.removed.sort() |
|
254 |
delta.added.sort() |
|
255 |
delta.renamed.sort() |
|
256 |
delta.modified.sort() |
|
474
by Martin Pool
- sort unchanged files |
257 |
delta.unchanged.sort() |
460
by Martin Pool
- new testing command compare-trees |
258 |
|
259 |
return delta |