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
|
# (C) 2005 Canonical Development Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Serializer factory for reading and writing changesets.
"""
import os
from sha import sha
from bzrlib.changeset.serializer import (ChangesetSerializer,
CHANGESET_HEADER,
format_highres_date, unpack_highres_date)
from bzrlib.changeset.common import testament_sha1
from bzrlib.delta import compare_trees
from bzrlib.diff import internal_diff
import bzrlib.errors as errors
from bzrlib.osutils import pathjoin
from bzrlib.revision import NULL_REVISION
from bzrlib.rio import RioWriter, read_stanzas
bool_text = {True: 'yes', False: 'no'}
class ChangesetSerializerV07(ChangesetSerializer):
def read(self, f):
"""Read the rest of the changesets from the supplied file.
:param f: The file to read from
:return: A list of changesets
"""
assert self.version == '0.7'
# The first line of the header should have been read
raise NotImplementedError
def write(self, source, revision_ids, forced_bases, f):
"""Write the changesets to the supplied files.
:param source: A source for revision information
:param revision_ids: The list of revision ids to serialize
:param forced_bases: A dict of revision -> base that overrides default
:param f: The file to output to
"""
self.source = source
self.revision_ids = revision_ids
self.forced_bases = forced_bases
self.to_file = f
source.lock_read()
try:
self._write_main_header()
self._write_revisions()
finally:
source.unlock()
def _write_main_header(self):
"""Write the header for the changes"""
f = self.to_file
f.write(CHANGESET_HEADER)
f.write('0.7\n')
f.write('#\n')
def _write(self, key, value, indent=1):
"""Write out meta information, with proper indenting, etc"""
assert indent > 0, 'indentation must be greater than 0'
f = self.to_file
f.write('#' + (' ' * indent))
f.write(key.encode('utf-8'))
if not value:
f.write(':\n')
elif isinstance(value, basestring):
f.write(': ')
f.write(value.encode('utf-8'))
f.write('\n')
else:
f.write(':\n')
for entry in value:
f.write('#' + (' ' * (indent+2)))
f.write(entry.encode('utf-8'))
f.write('\n')
def _write_revisions(self):
"""Write the information for all of the revisions."""
# The next version of changesets will write a rollup
# at the top, and back-patches, or something else after that.
# For now, we just write the patches in order.
# Optimize for the case of revisions in order
last_rev_id = None
last_rev = None
last_rev_tree = None
for rev_id in self.revision_ids:
rev = self.source.get_revision(rev_id)
rev_tree = self.source.revision_tree(rev_id)
if rev_id in self.forced_bases:
explicit_base = True
base_id = self.forced_bases[rev_id]
if base_id is None:
base_id = NULL_REVISION
else:
explicit_base = False
if rev.parent_ids:
base_id = rev.parent_ids[-1]
else:
base_id = NULL_REVISION
if base_id == last_rev_id:
base_tree = last_rev_tree
else:
base_tree = self.source.revision_tree(base_id)
self._write_revision(rev, rev_tree, base_id, base_tree,
explicit_base)
last_rev_id = rev_id
last_rev = rev
last_rev_tree = rev_tree
def _write_revision(self, rev, rev_tree, base_rev, base_tree,
explicit_base):
"""Write out the information for a revision."""
def w(key, value):
self._write(key, value, indent=1)
w('message', rev.message.split('\n'))
w('committer', rev.committer)
w('date', format_highres_date(rev.timestamp, rev.timezone))
self.to_file.write('\n')
self._write_delta(rev_tree, base_tree, rev.revision_id)
w('revision id', rev.revision_id)
w('sha1', testament_sha1(self.source, rev.revision_id))
w('inventory sha1', rev.inventory_sha1)
if rev.parent_ids:
w('parent ids', rev.parent_ids)
if explicit_base:
w('base id', base_rev)
if rev.properties:
self._write('properties', None, indent=1)
for name, value in rev.properties.items():
self._write(name, value, indent=3)
# Add an extra blank space at the end
self.to_file.write('\n')
def _write_delta(self, new_tree, old_tree, default_revision_id):
"""Write out the changes between the trees."""
DEVNULL = '/dev/null'
old_label = ''
new_label = ''
def do_diff(old_path, file_id, new_path, kind):
new_entry = new_tree.inventory[file_id]
old_tree.inventory[file_id].diff(internal_diff,
pathjoin(old_label, old_path), old_tree,
pathjoin(new_label, new_path), new_entry, new_tree,
self.to_file)
def do_meta(file_id):
ie = new_tree.inventory[file_id]
w(' // executable:%s' % bool_text[ie.executable])
def do_revision(file_id):
ie = new_tree.inventory[file_id]
if ie.revision != default_revision_id:
w(' // last-changed:%s' % ie.revision)
delta = compare_trees(old_tree, new_tree, want_unchanged=False)
def w(text):
self.to_file.write(text.encode('utf-8'))
for path, file_id, kind in delta.removed:
w('=== removed %s %s\n' % (kind, path))
for path, file_id, kind in delta.added:
w('=== added %s %s // file-id:%s' % (kind, path, file_id))
do_revision(file_id)
if kind == 'file':
do_meta(file_id)
w('\n')
new_tree.inventory[file_id].diff(internal_diff,
pathjoin(new_label, path), new_tree,
DEVNULL, None, None,
self.to_file, reverse=True)
for (old_path, new_path, file_id, kind,
text_modified, meta_modified) in delta.renamed:
w('=== renamed %s %s // %s' % (kind, old_path, new_path))
do_revision(file_id)
if meta_modified:
do_meta(file_id)
w('\n')
if text_modified:
do_diff(old_path, file_id, new_path, text_modified)
for (path, file_id, kind,
text_modified, meta_modified) in delta.modified:
# TODO: Handle meta_modified
#prop_str = get_prop_change(meta_modified)
w('=== modified %s %s' % (kind, path))
do_revision(file_id)
if meta_modified:
do_meta(file_id)
w('\n')
if text_modified:
do_diff(path, file_id, path, kind)
|