3
from patches import parse_patches
4
from datetime import datetime
5
from errors import CommandError, PatchFailed, PatchInvokeError
6
from hunk_selector import ShelveHunkSelector, UnshelveHunkSelector
7
from patchsource import PatchSource, FilePatchSource
8
from bzrlib.osutils import rename
9
from bzrlib.commands import Command
10
from bzrlib.branch import Branch
11
from bzrlib import DEFAULT_IGNORE
12
from hunk_selector import HunkSelector
13
from diffstat import DiffStat
14
from subprocess import Popen, PIPE
16
DEFAULT_IGNORE.append('./.bzr-shelf*')
18
class QuitException(Exception):
10
21
class Shelf(object):
11
MESSAGE_PREFIX = "# Shelved patch: "
15
'shelves' : '.shelf/shelves',
16
'current-shelf' : '.shelf/current-shelf',
19
def __init__(self, base, name=None):
24
current = os.path.join(self.base, self._paths['current-shelf'])
25
name = open(current).read().strip()
27
assert '\n' not in name
30
self.dir = os.path.join(self.base, self._paths['shelves'], name)
31
if not os.path.isdir(self.dir):
35
# Create required directories etc.
36
for dir in [self._paths['base'], self._paths['shelves']]:
37
dir = os.path.join(self.base, dir)
38
if not os.path.isdir(dir):
41
current = os.path.join(self.base, self._paths['current-shelf'])
42
if not os.path.exists(current):
43
f = open(current, 'w')
47
def make_default(self):
48
f = open(os.path.join(self.base, self._paths['current-shelf']), 'w')
51
self.log("Default shelf is now '%s'\n" % self.name)
56
def delete(self, patch):
57
path = self.__path_from_user(patch)
58
rename(path, '%s~' % path)
60
def display(self, patch=None):
62
path = self.last_patch()
64
path = self.__path_from_user(patch)
65
sys.stdout.write(open(path).read())
68
indexes = self.__list()
69
self.log("Patches on shelf '%s':" % self.name)
75
msg = self.get_patch_message(self.__path(index))
77
msg = "No message saved with patch."
78
self.log(' %.2d: %s\n' % (index, msg))
80
def __path_from_user(self, patch_id):
82
patch_index = int(patch_id)
83
except (TypeError, ValueError):
84
raise CommandError("Invalid patch name '%s'" % patch_id)
86
path = self.__path(patch_index)
88
if not os.path.exists(path):
89
raise CommandError("Patch '%s' doesn't exist on shelf %s!" % \
90
(patch_id, self.name))
94
def __path(self, index):
95
return os.path.join(self.dir, '%.2d' % index)
98
indexes = self.__list()
100
if len(indexes) == 0:
103
next = indexes[-1] + 1
104
return self.__path(next)
107
patches = os.listdir(self.dir)
111
continue # ignore backup files
113
indexes.append(int(f))
115
self.log("Warning: Ignoring junk file '%s' on shelf.\n" % f)
120
def last_patch(self):
121
indexes = self.__list()
123
if len(indexes) == 0:
126
return self.__path(indexes[-1])
128
def get_patch_message(self, patch_path):
129
patch = open(patch_path, 'r').read()
131
if not patch.startswith(self.MESSAGE_PREFIX):
133
return patch[len(self.MESSAGE_PREFIX):patch.index('\n')]
135
def unshelve(self, patch_source, patch_name=None, all=False, force=False,
137
self._check_upgrade()
139
if no_color is False:
143
if patch_name is None:
144
patch_path = self.last_patch()
146
patch_path = self.__path_from_user(patch_name)
148
if patch_path is None:
149
raise CommandError("No patch found on shelf %s" % self.name)
151
patches = FilePatchSource(patch_path).readpatches()
153
to_unshelve = patches
156
hs = UnshelveHunkSelector(patches, color)
157
to_unshelve, to_remain = hs.select()
159
if len(to_unshelve) == 0:
160
raise CommandError('Nothing to unshelve')
162
message = self.get_patch_message(patch_path)
164
message = "No message saved with patch."
165
self.log('Unshelving from %s/%s: "%s"\n' % \
166
(self.name, os.path.basename(patch_path), message))
169
self._run_patch(to_unshelve, dry_run=True)
170
self._run_patch(to_unshelve)
173
self._run_patch(to_unshelve, strip=1, dry_run=True)
174
self._run_patch(to_unshelve, strip=1)
177
self.log('Warning: Unshelving failed, forcing as ' \
178
'requested. Shelf will not be modified.\n')
180
self._run_patch(to_unshelve)
184
raise CommandError("Your shelved patch no " \
185
"longer applies cleanly to the working tree!")
187
# Backup the shelved patch
188
rename(patch_path, '%s~' % patch_path)
190
if len(to_remain) > 0:
191
f = open(patch_path, 'w')
192
for patch in to_remain:
196
def shelve(self, patch_source, all=False, message=None, no_color=False):
197
self._check_upgrade()
198
if no_color is False:
203
patches = patch_source.readpatches()
208
to_shelve = ShelveHunkSelector(patches, color).select()[0]
210
if len(to_shelve) == 0:
211
raise CommandError('Nothing to shelve')
214
timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
215
message = "Changes shelved on %s" % timestamp
217
patch_path = self.next_patch()
218
self.log('Shelving to %s/%s: "%s"\n' % \
219
(self.name, os.path.basename(patch_path), message))
221
f = open(patch_path, 'a')
223
assert '\n' not in message
224
f.write("%s%s\n" % (self.MESSAGE_PREFIX, message))
226
for patch in to_shelve:
234
self._run_patch(to_shelve, reverse=True, dry_run=True)
235
self._run_patch(to_shelve, reverse=True)
238
self._run_patch(to_shelve, reverse=True, strip=1, dry_run=True)
239
self._run_patch(to_shelve, reverse=True, strip=1)
241
raise CommandError("Failed removing shelved changes from the"
244
def _run_patch(self, patches, strip=0, reverse=False, dry_run=False):
245
args = ['patch', '-d', self.base, '-s', '-p%d' % strip, '-f']
247
if sys.platform == "win32":
248
args.append('--binary')
253
args.append('--dry-run')
254
stdout = stderr = subprocess.PIPE
256
stdout = stderr = None
259
process = subprocess.Popen(args, stdin=subprocess.PIPE,
260
stdout=stdout, stderr=stderr)
261
for patch in patches:
262
process.stdin.write(str(patch))
265
raise PatchInvokeError(e, process.stderr.read())
267
process.communicate()
269
result = process.wait()
275
def _check_upgrade(self):
276
if len(self._list_old_shelves()) > 0:
277
raise CommandError("Old format shelves found, either upgrade " \
280
def _list_old_shelves(self):
282
stem = os.path.join(self.base, '.bzr-shelf')
284
patches = glob.glob(stem)
285
patches.extend(glob.glob(stem + '-*[!~]'))
287
if len(patches) == 0:
290
def patch_index(name):
22
def __init__(self, location):
23
self.branch = Branch.open_containing(location)[0]
25
def shelf_suffix(self, index):
35
yield self.shelf_suffix(i)
38
stem = os.path.join(self.branch.base, '.bzr-shelf')
39
for end in name_sequence():
41
if not os.path.exists(name):
45
stem = os.path.join(self.branch.base, '.bzr-shelf')
46
shelves = glob.glob(stem)
47
shelves.extend(glob.glob(stem + '-*'))
48
def shelf_index(name):
293
return int(name[len(stem) + 1:])
295
# patches might not be sorted in the right order
297
for patch in patches:
301
patch_ids.append(int(patch[len(stem) + 1:]))
310
patches.append('%s-%s' % (stem, id))
315
patches = self._list_old_shelves()
51
return int(name[len(stem)+1:])
52
shelvenums = [shelf_index(f) for f in shelves]
55
if len(shelvenums) == 0:
57
return stem + self.shelf_suffix(shelvenums[-1])
59
def get_shelf_message(self, shelf):
61
if not shelf.startswith(prefix):
63
return shelf[len(prefix):shelf.index('\n')]
66
shelf = self.last_shelf()
69
raise Exception("No shelf found in '%s'" % self.branch.base)
71
patch = open(shelf, 'r').read()
73
print >>sys.stderr, "Reapplying shelved patches",
74
message = self.get_shelf_message(patch)
75
if message is not None:
76
print >>sys.stderr, ' "%s"' % message
78
print >>sys.stderr, ""
79
run_patch(self.branch.base, (patch,))
82
diff_stat = DiffStat(self.get_patches(None, None))
83
print 'Diff status is now:\n', diff_stat
87
def get_patches(self, revision, file_list):
88
from StringIO import StringIO
89
from bzrlib.diff import show_diff
91
show_diff(self.branch, revision, specific_files=file_list, output=out)
93
return out.readlines()
95
def shelve(self, all_hunks=False, message=None, revision=None,
97
patches = parse_patches(self.get_patches(revision, file_list))
101
patches = HunkSelector(patches).select()
102
except QuitException:
317
105
if len(patches) == 0:
318
self.log('No old-style shelves found to upgrade.\n')
106
print >>sys.stderr, 'Nothing to shelve'
109
shelf = self.next_shelf()
110
print >>sys.stderr, "Saving shelved patches to", shelf
111
shelf = open(shelf, 'a')
112
if message is not None:
113
assert '\n' not in message
114
shelf.write("# shelf: %s\n" % message)
321
115
for patch in patches:
322
old_file = open(patch, 'r')
323
new_path = self.next_patch()
324
new_file = open(new_path, 'w')
325
new_file.write(old_file.read())
328
self.log('Copied %s to %s/%s\n' % (os.path.basename(patch),
329
self.name, os.path.basename(new_path)))
330
rename(patch, patch + '~')
116
shelf.write(str(patch))
119
os.fsync(shelf.fileno())
122
print >>sys.stderr, "Reverting shelved patches"
123
run_patch(self.branch.base, patches, reverse=True)
125
diff_stat = DiffStat(self.get_patches(None, None))
126
print 'Diff status is now:\n', diff_stat
130
def run_patch(branch_base, patches, reverse=False):
131
args = ['patch', '-d', branch_base, '-s', '-p1', '-f']
134
process = Popen(args, stdin=PIPE)
135
for patch in patches:
136
process.stdin.write(str(patch))
137
process.stdin.close()
138
result = process.wait()
139
if result not in (0, 1):
140
raise Exception("Error applying patches")
added
removed
shelf.py
