1
# Copyright (C) 2008 Aaron Bentley <aaron@aaronbentley.com>
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
25
from bzrlib.plugins.shelf2 import serialize_transform
28
class ShelfCreator(object):
30
def __init__(self, work_tree, target_tree, file_list=None):
31
self.work_tree = work_tree
32
self.work_transform = transform.TreeTransform(work_tree)
33
self.target_tree = target_tree
34
self.shelf_transform = transform.TransformPreview(self.target_tree)
38
self.iter_changes = work_tree.iter_changes(self.target_tree,
39
specific_files=file_list)
42
for (file_id, paths, changed, versioned, parents, names, kind,
43
executable) in self.iter_changes:
44
if kind[0] is None or versioned[0] == False:
45
self.creation[file_id] = (kind[1], names[1], parents[1],
47
yield ('add file', file_id, kind[1], paths[1])
48
elif kind[1] is None or versioned[0] == False:
49
self.deletion[file_id] = (kind[0], names[0], parents[0],
51
yield ('delete file', file_id, kind[0], paths[0])
53
if names[0] != names[1] or parents[0] != parents[1]:
54
self.renames[file_id] = (names, parents)
55
yield ('rename', file_id) + paths
57
if kind[0] != kind [1]:
58
yield ('change kind', file_id, kind[0], kind[1], paths[0])
60
yield ('modify text', file_id)
62
def shelve_rename(self, file_id):
63
names, parents = self.renames[file_id]
64
w_trans_id = self.work_transform.trans_id_file_id(file_id)
65
work_parent = self.work_transform.trans_id_file_id(parents[0])
66
self.work_transform.adjust_path(names[0], work_parent, w_trans_id)
68
s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
69
shelf_parent = self.shelf_transform.trans_id_file_id(parents[1])
70
self.shelf_transform.adjust_path(names[1], shelf_parent, s_trans_id)
72
def shelve_lines(self, file_id, new_lines):
73
w_trans_id = self.work_transform.trans_id_file_id(file_id)
74
self.work_transform.delete_contents(w_trans_id)
75
self.work_transform.create_file(new_lines, w_trans_id)
77
s_trans_id = self.shelf_transform.trans_id_file_id(file_id)
78
self.shelf_transform.delete_contents(s_trans_id)
79
inverse_lines = self._inverse_lines(new_lines, file_id)
80
self.shelf_transform.create_file(inverse_lines, s_trans_id)
83
def _content_from_tree(tt, tree, file_id):
84
trans_id = tt.trans_id_file_id(file_id)
85
tt.delete_contents(trans_id)
86
transform.create_from_tree(tt, trans_id, tree, file_id)
88
def shelve_content_change(self, file_id):
89
self._content_from_tree(self.work_transform, self.target_tree, file_id)
90
self._content_from_tree(self.shelf_transform, self.work_tree, file_id)
92
def shelve_creation(self, file_id):
93
kind, name, parent, versioned = self.creation[file_id]
94
version = not versioned[0]
95
self._shelve_creation(self.work_tree, file_id, self.work_transform,
96
self.shelf_transform, kind, name, parent,
99
def shelve_deletion(self, file_id):
100
kind, name, parent, versioned = self.deletion[file_id]
101
existing_path = self.target_tree.id2path(file_id)
102
if not self.work_tree.has_filename(existing_path):
104
version = not versioned[1]
105
self._shelve_creation(self.target_tree, file_id, self.shelf_transform,
106
self.work_transform, kind, name, parent,
107
version, existing_path=existing_path)
109
def _shelve_creation(self, tree, file_id, from_transform, to_transform,
110
kind, name, parent, version, existing_path=None):
111
w_trans_id = from_transform.trans_id_file_id(file_id)
112
if parent is not None and kind is not None:
113
from_transform.delete_contents(w_trans_id)
114
from_transform.unversion_file(w_trans_id)
116
if existing_path is not None:
117
s_trans_id = to_transform.trans_id_tree_path(existing_path)
119
s_trans_id = to_transform.trans_id_file_id(file_id)
120
if parent is not None:
121
s_parent_id = to_transform.trans_id_file_id(parent)
122
to_transform.adjust_path(name, s_parent_id, s_trans_id)
123
if existing_path is None:
125
to_transform.create_file('', s_trans_id)
127
transform.create_from_tree(to_transform, s_trans_id,
130
to_transform.version_file(file_id, s_trans_id)
132
def read_tree_lines(self, tree, file_id):
133
return osutils.split_lines(tree.get_file_text(file_id))
135
def _inverse_lines(self, new_lines, file_id):
136
"""Produce a version with only those changes removed from new_lines."""
137
target_lines = self.target_tree.get_file_lines(file_id)
138
work_lines = self.read_tree_lines(self.work_tree, file_id)
139
return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
142
self.work_transform.finalize()
143
self.shelf_transform.finalize()
146
self.work_transform.apply()
148
def make_shelf_filename(self):
149
transport = self.work_tree.bzrdir.root_transport.clone('.shelf2')
150
transport.ensure_base()
151
return transport.local_abspath('01')
153
def write_shelf(self):
154
filename = self.make_shelf_filename()
155
shelf_file = open(filename, 'wb')
157
serializer = pack.ContainerSerialiser()
158
shelf_file.write(serializer.begin())
159
for bytes in serialize_transform.serialize(
160
self.shelf_transform, serializer):
161
shelf_file.write(bytes)
162
shelf_file.write(serializer.end())
added
removed
shelf.py
