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
|
#!/usr/bin/env python
"""\
Just some work for generating a changeset.
"""
import bzrlib
import os
from bzrlib.inventory import ROOT_ID
from bzrlib.errors import BzrCommandError, NotAncestor
from bzrlib.trace import warning, mutter
from collections import deque
from bzrlib.revision import (common_ancestor, MultipleRevisionSources,
get_intervening_revisions, NULL_REVISION)
from bzrlib.diff import internal_diff, compare_trees
class MetaInfoHeader(object):
"""Maintain all of the header information about this
changeset.
"""
def __init__(self,
base_branch, base_rev_id, base_tree,
target_branch, target_rev_id, target_tree,
delta,
starting_rev_id=None,
full_remove=False, full_rename=False,
message=None,
base_label = 'orig', target_label = 'mod'):
"""
:param full_remove: Include the full-text for a delete
:param full_rename: Include an add+delete patch for a rename
"""
self.base_branch = base_branch
self.base_rev_id = base_rev_id
self.base_tree = base_tree
if self.base_rev_id is not None:
self.base_revision = self.base_branch.get_revision(self.base_rev_id)
else:
self.base_revision = None
self.target_branch = target_branch
self.target_rev_id = target_rev_id
self.target_tree = target_tree
self.delta = delta
self.starting_rev_id = starting_rev_id
self.full_remove=full_remove
self.full_rename=full_rename
self.base_label = base_label
self.target_label = target_label
self.to_file = None
#self.revno = None
#self.parent_revno = None
# These are entries in the header.
# They will be repeated in the footer,
# only if they have changed
self.date = None
self.committer = None
self.message = message
self._get_revision_list()
def _get_revision_list(self):
"""This generates the list of all revisions from->to.
It fills out the internal self.revision_list with Revision
entries which should be in the changeset.
"""
# Performance, without locking here, a new lock is taken and
# broken for every revision (6k+ total locks for the bzr.dev tree)
self.target_branch.lock_read()
self.base_branch.lock_read()
try:
source = MultipleRevisionSources(self.target_branch, self.base_branch)
if self.starting_rev_id is None:
if self.base_rev_id is None:
self.starting_rev_id = NULL_REVISION
else:
self.starting_rev_id = common_ancestor(self.target_rev_id,
self.base_rev_id, source)
rev_id_list = get_intervening_revisions(self.starting_rev_id,
self.target_rev_id, source, self.target_branch.revision_history())
self.revision_list = [source.get_revision(rid) for rid in rev_id_list]
finally:
self.base_branch.unlock()
self.target_branch.unlock()
def _write(self, txt, key=None, encode=True, indent=1):
from common import encode as _encode
if encode:
def write(txt):
self.to_file.write(_encode(txt))
else:
def write(txt):
self.to_file.write(txt)
if indent > 0:
write('#' + (' ' * indent))
if key:
if txt:
write('%s: %s\n' % (key, txt))
else:
write('%s:\n' % key)
else:
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 common import format_highres_date, get_header
write = self._write
for line in get_header():
write(line)
# Print out the basic information about the 'target' revision
rev = self.revision_list[-1]
write(rev.committer, key='committer')
self.committer = rev.committer
self.date = format_highres_date(rev.timestamp, offset=rev.timezone)
write(self.date, key='date')
if self.message is None:
if rev.message is not None:
self.message = rev.message
if self.message:
write('', key='message')
for line in self.message.split('\n'):
write(txt=line, indent=4)
write('') # line with just '#'
write('', indent=0) # Empty line
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
# What should we print out for an Empty base revision?
if len(self.revision_list[0].parent_ids) == 0:
assumed_base = None
else:
assumed_base = self.revision_list[0].parent_ids[0]
if (self.base_revision is not None
and self.base_revision.revision_id != assumed_base):
base = self.base_revision.revision_id
write(base, key='base')
write(self.base_branch.get_revision_sha1(base), key='base sha1')
self._write_revisions()
def _write_revisions(self):
"""Not used. Used for writing multiple revisions."""
from common import format_highres_date, encode
write = self._write
for rev in self.revision_list:
rev_id = rev.revision_id
write(rev_id, key='revision')
write(self.target_branch.get_revision_sha1(rev_id),
key = 'sha1', indent=4)
if rev.committer != self.committer:
write(rev.committer, key='committer', indent=4)
date = format_highres_date(rev.timestamp, rev.timezone)
if date != self.date:
write(date, key='date', indent=4)
write(rev.inventory_sha1, key='inventory sha1', indent=4)
if len(rev.parent_ids) > 0:
write(txt='', key='parents', indent=4)
for p_id in rev.parent_ids:
p_sha1 = self.target_branch.get_revision_sha1(p_id)
if p_sha1 is not None:
write(p_id + '\t' + p_sha1, indent=7)
else:
warning('Rev id {%s} parent {%s} missing sha hash.'
% (rev_id, p_id))
write(p_id, indent=7)
if rev.message and rev.message != self.message:
write('', key='message', indent=4)
for line in rev.message.split('\n'):
write(line, indent=7)
def _write_diffs(self):
"""Write out the specific diffs"""
def pjoin(*args):
# Only forward slashes in changesets
return os.path.join(*args).replace('\\', '/')
def _maybe_diff(old_label, old_path, old_tree, file_id,
new_label, new_path, new_tree, text_modified,
kind, to_file, diff_file):
if text_modified:
new_entry = new_tree.inventory[file_id]
old_tree.inventory[file_id].diff(diff_file,
pjoin(old_label, old_path), old_tree,
pjoin(new_label, new_path), new_entry,
new_tree, to_file)
DEVNULL = '/dev/null'
diff_file = internal_diff
# Get the target tree so that we can check for
# Appropriate text ids.
rev_id = self.target_rev_id
new_label = self.target_label
new_tree = self.target_tree
old_tree = self.base_tree
old_label = self.base_label
write = self._write
to_file = self.to_file
def get_rev_id_str(file_id, kind):
last_changed_rev_id = new_tree.inventory[file_id].revision
if rev_id != last_changed_rev_id:
return ' // last-changed:' + last_changed_rev_id
else:
return ''
for path, file_id, kind in self.delta.removed:
write('=== removed %s %s' % (kind, path), indent=0)
if self.full_remove:
old_tree.inventory[file_id].diff(diff_file, pjoin(old_label, path), old_tree,
DEVNULL, None, None, to_file)
for path, file_id, kind in self.delta.added:
write('=== added %s %s // file-id:%s%s' % (kind,
path, file_id, get_rev_id_str(file_id, kind)),
indent=0)
new_tree.inventory[file_id].diff(diff_file, pjoin(new_label, path), new_tree,
DEVNULL, None, None, to_file,
reverse=True)
for (old_path, new_path, file_id, kind,
text_modified, meta_modified) in self.delta.renamed:
# TODO: Handle meta_modified
#prop_str = get_prop_change(meta_modified)
write('=== renamed %s %s // %s%s' % (kind,
old_path, new_path,
get_rev_id_str(file_id, kind)),
indent=0)
if self.full_rename:
# Looks like a delete + add
old_tree.inventory[file_id].diff(diff_file, pjoin(old_label, path), old_tree,
DEVNULL, None, None, to_file)
new_tree.inventory[file_id].diff(diff_file, pjoin(new_label, path), new_tree,
DEVNULL, None, None, to_file,
reverse=True)
else:
_maybe_diff(old_label, old_path, old_tree, file_id,
new_label, new_path, new_tree,
text_modified, kind, to_file, diff_file)
for (path, file_id, kind,
text_modified, meta_modified) in self.delta.modified:
# TODO: Handle meta_modified
#prop_str = get_prop_change(meta_modified)
write('=== modified %s %s%s' % (kind,
path, get_rev_id_str(file_id, kind)),
indent=0)
_maybe_diff(old_label, path, old_tree, file_id,
new_label, path, new_tree,
text_modified, kind, to_file, diff_file)
def show_changeset(base_branch, base_rev_id,
target_branch, target_rev_id,
starting_rev_id = None,
to_file=None, include_full_diff=False,
message=None):
if to_file is None:
import sys
to_file = sys.stdout
base_tree = base_branch.revision_tree(base_rev_id)
target_tree = target_branch.revision_tree(target_rev_id)
delta = compare_trees(base_tree, target_tree, want_unchanged=False)
meta = MetaInfoHeader(base_branch, base_rev_id, base_tree,
target_branch, target_rev_id, target_tree,
delta,
starting_rev_id=starting_rev_id,
full_rename=include_full_diff, full_remove=include_full_diff,
message=message)
meta.write_meta_info(to_file)
|