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
|
# Copyright (C) 2008 Aaron Bentley <aaron@aaronbentley.com>
#
# 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
from cStringIO import StringIO
from bzrlib import errors, merge, merge3, pack, transform, ui
from bzrlib.plugins.shelf2 import serialize_transform
class ShelfCreator(object):
def __init__(self, work_tree, target_tree):
self.work_tree = work_tree
self.work_transform = transform.TreeTransform(work_tree)
self.target_tree = target_tree
self.shelf_transform = transform.TransformPreview(self.target_tree)
self.renames = {}
self.creation = {}
self.deletion = {}
self.iter_changes = work_tree.iter_changes(self.target_tree)
def __iter__(self):
for (file_id, paths, changed, versioned, parents, names, kind,
executable) in self.iter_changes:
if kind[0] is None or versioned[0] == False:
self.creation[file_id] = (kind[1], names[1], parents[1])
yield ('add file', file_id, kind[1])
elif kind[1] is None or versioned[0] == False:
self.deletion[file_id] = (kind[0], names[0], parents[0])
yield ('delete file', file_id)
else:
if names[0] != names[1] or parents[0] != parents[1]:
self.renames[file_id] = (names, parents)
yield ('rename', file_id) + paths
if changed:
yield ('modify text', file_id)
def shelve_rename(self, file_id):
names, parents = self.renames[file_id]
w_trans_id = self.work_transform.trans_id_file_id(file_id)
work_parent = self.work_transform.trans_id_file_id(parents[0])
self.work_transform.adjust_path(names[0], work_parent, w_trans_id)
s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
shelf_parent = self.shelf_transform.trans_id_file_id(parents[1])
self.shelf_transform.adjust_path(names[1], shelf_parent, s_trans_id)
def shelve_text(self, file_id, new_text):
s = StringIO()
s.writelines(new_text)
s.seek(0)
new_lines = s.readlines()
w_trans_id = self.work_transform.trans_id_file_id(file_id)
self.work_transform.delete_contents(w_trans_id)
self.work_transform.create_file(new_lines, w_trans_id)
s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
self.shelf_transform.delete_contents(s_trans_id)
inverse_lines = self._inverse_lines(new_lines, file_id)
self.shelf_transform.create_file(inverse_lines, s_trans_id)
def shelve_creation(self, file_id):
kind, name, parent = self.creation[file_id]
self._shelve_creation(self.work_tree, file_id, self.work_transform,
self.shelf_transform, kind, name, parent)
def shelve_deletion(self, file_id):
kind, name, parent = self.deletion[file_id]
self._shelve_creation(self.target_tree, file_id, self.shelf_transform,
self.work_transform, kind, name, parent)
def _shelve_creation(self, tree, file_id, from_transform, to_transform,
kind, name, parent):
w_trans_id = from_transform.trans_id_file_id(file_id)
if parent is not None:
from_transform.delete_contents(w_trans_id)
from_transform.unversion_file(w_trans_id)
s_trans_id = to_transform.trans_id_file_id(file_id)
if parent is not None:
s_parent_id = to_transform.trans_id_file_id(parent)
self.shelf_transform.adjust_path(name, s_parent_id, s_trans_id)
if kind == 'file':
lines = self.read_tree_lines(tree, file_id)
to_transform.create_file(lines, s_trans_id)
if kind == 'directory':
to_transform.create_directory(s_trans_id)
if kind == 'symlink':
target = self.work_tree.get_symlink_target(file_id)
to_transform.create_symlink(target, s_trans_id)
self.shelf_transform.version_file(file_id, s_trans_id)
def read_tree_lines(self, tree, file_id):
tree_file = tree.get_file(file_id)
try:
return tree_file.readlines()
finally:
tree_file.close()
def _inverse_lines(self, new_lines, file_id):
"""Produce a version with only those changes removed from new_lines."""
target_lines = self.target_tree.get_file_lines(file_id)
work_lines = self.read_tree_lines(self.work_tree, file_id)
return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
def finalize(self):
self.work_transform.finalize()
self.shelf_transform.finalize()
def transform(self):
self.work_transform.apply()
def make_shelf_filename(self):
transport = self.work_tree.bzrdir.root_transport.clone('.shelf2')
transport.ensure_base()
return transport.local_abspath('01')
def write_shelf(self, shelf_file):
transform.resolve_conflicts(self.shelf_transform)
serializer = pack.ContainerSerialiser()
shelf_file.write(serializer.begin())
shelf_file.write(serializer.bytes_record(
self.target_tree.get_revision_id(), (('revision-id',),)))
for bytes in serialize_transform.serialize(
self.shelf_transform, serializer):
shelf_file.write(bytes)
shelf_file.write(serializer.end())
class Unshelver(object):
def __init__(self, tree, base_tree, transform):
self.tree = tree
self.base_tree = base_tree
self.transform = transform
@classmethod
def from_tree_and_shelf(klass, tree, shelf_file):
parser = pack.ContainerPushParser()
parser.accept_bytes(shelf_file.read())
tt = transform.TransformPreview(tree)
records = iter(parser.read_pending_records())
names, base_revision_id = records.next()
serialize_transform.deserialize(tt, records)
try:
base_tree = tree.revision_tree(base_revision_id)
except errors.NoSuchRevisionInTree:
base_tree = tree.branch.repository.revision_tree(base_revision_id)
return klass(tree, base_tree, tt)
def unshelve(self):
pb = ui.ui_factory.nested_progress_bar()
try:
target_tree = self.transform.get_preview_tree()
merger = merge.Merger.from_uncommitted(self.tree, target_tree, pb,
self.base_tree)
merger.merge_type = merge.Merge3Merger
merger.do_merge()
finally:
pb.finished()
def finalize(self):
self.transform.finalize()
class ShelfManager(object):
def __init__(self, transport):
self.transport = transport.clone('.shelf2')
self.transport.ensure_base()
@classmethod
def for_tree(klass, tree):
return klass(tree.bzrdir.root_transport)
def new_shelf(self):
last_shelf = self.last_shelf()
if last_shelf is None:
next_shelf = 1
else:
next_shelf = last_shelf + 1
shelf_file = open(self.transport.local_abspath(str(next_shelf)), 'wb')
return next_shelf, shelf_file
def read_shelf(self, shelf_id):
return open(self.transport.local_abspath(str(shelf_id)), 'rb')
def delete_shelf(self, shelf_id):
self.transport.delete(str(shelf_id))
def active_shelves(self):
return [int(f) for f in self.transport.list_dir('.')]
def last_shelf(self):
active = self.active_shelves()
if len(active) > 0:
return max(active)
else:
return None
|