Commit | Line | Data |
---|---|---|
41a6d859 CM |
1 | """Basic quilt-like functionality |
2 | """ | |
3 | ||
4 | __copyright__ = """ | |
5 | Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com> | |
6 | ||
7 | This program is free software; you can redistribute it and/or modify | |
8 | it under the terms of the GNU General Public License version 2 as | |
9 | published by the Free Software Foundation. | |
10 | ||
11 | This program is distributed in the hope that it will be useful, | |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 | GNU General Public License for more details. | |
15 | ||
16 | You should have received a copy of the GNU General Public License | |
17 | along with this program; if not, write to the Free Software | |
18 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
19 | """ | |
20 | ||
c1e4d7e0 | 21 | import sys, os, re |
ed60fdae | 22 | from email.Utils import formatdate |
41a6d859 | 23 | |
87c93eab | 24 | from stgit.exception import * |
41a6d859 | 25 | from stgit.utils import * |
5e888f30 | 26 | from stgit.out import * |
950b1095 | 27 | from stgit.run import * |
1f3bb017 | 28 | from stgit import git, basedir, templates |
41a6d859 | 29 | from stgit.config import config |
8fce9909 | 30 | from shutil import copyfile |
41a6d859 CM |
31 | |
32 | ||
33 | # stack exception class | |
87c93eab | 34 | class StackException(StgException): |
41a6d859 CM |
35 | pass |
36 | ||
6ad48e48 PBG |
37 | class FilterUntil: |
38 | def __init__(self): | |
39 | self.should_print = True | |
40 | def __call__(self, x, until_test, prefix): | |
41 | if until_test(x): | |
42 | self.should_print = False | |
43 | if self.should_print: | |
44 | return x[0:len(prefix)] != prefix | |
45 | return False | |
46 | ||
41a6d859 CM |
47 | # |
48 | # Functions | |
49 | # | |
50 | __comment_prefix = 'STG:' | |
6ad48e48 | 51 | __patch_prefix = 'STG_PATCH:' |
41a6d859 CM |
52 | |
53 | def __clean_comments(f): | |
54 | """Removes lines marked for status in a commit file | |
55 | """ | |
56 | f.seek(0) | |
57 | ||
58 | # remove status-prefixed lines | |
6ad48e48 PBG |
59 | lines = f.readlines() |
60 | ||
61 | patch_filter = FilterUntil() | |
62 | until_test = lambda t: t == (__patch_prefix + '\n') | |
63 | lines = [l for l in lines if patch_filter(l, until_test, __comment_prefix)] | |
64 | ||
41a6d859 CM |
65 | # remove empty lines at the end |
66 | while len(lines) != 0 and lines[-1] == '\n': | |
67 | del lines[-1] | |
68 | ||
69 | f.seek(0); f.truncate() | |
70 | f.writelines(lines) | |
71 | ||
ed60fdae CM |
72 | # TODO: move this out of the stgit.stack module, it is really for |
73 | # higher level commands to handle the user interaction | |
7cc615f3 | 74 | def edit_file(series, line, comment, show_patch = True): |
bd427e46 | 75 | fname = '.stgitmsg.txt' |
1f3bb017 | 76 | tmpl = templates.get_template('patchdescr.tmpl') |
41a6d859 CM |
77 | |
78 | f = file(fname, 'w+') | |
7cc615f3 CL |
79 | if line: |
80 | print >> f, line | |
1f3bb017 CM |
81 | elif tmpl: |
82 | print >> f, tmpl, | |
41a6d859 CM |
83 | else: |
84 | print >> f | |
85 | print >> f, __comment_prefix, comment | |
86 | print >> f, __comment_prefix, \ | |
87 | 'Lines prefixed with "%s" will be automatically removed.' \ | |
88 | % __comment_prefix | |
89 | print >> f, __comment_prefix, \ | |
90 | 'Trailing empty lines will be automatically removed.' | |
6ad48e48 PBG |
91 | |
92 | if show_patch: | |
93 | print >> f, __patch_prefix | |
94 | # series.get_patch(series.get_current()).get_top() | |
f1c5519a PR |
95 | diff_str = git.diff(rev1 = series.get_patch(series.get_current()).get_bottom()) |
96 | f.write(diff_str) | |
6ad48e48 PBG |
97 | |
98 | #Vim modeline must be near the end. | |
b83e37e0 | 99 | print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:' |
41a6d859 CM |
100 | f.close() |
101 | ||
83bb4e4c | 102 | call_editor(fname) |
41a6d859 CM |
103 | |
104 | f = file(fname, 'r+') | |
105 | ||
106 | __clean_comments(f) | |
107 | f.seek(0) | |
7cc615f3 | 108 | result = f.read() |
41a6d859 CM |
109 | |
110 | f.close() | |
111 | os.remove(fname) | |
112 | ||
7cc615f3 | 113 | return result |
41a6d859 CM |
114 | |
115 | # | |
116 | # Classes | |
117 | # | |
118 | ||
8fe7e9f0 YD |
119 | class StgitObject: |
120 | """An object with stgit-like properties stored as files in a directory | |
121 | """ | |
122 | def _set_dir(self, dir): | |
123 | self.__dir = dir | |
124 | def _dir(self): | |
125 | return self.__dir | |
126 | ||
127 | def create_empty_field(self, name): | |
128 | create_empty_file(os.path.join(self.__dir, name)) | |
129 | ||
130 | def _get_field(self, name, multiline = False): | |
131 | id_file = os.path.join(self.__dir, name) | |
132 | if os.path.isfile(id_file): | |
133 | line = read_string(id_file, multiline) | |
134 | if line == '': | |
135 | return None | |
136 | else: | |
137 | return line | |
138 | else: | |
139 | return None | |
140 | ||
141 | def _set_field(self, name, value, multiline = False): | |
142 | fname = os.path.join(self.__dir, name) | |
143 | if value and value != '': | |
144 | write_string(fname, value, multiline) | |
145 | elif os.path.isfile(fname): | |
146 | os.remove(fname) | |
147 | ||
148 | ||
149 | class Patch(StgitObject): | |
41a6d859 CM |
150 | """Basic patch implementation |
151 | """ | |
262d31dc KH |
152 | def __init_refs(self): |
153 | self.__top_ref = self.__refs_base + '/' + self.__name | |
154 | self.__log_ref = self.__top_ref + '.log' | |
155 | ||
156 | def __init__(self, name, series_dir, refs_base): | |
02ac3ad2 | 157 | self.__series_dir = series_dir |
41a6d859 | 158 | self.__name = name |
8fe7e9f0 | 159 | self._set_dir(os.path.join(self.__series_dir, self.__name)) |
262d31dc KH |
160 | self.__refs_base = refs_base |
161 | self.__init_refs() | |
41a6d859 CM |
162 | |
163 | def create(self): | |
8fe7e9f0 YD |
164 | os.mkdir(self._dir()) |
165 | self.create_empty_field('bottom') | |
166 | self.create_empty_field('top') | |
41a6d859 CM |
167 | |
168 | def delete(self): | |
8fe7e9f0 YD |
169 | for f in os.listdir(self._dir()): |
170 | os.remove(os.path.join(self._dir(), f)) | |
171 | os.rmdir(self._dir()) | |
262d31dc KH |
172 | git.delete_ref(self.__top_ref) |
173 | if git.ref_exists(self.__log_ref): | |
174 | git.delete_ref(self.__log_ref) | |
41a6d859 CM |
175 | |
176 | def get_name(self): | |
177 | return self.__name | |
178 | ||
e55b53e0 | 179 | def rename(self, newname): |
8fe7e9f0 | 180 | olddir = self._dir() |
262d31dc KH |
181 | old_top_ref = self.__top_ref |
182 | old_log_ref = self.__log_ref | |
e55b53e0 | 183 | self.__name = newname |
8fe7e9f0 | 184 | self._set_dir(os.path.join(self.__series_dir, self.__name)) |
262d31dc | 185 | self.__init_refs() |
e55b53e0 | 186 | |
262d31dc KH |
187 | git.rename_ref(old_top_ref, self.__top_ref) |
188 | if git.ref_exists(old_log_ref): | |
189 | git.rename_ref(old_log_ref, self.__log_ref) | |
8fe7e9f0 | 190 | os.rename(olddir, self._dir()) |
844a1640 CM |
191 | |
192 | def __update_top_ref(self, ref): | |
262d31dc | 193 | git.set_ref(self.__top_ref, ref) |
844a1640 | 194 | |
64354a2d | 195 | def __update_log_ref(self, ref): |
262d31dc | 196 | git.set_ref(self.__log_ref, ref) |
64354a2d | 197 | |
844a1640 CM |
198 | def update_top_ref(self): |
199 | top = self.get_top() | |
200 | if top: | |
201 | self.__update_top_ref(top) | |
e55b53e0 | 202 | |
54b09584 | 203 | def get_old_bottom(self): |
8fe7e9f0 | 204 | return self._get_field('bottom.old') |
54b09584 | 205 | |
41a6d859 | 206 | def get_bottom(self): |
8fe7e9f0 | 207 | return self._get_field('bottom') |
41a6d859 | 208 | |
7cc615f3 | 209 | def set_bottom(self, value, backup = False): |
41a6d859 | 210 | if backup: |
8fe7e9f0 YD |
211 | curr = self._get_field('bottom') |
212 | self._set_field('bottom.old', curr) | |
213 | self._set_field('bottom', value) | |
41a6d859 | 214 | |
54b09584 | 215 | def get_old_top(self): |
8fe7e9f0 | 216 | return self._get_field('top.old') |
54b09584 | 217 | |
41a6d859 | 218 | def get_top(self): |
8fe7e9f0 | 219 | return self._get_field('top') |
41a6d859 | 220 | |
7cc615f3 | 221 | def set_top(self, value, backup = False): |
41a6d859 | 222 | if backup: |
8fe7e9f0 YD |
223 | curr = self._get_field('top') |
224 | self._set_field('top.old', curr) | |
225 | self._set_field('top', value) | |
844a1640 | 226 | self.__update_top_ref(value) |
41a6d859 CM |
227 | |
228 | def restore_old_boundaries(self): | |
8fe7e9f0 YD |
229 | bottom = self._get_field('bottom.old') |
230 | top = self._get_field('top.old') | |
41a6d859 CM |
231 | |
232 | if top and bottom: | |
8fe7e9f0 YD |
233 | self._set_field('bottom', bottom) |
234 | self._set_field('top', top) | |
844a1640 | 235 | self.__update_top_ref(top) |
a5bbc44d | 236 | return True |
41a6d859 | 237 | else: |
a5bbc44d | 238 | return False |
41a6d859 CM |
239 | |
240 | def get_description(self): | |
8fe7e9f0 | 241 | return self._get_field('description', True) |
41a6d859 | 242 | |
7cc615f3 | 243 | def set_description(self, line): |
8fe7e9f0 | 244 | self._set_field('description', line, True) |
41a6d859 CM |
245 | |
246 | def get_authname(self): | |
8fe7e9f0 | 247 | return self._get_field('authname') |
41a6d859 | 248 | |
7cc615f3 | 249 | def set_authname(self, name): |
8fe7e9f0 | 250 | self._set_field('authname', name or git.author().name) |
41a6d859 CM |
251 | |
252 | def get_authemail(self): | |
8fe7e9f0 | 253 | return self._get_field('authemail') |
41a6d859 | 254 | |
9e3f506f | 255 | def set_authemail(self, email): |
8fe7e9f0 | 256 | self._set_field('authemail', email or git.author().email) |
41a6d859 CM |
257 | |
258 | def get_authdate(self): | |
ed60fdae CM |
259 | date = self._get_field('authdate') |
260 | if not date: | |
261 | return date | |
262 | ||
263 | if re.match('[0-9]+\s+[+-][0-9]+', date): | |
264 | # Unix time (seconds) + time zone | |
265 | secs_tz = date.split() | |
266 | date = formatdate(int(secs_tz[0]))[:-5] + secs_tz[1] | |
267 | ||
268 | return date | |
41a6d859 | 269 | |
4db741b1 | 270 | def set_authdate(self, date): |
8fe7e9f0 | 271 | self._set_field('authdate', date or git.author().date) |
41a6d859 CM |
272 | |
273 | def get_commname(self): | |
8fe7e9f0 | 274 | return self._get_field('commname') |
41a6d859 | 275 | |
7cc615f3 | 276 | def set_commname(self, name): |
8fe7e9f0 | 277 | self._set_field('commname', name or git.committer().name) |
41a6d859 CM |
278 | |
279 | def get_commemail(self): | |
8fe7e9f0 | 280 | return self._get_field('commemail') |
41a6d859 | 281 | |
9e3f506f | 282 | def set_commemail(self, email): |
8fe7e9f0 | 283 | self._set_field('commemail', email or git.committer().email) |
41a6d859 | 284 | |
64354a2d | 285 | def get_log(self): |
8fe7e9f0 | 286 | return self._get_field('log') |
64354a2d CM |
287 | |
288 | def set_log(self, value, backup = False): | |
8fe7e9f0 | 289 | self._set_field('log', value) |
64354a2d CM |
290 | self.__update_log_ref(value) |
291 | ||
598e9d3f KH |
292 | # The current StGIT metadata format version. |
293 | FORMAT_VERSION = 2 | |
294 | ||
47e24a74 | 295 | class PatchSet(StgitObject): |
dd1b8fcc YD |
296 | def __init__(self, name = None): |
297 | try: | |
298 | if name: | |
299 | self.set_name (name) | |
300 | else: | |
301 | self.set_name (git.get_head_file()) | |
302 | self.__base_dir = basedir.get() | |
303 | except git.GitException, ex: | |
304 | raise StackException, 'GIT tree not initialised: %s' % ex | |
305 | ||
306 | self._set_dir(os.path.join(self.__base_dir, 'patches', self.get_name())) | |
307 | ||
47e24a74 YD |
308 | def get_name(self): |
309 | return self.__name | |
310 | def set_name(self, name): | |
311 | self.__name = name | |
312 | ||
dd1b8fcc YD |
313 | def _basedir(self): |
314 | return self.__base_dir | |
315 | ||
47e24a74 YD |
316 | def get_head(self): |
317 | """Return the head of the branch | |
318 | """ | |
319 | crt = self.get_current_patch() | |
320 | if crt: | |
321 | return crt.get_top() | |
322 | else: | |
323 | return self.get_base() | |
324 | ||
325 | def get_protected(self): | |
326 | return os.path.isfile(os.path.join(self._dir(), 'protected')) | |
327 | ||
328 | def protect(self): | |
329 | protect_file = os.path.join(self._dir(), 'protected') | |
330 | if not os.path.isfile(protect_file): | |
331 | create_empty_file(protect_file) | |
332 | ||
333 | def unprotect(self): | |
334 | protect_file = os.path.join(self._dir(), 'protected') | |
335 | if os.path.isfile(protect_file): | |
336 | os.remove(protect_file) | |
337 | ||
338 | def __branch_descr(self): | |
339 | return 'branch.%s.description' % self.get_name() | |
340 | ||
341 | def get_description(self): | |
342 | return config.get(self.__branch_descr()) or '' | |
343 | ||
344 | def set_description(self, line): | |
345 | if line: | |
346 | config.set(self.__branch_descr(), line) | |
347 | else: | |
348 | config.unset(self.__branch_descr()) | |
349 | ||
350 | def head_top_equal(self): | |
351 | """Return true if the head and the top are the same | |
352 | """ | |
353 | crt = self.get_current_patch() | |
354 | if not crt: | |
355 | # we don't care, no patches applied | |
356 | return True | |
357 | return git.get_head() == crt.get_top() | |
358 | ||
359 | def is_initialised(self): | |
360 | """Checks if series is already initialised | |
361 | """ | |
9171769c | 362 | return bool(config.get(self.format_version_key())) |
47e24a74 YD |
363 | |
364 | ||
27827959 KH |
365 | def shortlog(patches): |
366 | log = ''.join(Run('git-log', '--pretty=short', | |
367 | p.get_top(), '^%s' % p.get_bottom()).raw_output() | |
368 | for p in patches) | |
369 | return Run('git-shortlog').raw_input(log).raw_output() | |
370 | ||
47e24a74 | 371 | class Series(PatchSet): |
41a6d859 CM |
372 | """Class including the operations on series |
373 | """ | |
374 | def __init__(self, name = None): | |
40e65b92 | 375 | """Takes a series name as the parameter. |
41a6d859 | 376 | """ |
dd1b8fcc | 377 | PatchSet.__init__(self, name) |
598e9d3f KH |
378 | |
379 | # Update the branch to the latest format version if it is | |
380 | # initialized, but don't touch it if it isn't. | |
9171769c | 381 | self.update_to_current_format_version() |
598e9d3f | 382 | |
262d31dc | 383 | self.__refs_base = 'refs/patches/%s' % self.get_name() |
02ac3ad2 | 384 | |
8fe7e9f0 YD |
385 | self.__applied_file = os.path.join(self._dir(), 'applied') |
386 | self.__unapplied_file = os.path.join(self._dir(), 'unapplied') | |
841c7b2a | 387 | self.__hidden_file = os.path.join(self._dir(), 'hidden') |
02ac3ad2 CL |
388 | |
389 | # where this series keeps its patches | |
8fe7e9f0 | 390 | self.__patch_dir = os.path.join(self._dir(), 'patches') |
844a1640 | 391 | |
ac50371b | 392 | # trash directory |
8fe7e9f0 | 393 | self.__trash_dir = os.path.join(self._dir(), 'trash') |
ac50371b | 394 | |
9171769c | 395 | def format_version_key(self): |
69ffa22e | 396 | return 'branch.%s.stgit.stackformatversion' % self.get_name() |
9171769c YD |
397 | |
398 | def update_to_current_format_version(self): | |
399 | """Update a potentially older StGIT directory structure to the | |
400 | latest version. Note: This function should depend as little as | |
401 | possible on external functions that may change during a format | |
402 | version bump, since it must remain able to process older formats.""" | |
403 | ||
dd1b8fcc | 404 | branch_dir = os.path.join(self._basedir(), 'patches', self.get_name()) |
9171769c YD |
405 | def get_format_version(): |
406 | """Return the integer format version number, or None if the | |
407 | branch doesn't have any StGIT metadata at all, of any version.""" | |
408 | fv = config.get(self.format_version_key()) | |
69ffa22e | 409 | ofv = config.get('branch.%s.stgitformatversion' % self.get_name()) |
9171769c YD |
410 | if fv: |
411 | # Great, there's an explicitly recorded format version | |
412 | # number, which means that the branch is initialized and | |
413 | # of that exact version. | |
414 | return int(fv) | |
69ffa22e YD |
415 | elif ofv: |
416 | # Old name for the version info, upgrade it | |
417 | config.set(self.format_version_key(), ofv) | |
418 | config.unset('branch.%s.stgitformatversion' % self.get_name()) | |
419 | return int(ofv) | |
9171769c YD |
420 | elif os.path.isdir(os.path.join(branch_dir, 'patches')): |
421 | # There's a .git/patches/<branch>/patches dirctory, which | |
422 | # means this is an initialized version 1 branch. | |
423 | return 1 | |
424 | elif os.path.isdir(branch_dir): | |
425 | # There's a .git/patches/<branch> directory, which means | |
426 | # this is an initialized version 0 branch. | |
427 | return 0 | |
428 | else: | |
429 | # The branch doesn't seem to be initialized at all. | |
430 | return None | |
431 | def set_format_version(v): | |
432 | out.info('Upgraded branch %s to format version %d' % (self.get_name(), v)) | |
433 | config.set(self.format_version_key(), '%d' % v) | |
434 | def mkdir(d): | |
435 | if not os.path.isdir(d): | |
436 | os.makedirs(d) | |
437 | def rm(f): | |
438 | if os.path.exists(f): | |
439 | os.remove(f) | |
262d31dc KH |
440 | def rm_ref(ref): |
441 | if git.ref_exists(ref): | |
442 | git.delete_ref(ref) | |
9171769c YD |
443 | |
444 | # Update 0 -> 1. | |
445 | if get_format_version() == 0: | |
446 | mkdir(os.path.join(branch_dir, 'trash')) | |
447 | patch_dir = os.path.join(branch_dir, 'patches') | |
448 | mkdir(patch_dir) | |
262d31dc | 449 | refs_base = 'refs/patches/%s' % self.get_name() |
9171769c YD |
450 | for patch in (file(os.path.join(branch_dir, 'unapplied')).readlines() |
451 | + file(os.path.join(branch_dir, 'applied')).readlines()): | |
452 | patch = patch.strip() | |
453 | os.rename(os.path.join(branch_dir, patch), | |
454 | os.path.join(patch_dir, patch)) | |
262d31dc | 455 | Patch(patch, patch_dir, refs_base).update_top_ref() |
9171769c YD |
456 | set_format_version(1) |
457 | ||
458 | # Update 1 -> 2. | |
459 | if get_format_version() == 1: | |
460 | desc_file = os.path.join(branch_dir, 'description') | |
461 | if os.path.isfile(desc_file): | |
462 | desc = read_string(desc_file) | |
463 | if desc: | |
464 | config.set('branch.%s.description' % self.get_name(), desc) | |
465 | rm(desc_file) | |
466 | rm(os.path.join(branch_dir, 'current')) | |
262d31dc | 467 | rm_ref('refs/bases/%s' % self.get_name()) |
9171769c YD |
468 | set_format_version(2) |
469 | ||
470 | # Make sure we're at the latest version. | |
471 | if not get_format_version() in [None, FORMAT_VERSION]: | |
472 | raise StackException('Branch %s is at format version %d, expected %d' | |
473 | % (self.get_name(), get_format_version(), FORMAT_VERSION)) | |
474 | ||
c1e4d7e0 CM |
475 | def __patch_name_valid(self, name): |
476 | """Raise an exception if the patch name is not valid. | |
477 | """ | |
478 | if not name or re.search('[^\w.-]', name): | |
479 | raise StackException, 'Invalid patch name: "%s"' % name | |
480 | ||
41a6d859 CM |
481 | def get_patch(self, name): |
482 | """Return a Patch object for the given name | |
483 | """ | |
262d31dc | 484 | return Patch(name, self.__patch_dir, self.__refs_base) |
41a6d859 | 485 | |
4d0ba818 KH |
486 | def get_current_patch(self): |
487 | """Return a Patch object representing the topmost patch, or | |
488 | None if there is no such patch.""" | |
489 | crt = self.get_current() | |
490 | if not crt: | |
491 | return None | |
4c0dd299 | 492 | return self.get_patch(crt) |
4d0ba818 | 493 | |
41a6d859 | 494 | def get_current(self): |
4d0ba818 KH |
495 | """Return the name of the topmost patch, or None if there is |
496 | no such patch.""" | |
532cdf94 KH |
497 | try: |
498 | applied = self.get_applied() | |
499 | except StackException: | |
500 | # No "applied" file: branch is not initialized. | |
501 | return None | |
502 | try: | |
503 | return applied[-1] | |
504 | except IndexError: | |
505 | # No patches applied. | |
41a6d859 | 506 | return None |
41a6d859 CM |
507 | |
508 | def get_applied(self): | |
40e65b92 | 509 | if not os.path.isfile(self.__applied_file): |
d37ff079 | 510 | raise StackException, 'Branch "%s" not initialised' % self.get_name() |
17364282 | 511 | return read_strings(self.__applied_file) |
41a6d859 | 512 | |
ca216016 KH |
513 | def set_applied(self, applied): |
514 | write_strings(self.__applied_file, applied) | |
515 | ||
41a6d859 | 516 | def get_unapplied(self): |
40e65b92 | 517 | if not os.path.isfile(self.__unapplied_file): |
d37ff079 | 518 | raise StackException, 'Branch "%s" not initialised' % self.get_name() |
17364282 | 519 | return read_strings(self.__unapplied_file) |
41a6d859 | 520 | |
ca216016 KH |
521 | def set_unapplied(self, unapplied): |
522 | write_strings(self.__unapplied_file, unapplied) | |
523 | ||
841c7b2a CM |
524 | def get_hidden(self): |
525 | if not os.path.isfile(self.__hidden_file): | |
526 | return [] | |
17364282 | 527 | return read_strings(self.__hidden_file) |
841c7b2a | 528 | |
ba66e579 | 529 | def get_base(self): |
16d69115 KH |
530 | # Return the parent of the bottommost patch, if there is one. |
531 | if os.path.isfile(self.__applied_file): | |
532 | bottommost = file(self.__applied_file).readline().strip() | |
533 | if bottommost: | |
534 | return self.get_patch(bottommost).get_bottom() | |
535 | # No bottommost patch, so just return HEAD | |
536 | return git.get_head() | |
ba66e579 | 537 | |
254d99f8 | 538 | def get_parent_remote(self): |
d37ff079 | 539 | value = config.get('branch.%s.remote' % self.get_name()) |
f72ad3d6 YD |
540 | if value: |
541 | return value | |
542 | elif 'origin' in git.remotes_list(): | |
27ac2b7e | 543 | out.note(('No parent remote declared for stack "%s",' |
d37ff079 | 544 | ' defaulting to "origin".' % self.get_name()), |
27ac2b7e | 545 | ('Consider setting "branch.%s.remote" and' |
82792b45 | 546 | ' "branch.%s.merge" with "git config".' |
d37ff079 | 547 | % (self.get_name(), self.get_name()))) |
f72ad3d6 YD |
548 | return 'origin' |
549 | else: | |
d37ff079 | 550 | raise StackException, 'Cannot find a parent remote for "%s"' % self.get_name() |
254d99f8 YD |
551 | |
552 | def __set_parent_remote(self, remote): | |
d37ff079 | 553 | value = config.set('branch.%s.remote' % self.get_name(), remote) |
254d99f8 | 554 | |
8866feda | 555 | def get_parent_branch(self): |
d37ff079 | 556 | value = config.get('branch.%s.stgit.parentbranch' % self.get_name()) |
8866feda YD |
557 | if value: |
558 | return value | |
559 | elif git.rev_parse('heads/origin'): | |
27ac2b7e | 560 | out.note(('No parent branch declared for stack "%s",' |
d37ff079 | 561 | ' defaulting to "heads/origin".' % self.get_name()), |
27ac2b7e | 562 | ('Consider setting "branch.%s.stgit.parentbranch"' |
82792b45 | 563 | ' with "git config".' % self.get_name())) |
8866feda YD |
564 | return 'heads/origin' |
565 | else: | |
d37ff079 | 566 | raise StackException, 'Cannot find a parent branch for "%s"' % self.get_name() |
8866feda YD |
567 | |
568 | def __set_parent_branch(self, name): | |
d37ff079 | 569 | if config.get('branch.%s.remote' % self.get_name()): |
4646e7a3 YD |
570 | # Never set merge if remote is not set to avoid |
571 | # possibly-erroneous lookups into 'origin' | |
d37ff079 YD |
572 | config.set('branch.%s.merge' % self.get_name(), name) |
573 | config.set('branch.%s.stgit.parentbranch' % self.get_name(), name) | |
8866feda YD |
574 | |
575 | def set_parent(self, remote, localbranch): | |
576 | if localbranch: | |
16881517 KH |
577 | if remote: |
578 | self.__set_parent_remote(remote) | |
8866feda | 579 | self.__set_parent_branch(localbranch) |
4646e7a3 YD |
580 | # We'll enforce this later |
581 | # else: | |
d37ff079 | 582 | # raise StackException, 'Parent branch (%s) should be specified for %s' % localbranch, self.get_name() |
8866feda | 583 | |
41a6d859 | 584 | def __patch_is_current(self, patch): |
8fe7e9f0 | 585 | return patch.get_name() == self.get_current() |
41a6d859 | 586 | |
ed0350be | 587 | def patch_applied(self, name): |
41a6d859 CM |
588 | """Return true if the patch exists in the applied list |
589 | """ | |
590 | return name in self.get_applied() | |
591 | ||
ed0350be | 592 | def patch_unapplied(self, name): |
41a6d859 CM |
593 | """Return true if the patch exists in the unapplied list |
594 | """ | |
595 | return name in self.get_unapplied() | |
596 | ||
841c7b2a CM |
597 | def patch_hidden(self, name): |
598 | """Return true if the patch is hidden. | |
599 | """ | |
600 | return name in self.get_hidden() | |
601 | ||
4d0ba818 KH |
602 | def patch_exists(self, name): |
603 | """Return true if there is a patch with the given name, false | |
604 | otherwise.""" | |
ca8b854c CM |
605 | return self.patch_applied(name) or self.patch_unapplied(name) \ |
606 | or self.patch_hidden(name) | |
4d0ba818 | 607 | |
8866feda | 608 | def init(self, create_at=False, parent_remote=None, parent_branch=None): |
41a6d859 CM |
609 | """Initialises the stgit series |
610 | """ | |
598e9d3f | 611 | if self.is_initialised(): |
d37ff079 | 612 | raise StackException, '%s already initialized' % self.get_name() |
262d31dc | 613 | for d in [self._dir()]: |
598e9d3f KH |
614 | if os.path.exists(d): |
615 | raise StackException, '%s already exists' % d | |
fe847176 | 616 | |
a22a62b6 | 617 | if (create_at!=False): |
d37ff079 | 618 | git.create_branch(self.get_name(), create_at) |
a22a62b6 | 619 | |
41a6d859 CM |
620 | os.makedirs(self.__patch_dir) |
621 | ||
8866feda | 622 | self.set_parent(parent_remote, parent_branch) |
41a6d859 | 623 | |
8fe7e9f0 YD |
624 | self.create_empty_field('applied') |
625 | self.create_empty_field('unapplied') | |
fb1cf8ec | 626 | self._set_field('orig-base', git.get_head()) |
41a6d859 | 627 | |
9171769c | 628 | config.set(self.format_version_key(), str(FORMAT_VERSION)) |
bad9dcfc | 629 | |
660ba985 CL |
630 | def rename(self, to_name): |
631 | """Renames a series | |
632 | """ | |
633 | to_stack = Series(to_name) | |
84bf6268 CL |
634 | |
635 | if to_stack.is_initialised(): | |
d37ff079 | 636 | raise StackException, '"%s" already exists' % to_stack.get_name() |
660ba985 | 637 | |
262d31dc KH |
638 | patches = self.get_applied() + self.get_unapplied() |
639 | ||
d37ff079 | 640 | git.rename_branch(self.get_name(), to_name) |
660ba985 | 641 | |
262d31dc KH |
642 | for patch in patches: |
643 | git.rename_ref('refs/patches/%s/%s' % (self.get_name(), patch), | |
644 | 'refs/patches/%s/%s' % (to_name, patch)) | |
645 | git.rename_ref('refs/patches/%s/%s.log' % (self.get_name(), patch), | |
646 | 'refs/patches/%s/%s.log' % (to_name, patch)) | |
8fe7e9f0 | 647 | if os.path.isdir(self._dir()): |
dd1b8fcc | 648 | rename(os.path.join(self._basedir(), 'patches'), |
d37ff079 | 649 | self.get_name(), to_stack.get_name()) |
660ba985 | 650 | |
cb5be4c3 | 651 | # Rename the config section |
337a0743 KH |
652 | for k in ['branch.%s', 'branch.%s.stgit']: |
653 | config.rename_section(k % self.get_name(), k % to_name) | |
cb5be4c3 | 654 | |
660ba985 CL |
655 | self.__init__(to_name) |
656 | ||
cc3db2b1 CL |
657 | def clone(self, target_series): |
658 | """Clones a series | |
659 | """ | |
09d8f8c5 CM |
660 | try: |
661 | # allow cloning of branches not under StGIT control | |
ba66e579 | 662 | base = self.get_base() |
09d8f8c5 CM |
663 | except: |
664 | base = git.get_head() | |
a22a62b6 | 665 | Series(target_series).init(create_at = base) |
cc3db2b1 CL |
666 | new_series = Series(target_series) |
667 | ||
668 | # generate an artificial description file | |
d37ff079 | 669 | new_series.set_description('clone of "%s"' % self.get_name()) |
cc3db2b1 CL |
670 | |
671 | # clone self's entire series as unapplied patches | |
09d8f8c5 CM |
672 | try: |
673 | # allow cloning of branches not under StGIT control | |
674 | applied = self.get_applied() | |
675 | unapplied = self.get_unapplied() | |
676 | patches = applied + unapplied | |
677 | patches.reverse() | |
678 | except: | |
679 | patches = applied = unapplied = [] | |
cc3db2b1 CL |
680 | for p in patches: |
681 | patch = self.get_patch(p) | |
8fce9909 YD |
682 | newpatch = new_series.new_patch(p, message = patch.get_description(), |
683 | can_edit = False, unapplied = True, | |
684 | bottom = patch.get_bottom(), | |
685 | top = patch.get_top(), | |
686 | author_name = patch.get_authname(), | |
687 | author_email = patch.get_authemail(), | |
688 | author_date = patch.get_authdate()) | |
689 | if patch.get_log(): | |
27ac2b7e | 690 | out.info('Setting log to %s' % patch.get_log()) |
8fce9909 YD |
691 | newpatch.set_log(patch.get_log()) |
692 | else: | |
27ac2b7e | 693 | out.info('No log for %s' % p) |
cc3db2b1 CL |
694 | |
695 | # fast forward the cloned series to self's top | |
09d8f8c5 | 696 | new_series.forward_patches(applied) |
cc3db2b1 | 697 | |
f32cdac5 | 698 | # Clone parent informations |
d37ff079 | 699 | value = config.get('branch.%s.remote' % self.get_name()) |
0579dae6 PR |
700 | if value: |
701 | config.set('branch.%s.remote' % target_series, value) | |
702 | ||
d37ff079 | 703 | value = config.get('branch.%s.merge' % self.get_name()) |
0579dae6 PR |
704 | if value: |
705 | config.set('branch.%s.merge' % target_series, value) | |
706 | ||
d37ff079 | 707 | value = config.get('branch.%s.stgit.parentbranch' % self.get_name()) |
f32cdac5 YD |
708 | if value: |
709 | config.set('branch.%s.stgit.parentbranch' % target_series, value) | |
710 | ||
fc804a49 CL |
711 | def delete(self, force = False): |
712 | """Deletes an stgit series | |
713 | """ | |
2d00440c | 714 | if self.is_initialised(): |
fc804a49 CL |
715 | patches = self.get_unapplied() + self.get_applied() |
716 | if not force and patches: | |
717 | raise StackException, \ | |
718 | 'Cannot delete: the series still contains patches' | |
fc804a49 | 719 | for p in patches: |
4c0dd299 | 720 | self.get_patch(p).delete() |
fc804a49 | 721 | |
c177ec71 YD |
722 | # remove the trash directory if any |
723 | if os.path.exists(self.__trash_dir): | |
724 | for fname in os.listdir(self.__trash_dir): | |
725 | os.remove(os.path.join(self.__trash_dir, fname)) | |
726 | os.rmdir(self.__trash_dir) | |
ac50371b | 727 | |
8fe7e9f0 | 728 | # FIXME: find a way to get rid of those manual removals |
a9d090f4 | 729 | # (move functionality to StgitObject ?) |
84bf6268 | 730 | if os.path.exists(self.__applied_file): |
fc804a49 | 731 | os.remove(self.__applied_file) |
84bf6268 | 732 | if os.path.exists(self.__unapplied_file): |
fc804a49 | 733 | os.remove(self.__unapplied_file) |
841c7b2a CM |
734 | if os.path.exists(self.__hidden_file): |
735 | os.remove(self.__hidden_file) | |
f9072c2f YD |
736 | if os.path.exists(self._dir()+'/orig-base'): |
737 | os.remove(self._dir()+'/orig-base') | |
737f3549 | 738 | |
fc804a49 CL |
739 | if not os.listdir(self.__patch_dir): |
740 | os.rmdir(self.__patch_dir) | |
741 | else: | |
27ac2b7e | 742 | out.warn('Patch directory %s is not empty' % self.__patch_dir) |
737f3549 | 743 | |
c7728cd5 | 744 | try: |
737f3549 | 745 | os.removedirs(self._dir()) |
c7728cd5 | 746 | except OSError: |
27ac2b7e KH |
747 | raise StackException('Series directory %s is not empty' |
748 | % self._dir()) | |
737f3549 | 749 | |
c7728cd5 | 750 | try: |
262d31dc KH |
751 | git.delete_branch(self.get_name()) |
752 | except GitException: | |
753 | out.warn('Could not delete branch "%s"' % self.get_name()) | |
fc804a49 | 754 | |
9a6bcbe2 KH |
755 | config.remove_section('branch.%s' % self.get_name()) |
756 | config.remove_section('branch.%s.stgit' % self.get_name()) | |
85289c08 | 757 | |
026c0689 CM |
758 | def refresh_patch(self, files = None, message = None, edit = False, |
759 | show_patch = False, | |
6ad48e48 | 760 | cache_update = True, |
41a6d859 CM |
761 | author_name = None, author_email = None, |
762 | author_date = None, | |
f80bef49 | 763 | committer_name = None, committer_email = None, |
eff17c6b | 764 | backup = False, sign_str = None, log = 'refresh', |
6889c93c | 765 | notes = None, bottom = None): |
692c15ef | 766 | """Generates a new commit for the topmost patch |
41a6d859 | 767 | """ |
692c15ef DK |
768 | patch = self.get_current_patch() |
769 | if not patch: | |
41a6d859 CM |
770 | raise StackException, 'No patches applied' |
771 | ||
41a6d859 CM |
772 | descr = patch.get_description() |
773 | if not (message or descr): | |
774 | edit = True | |
775 | descr = '' | |
776 | elif message: | |
777 | descr = message | |
778 | ||
ed60fdae CM |
779 | # TODO: move this out of the stgit.stack module, it is really |
780 | # for higher level commands to handle the user interaction | |
41a6d859 | 781 | if not message and edit: |
6ad48e48 | 782 | descr = edit_file(self, descr.rstrip(), \ |
41a6d859 | 783 | 'Please edit the description for patch "%s" ' \ |
692c15ef | 784 | 'above.' % patch.get_name(), show_patch) |
41a6d859 CM |
785 | |
786 | if not author_name: | |
787 | author_name = patch.get_authname() | |
788 | if not author_email: | |
789 | author_email = patch.get_authemail() | |
790 | if not author_date: | |
791 | author_date = patch.get_authdate() | |
792 | if not committer_name: | |
793 | committer_name = patch.get_commname() | |
794 | if not committer_email: | |
795 | committer_email = patch.get_commemail() | |
796 | ||
130df01a | 797 | descr = add_sign_line(descr, sign_str, committer_name, committer_email) |
c40c3500 | 798 | |
6889c93c DK |
799 | if not bottom: |
800 | bottom = patch.get_bottom() | |
f80bef49 | 801 | |
026c0689 | 802 | commit_id = git.commit(files = files, |
f80bef49 | 803 | message = descr, parents = [bottom], |
402ad990 | 804 | cache_update = cache_update, |
41a6d859 CM |
805 | allowempty = True, |
806 | author_name = author_name, | |
807 | author_email = author_email, | |
808 | author_date = author_date, | |
809 | committer_name = committer_name, | |
810 | committer_email = committer_email) | |
811 | ||
f80bef49 CM |
812 | patch.set_bottom(bottom, backup = backup) |
813 | patch.set_top(commit_id, backup = backup) | |
84fcbc3b CM |
814 | patch.set_description(descr) |
815 | patch.set_authname(author_name) | |
816 | patch.set_authemail(author_email) | |
817 | patch.set_authdate(author_date) | |
818 | patch.set_commname(committer_name) | |
819 | patch.set_commemail(committer_email) | |
c14444b9 | 820 | |
64354a2d | 821 | if log: |
eff17c6b | 822 | self.log_patch(patch, log, notes) |
64354a2d | 823 | |
c14444b9 | 824 | return commit_id |
41a6d859 | 825 | |
f80bef49 CM |
826 | def undo_refresh(self): |
827 | """Undo the patch boundaries changes caused by 'refresh' | |
828 | """ | |
829 | name = self.get_current() | |
830 | assert(name) | |
831 | ||
4c0dd299 | 832 | patch = self.get_patch(name) |
f80bef49 CM |
833 | old_bottom = patch.get_old_bottom() |
834 | old_top = patch.get_old_top() | |
835 | ||
836 | # the bottom of the patch is not changed by refresh. If the | |
837 | # old_bottom is different, there wasn't any previous 'refresh' | |
838 | # command (probably only a 'push') | |
839 | if old_bottom != patch.get_bottom() or old_top == patch.get_top(): | |
06848fab | 840 | raise StackException, 'No undo information available' |
f80bef49 CM |
841 | |
842 | git.reset(tree_id = old_top, check_out = False) | |
64354a2d CM |
843 | if patch.restore_old_boundaries(): |
844 | self.log_patch(patch, 'undo') | |
f80bef49 | 845 | |
37a4d1bf CM |
846 | def new_patch(self, name, message = None, can_edit = True, |
847 | unapplied = False, show_patch = False, | |
0ec93bfd | 848 | top = None, bottom = None, commit = True, |
41a6d859 | 849 | author_name = None, author_email = None, author_date = None, |