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
|
# -*- encoding: utf-8 -*-
from bzrlib import log
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
import bzrlib
from bzrlib import (
debug,
osutils,
)
""")
from writer import _escape_cdata
class XMLLogFormatter(log.LogFormatter):
""" add a --xml format to 'bzr log'"""
supports_merge_revisions = True
supports_delta = True
supports_tags = True
def __init__(self, *args, **kwargs):
super(XMLLogFormatter, self).__init__(*args, **kwargs)
self.log_count = 0
self.start_with_merge = False
self.nested_merge_count = 0
self.previous_merge_depth = 0
self.debug_enabled = 'debug' in debug.debug_flags
self.open_logs = 0
self.open_merges = 0
self.stack = []
def show(self, revno, rev, delta, tags=None):
lr = log.LogRevision(rev, revno, 0, delta, tags)
return self.log_revision(lr)
def show_merge_revno(self, rev, merge_depth, revno):
"""a call to self._show_helper, XML don't care about formatting """
lr = log.LogRevision(rev, merge_depth=merge_depth, revno=revno)
return self.log_revision(lr)
def log_revision(self, revision):
"""Log a revision, either merged or not."""
to_file = self.to_file
if self.debug_enabled:
self.__debug(revision)
actions = []
# to handle merge revision as childs
if revision.merge_depth > 0 and not self.start_with_merge:
if self.previous_merge_depth < revision.merge_depth:
if self.log_count > 0:
merge_depth_diference = revision.merge_depth - \
self.previous_merge_depth
for m in range(merge_depth_diference):
actions.append(self.__open_merge)
if merge_depth_diference > 1:
self.nested_merge_count += 1
elif self.log_count == 0:
# first log is inside a merge, we show it as a top level
# we could support a merge tag without parent log.
self.start_with_merge = True
elif self.previous_merge_depth > revision.merge_depth:
# TODO: testcase for more than one level of nested merges
actions.append({self.__close_merge:self.previous_merge_depth - \
revision.merge_depth})
if self.nested_merge_count > 0:
self.nested_merge_count -= 1
else:
actions.append(self.__close_log)
else:
if self.open_logs > 0:
actions.append(self.__close_log)
elif self.previous_merge_depth < revision.merge_depth:
actions.append({self.__close_merge:self.previous_merge_depth - \
revision.merge_depth})
if self.nested_merge_count > 0:
self.nested_merge_count -= 1
else:
actions.append(self.__close_log)
elif self.open_merges > 0:
actions.append({self.__close_merge:self.open_merges})
#actions.append(self.__close_merge)
actions.append(self.__close_log)
else:
actions.append(self.__close_log)
if self.start_with_merge:
# we only care about the first log, the following logs are
# handlend in the logic of nested merges
self.start_with_merge = False
for action in actions:
if type(action) == dict:
action.keys()[0](action[action.keys()[0]])
else:
action()
self.__open_log()
self.__log_revision(revision)
self.log_count = self.log_count + 1
self.previous_merge_depth = revision.merge_depth
def __open_merge(self):
self.to_file.write('<merge>')
self.open_merges += 1
self.stack.append('merge')
def __close_merge(self, num=1):
for item in self.stack.__reversed__():
self.to_file.write('</%s>' % item)
self.stack.pop()
if item == 'merge':
self.open_merges -= 1
num -= 1
if num == 0:
return
if item == 'log':
self.open_logs -= 1
def __open_log(self):
self.to_file.write('<log>',)
self.open_logs = self.open_logs + 1
self.stack.append('log')
def __close_log(self):
for item in self.stack.__reversed__():
self.to_file.write('</%s>' % item)
self.stack.pop()
if item == 'log':
self.open_logs -= 1
return
if item == 'merge':
self.open_merges -= 1
def __log_revision(self, revision):
if revision.revno is not None:
self.to_file.write('<revno>%s</revno>' % revision.revno)
if revision.tags:
self.to_file.write('<tags>')
for tag in revision.tags:
self.to_file.write('<tag>%s</tag>' % tag)
self.to_file.write('</tags>')
if self.show_ids:
self.to_file.write('<revisionid>%s</revisionid>' %
revision.rev.revision_id)
if len(revision.rev.parent_ids) > 0:
self.to_file.write('<parents>')
for parent_id in revision.rev.parent_ids:
self.to_file.write('<parent>%s</parent>' % parent_id)
if len(revision.rev.parent_ids) > 0:
self.to_file.write('</parents>')
self.to_file.write('<committer>%s</committer>' % \
_escape_cdata(revision.rev.committer))
try:
self.to_file.write('<branch-nick>%s</branch-nick>' % \
_escape_cdata(revision.rev.properties['branch-nick']))
except KeyError:
pass
date_str = osutils.format_date(revision.rev.timestamp,
revision.rev.timezone or 0,
self.show_timezone)
self.to_file.write('<timestamp>%s</timestamp>' % date_str)
self.to_file.write('<message><![CDATA[')
if not revision.rev.message:
self.to_file.write('(no message)')
else:
self.to_file.write(_format_message(revision.rev.message))
self.to_file.write(']]></message>')
if revision.delta is not None:
from statusxml import show_tree_xml
self.to_file.write('<affected-files>')
show_tree_xml(revision.delta, self.to_file, self.show_ids)
self.to_file.write('</affected-files>')
def begin_log(self):
self.to_file.write('<?xml version="1.0" encoding="%s"?>' % \
osutils.get_user_encoding())
self.to_file.write('<logs>')
def end_log(self):
#if the last logged was inside a merge (and it was only one log)
if self.open_logs > 1 and self.open_merges > 0:
self.to_file.write('</log>')
self.open_logs = self.open_logs - 1
if not self.start_with_merge:
# In case that the last log was inside a merge we need to close it
if self.open_merges > 0:
for merge in range(self.open_merges):
self.to_file.write('</merge>')
if self.open_logs > 0:
self.to_file.write('</log>')
self.open_logs -= 1
self.open_merges = self.open_merges - 1
# to close the last opened log
if self.open_logs > 0:
self.to_file.write('</log>')
self.open_logs = self.open_logs - 1
else:
if self.open_logs > 0:
self.to_file.write('</log>')
self.open_logs = self.open_logs - 1
self.to_file.write('</logs>')
class XMLLineLogFormatter(log.LineLogFormatter):
def __init__(self, *args, **kwargs):
super(XMLLineLogFormatter, self).__init__(*args, **kwargs)
def log_string(self, revno, rev, max_chars=50):
"""Format log info into one string style. Don't truncate the string
like LineLogFormatter because we are writting xml, and don't make sense
to truncate the string.
:param revno: revision number (int) or None.
Revision numbers counts from 1.
:param rev: revision info object
:return: formatted truncated string
"""
out = []
out.append('<log>')
if revno:
# show revno only when is not None
out.append("<revno>%s</revno>" % revno)
elif rev.revision_id:
out.append("<revisionid>%s</revisionid>" % rev.revision_id)
out.append('<committer>%s</committer>' %
_escape_cdata(rev.committer))
date_str = osutils.format_date(rev.timestamp,
rev.timezone or 0,
show_offset=True)
out.append('<timestamp>%s</timestamp>' % date_str)
out.append('<message><![CDATA[%s]]></message>' % \
_format_message(rev.message))
out.append('</log>')
return " ".join(out).rstrip('\n')
def line_log(rev):
lf = XMLLineLogFormatter(None)
return lf.log_string(None, rev)
def _format_message(rev_message):
return rev_message.rstrip('\n')
|
