1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
|
#!/usr/bin/env python
"""\
Just some work for generating a changeset.
"""
import bzrlib, bzrlib.errors
import common
from bzrlib.inventory import ROOT_ID
try:
set
except NameError:
from sets import Set as set
def _canonicalize_revision(branch, revno):
"""Turn some sort of revision information into a single
set of from-to revision ids.
A revision id can be None if there is no associated revison.
:return: (old, new)
"""
# This is a little clumsy because revision parsing may return
# a single entry, or a list
if revno is None:
new = branch.last_patch()
else:
new = branch.lookup_revision(revno)
if new is None:
raise BzrCommandError('Cannot generate a changset with no commits in tree.')
old = branch.get_revision(new).precursor
return old, new
def _get_trees(branch, revisions):
"""Get the old and new trees based on revision.
"""
from bzrlib.tree import EmptyTree
if revisions[0] is None:
if hasattr(branch, 'get_root_id'): # Watch out for trees with labeled ROOT ids
old_tree = EmptyTree(branch.get_root_id)
else:
old_tree = EmptyTree()
else:
old_tree = branch.revision_tree(revisions[0])
if revisions[1] is None:
# This is for the future, once we support rollup revisions
# Or working tree revisions
new_tree = branch.working_tree()
else:
new_tree = branch.revision_tree(revisions[1])
return old_tree, new_tree
def _fake_working_revision(branch):
"""Fake a Revision object for the working tree.
This is for the future, to support changesets against the working tree.
"""
from bzrlib.revision import Revision
import time
from bzrlib.osutils import local_time_offset, \
username
precursor = branch.last_patch()
precursor_sha1 = branch.get_revision_sha1(precursor)
return Revision(timestamp=time.time(),
timezone=local_time_offset(),
committer=username(),
precursor=precursor,
precursor_sha1=precursor_sha1)
class MetaInfoHeader(object):
"""Maintain all of the header information about this
changeset.
"""
def __init__(self, branch, revisions, delta,
full_remove=True, full_rename=False,
external_diff_options = None,
new_tree=None, old_tree=None,
old_label = '', new_label = ''):
"""
:param full_remove: Include the full-text for a delete
:param full_rename: Include an add+delete patch for a rename
"""
self.branch = branch
self.delta = delta
self.full_remove=full_remove
self.full_rename=full_rename
self.external_diff_options = external_diff_options
self.old_label = old_label
self.new_label = new_label
self.old_tree = old_tree
self.new_tree = new_tree
self.to_file = None
self.revno = None
self.precursor_revno = None
self._get_revision_list(revisions)
def _get_revision_list(self, revisions):
"""This generates the list of all revisions from->to.
This is for the future, when we support having a rollup changeset.
For now, the list should only be one long.
"""
old_revno = None
new_revno = None
rh = self.branch.revision_history()
for revno, rev in enumerate(rh):
if rev == revisions[0]:
old_revno = revno
if rev == revisions[1]:
new_revno = revno
self.revision_list = []
if old_revno is None:
self.base_revision = None # Effectively the EmptyTree()
old_revno = -1
else:
self.base_revision = self.branch.get_revision(rh[old_revno])
if new_revno is None:
# For the future, when we support working tree changesets.
for rev_id in rh[old_revno+1:]:
self.revision_list.append(self.branch.get_revision(rev_id))
self.revision_list.append(_fake_working_revision(self.branch))
else:
for rev_id in rh[old_revno+1:new_revno+1]:
self.revision_list.append(self.branch.get_revision(rev_id))
self.precursor_revno = old_revno
self.revno = new_revno
def _write(self, txt, key=None):
if key:
self.to_file.write('# %s: %s\n' % (key, txt))
else:
self.to_file.write('# %s\n' % (txt,))
def write_meta_info(self, to_file):
"""Write out the meta-info portion to the supplied file.
:param to_file: Write out the meta information to the supplied
file
"""
self.to_file = to_file
self._write_header()
self._write_diffs()
self._write_footer()
def _write_header(self):
"""Write the stuff that comes before the patches."""
from bzrlib.osutils import username, format_date
write = self._write
for line in common.get_header():
write(line)
# This grabs the current username, what we really want is the
# username from the actual patches.
#write(username(), key='committer')
assert len(self.revision_list) == 1
rev = self.revision_list[0]
write(rev.committer, key='committer')
write(format_date(rev.timestamp, offset=rev.timezone), key='date')
write(str(self.revno), key='revno')
if rev.message:
self.to_file.write('# message:\n')
for line in rev.message.split('\n'):
self.to_file.write('# %s\n' % line)
write(rev.revision_id, key='revision')
if self.base_revision:
write(self.base_revision.revision_id, key='precursor')
write(str(self.precursor_revno), key='precursor revno')
write('')
self.to_file.write('\n')
def _write_footer(self):
"""Write the stuff that comes after the patches.
This is meant to be more meta-information, which people probably don't want
to read, but which is required for proper bzr operation.
"""
write = self._write
write('BEGIN BZR FOOTER')
assert len(self.revision_list) == 1 # We only handle single revision entries
rev = self.revision_list[0]
write(self.branch.get_revision_sha1(rev.revision_id),
key='revision sha1')
if self.base_revision:
rev_id = self.base_revision.revision_id
write(self.branch.get_revision_sha1(rev_id),
key='precursor sha1')
write('%.9f' % rev.timestamp, key='timestamp')
write(str(rev.timezone), key='timezone')
self._write_ids()
write('END BZR FOOTER')
def _write_revisions(self):
"""Not used. Used for writing multiple revisions."""
first = True
for rev in self.revision_list:
if rev.revision_id is not None:
if first:
self._write('revisions:')
first = False
self._write(' '*4 + rev.revision_id + '\t' + self.branch.get_revision_sha1(rev.revision_id))
def _write_ids(self):
if hasattr(self.branch, 'get_root_id'):
root_id = self.branch.get_root_id()
else:
root_id = ROOT_ID
old_ids = set()
new_ids = set()
for path, file_id, kind in self.delta.removed:
old_ids.add(file_id)
for path, file_id, kind in self.delta.added:
new_ids.add(file_id)
for old_path, new_path, file_id, kind, text_modified in self.delta.renamed:
old_ids.add(file_id)
new_ids.add(file_id)
for path, file_id, kind in self.delta.modified:
new_ids.add(file_id)
self._write(root_id, key='tree root id')
def write_ids(tree, id_set, name):
if len(id_set) > 0:
self.to_file.write('# %s ids:\n' % name)
seen_ids = set([root_id])
while len(id_set) > 0:
file_id = id_set.pop()
if file_id in seen_ids:
continue
seen_ids.add(file_id)
ie = tree.inventory[file_id]
if ie.parent_id not in seen_ids:
id_set.add(ie.parent_id)
path = tree.inventory.id2path(file_id)
self.to_file.write('# %s\t%s\t%s\n'
% (path.encode('utf8'), file_id.encode('utf8'),
ie.parent_id.encode('utf8')))
write_ids(self.new_tree, new_ids, 'file')
write_ids(self.old_tree, old_ids, 'old file')
def _write_diffs(self):
"""Write out the specific diffs"""
from bzrlib.diff import internal_diff, external_diff
DEVNULL = '/dev/null'
if self.external_diff_options:
assert isinstance(self.external_diff_options, basestring)
opts = self.external_diff_options.split()
def diff_file(olab, olines, nlab, nlines, to_file):
external_diff(olab, olines, nlab, nlines, to_file, opts)
else:
diff_file = internal_diff
for path, file_id, kind in self.delta.removed:
print >>self.to_file, '*** removed %s %r' % (kind, path)
if kind == 'file' and self.full_remove:
diff_file(self.old_label + path,
self.old_tree.get_file(file_id).readlines(),
DEVNULL,
[],
self.to_file)
for path, file_id, kind in self.delta.added:
print >>self.to_file, '*** added %s %r' % (kind, path)
if kind == 'file':
diff_file(DEVNULL,
[],
self.new_label + path,
self.new_tree.get_file(file_id).readlines(),
self.to_file)
for old_path, new_path, file_id, kind, text_modified in self.delta.renamed:
print >>self.to_file, '*** renamed %s %r => %r' % (kind, old_path, new_path)
if self.full_rename and kind == 'file':
diff_file(self.old_label + old_path,
self.old_tree.get_file(file_id).readlines(),
DEVNULL,
[],
self.to_file)
diff_file(DEVNULL,
[],
self.new_label + new_path,
self.new_tree.get_file(file_id).readlines(),
self.to_file)
elif text_modified:
diff_file(self.old_label + old_path,
self.old_tree.get_file(file_id).readlines(),
self.new_label + new_path,
self.new_tree.get_file(file_id).readlines(),
self.to_file)
for path, file_id, kind in self.delta.modified:
print >>self.to_file, '*** modified %s %r' % (kind, path)
if kind == 'file':
diff_file(self.old_label + path,
self.old_tree.get_file(file_id).readlines(),
self.new_label + path,
self.new_tree.get_file(file_id).readlines(),
self.to_file)
def show_changeset(branch, revision=None, specific_files=None,
external_diff_options=None, to_file=None,
include_full_diff=False):
from bzrlib.diff import compare_trees
if to_file is None:
import sys
to_file = sys.stdout
revisions = _canonicalize_revision(branch, revision)
old_tree, new_tree = _get_trees(branch, revisions)
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
specific_files=specific_files)
meta = MetaInfoHeader(branch, revisions, delta,
external_diff_options=external_diff_options,
old_tree=old_tree, new_tree=new_tree)
meta.write_meta_info(to_file)
|