Copy patchlogs when cloning a stack or picking a patch.
[stgit] / stgit / stack.py
CommitLineData
41a6d859
CM
1"""Basic quilt-like functionality
2"""
3
4__copyright__ = """
5Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
6
7This program is free software; you can redistribute it and/or modify
8it under the terms of the GNU General Public License version 2 as
9published by the Free Software Foundation.
10
11This program is distributed in the hope that it will be useful,
12but WITHOUT ANY WARRANTY; without even the implied warranty of
13MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14GNU General Public License for more details.
15
16You should have received a copy of the GNU General Public License
17along with this program; if not, write to the Free Software
18Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19"""
20
c1e4d7e0 21import sys, os, re
41a6d859
CM
22
23from stgit.utils import *
1f3bb017 24from stgit import git, basedir, templates
41a6d859 25from stgit.config import config
8fce9909 26from shutil import copyfile
41a6d859
CM
27
28
29# stack exception class
30class StackException(Exception):
31 pass
32
6ad48e48
PBG
33class FilterUntil:
34 def __init__(self):
35 self.should_print = True
36 def __call__(self, x, until_test, prefix):
37 if until_test(x):
38 self.should_print = False
39 if self.should_print:
40 return x[0:len(prefix)] != prefix
41 return False
42
41a6d859
CM
43#
44# Functions
45#
46__comment_prefix = 'STG:'
6ad48e48 47__patch_prefix = 'STG_PATCH:'
41a6d859
CM
48
49def __clean_comments(f):
50 """Removes lines marked for status in a commit file
51 """
52 f.seek(0)
53
54 # remove status-prefixed lines
6ad48e48
PBG
55 lines = f.readlines()
56
57 patch_filter = FilterUntil()
58 until_test = lambda t: t == (__patch_prefix + '\n')
59 lines = [l for l in lines if patch_filter(l, until_test, __comment_prefix)]
60
41a6d859
CM
61 # remove empty lines at the end
62 while len(lines) != 0 and lines[-1] == '\n':
63 del lines[-1]
64
65 f.seek(0); f.truncate()
66 f.writelines(lines)
67
7cc615f3 68def edit_file(series, line, comment, show_patch = True):
bd427e46 69 fname = '.stgitmsg.txt'
1f3bb017 70 tmpl = templates.get_template('patchdescr.tmpl')
41a6d859
CM
71
72 f = file(fname, 'w+')
7cc615f3
CL
73 if line:
74 print >> f, line
1f3bb017
CM
75 elif tmpl:
76 print >> f, tmpl,
41a6d859
CM
77 else:
78 print >> f
79 print >> f, __comment_prefix, comment
80 print >> f, __comment_prefix, \
81 'Lines prefixed with "%s" will be automatically removed.' \
82 % __comment_prefix
83 print >> f, __comment_prefix, \
84 'Trailing empty lines will be automatically removed.'
6ad48e48
PBG
85
86 if show_patch:
87 print >> f, __patch_prefix
88 # series.get_patch(series.get_current()).get_top()
89 git.diff([], series.get_patch(series.get_current()).get_bottom(), None, f)
90
91 #Vim modeline must be near the end.
b83e37e0 92 print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:'
41a6d859
CM
93 f.close()
94
83bb4e4c 95 call_editor(fname)
41a6d859
CM
96
97 f = file(fname, 'r+')
98
99 __clean_comments(f)
100 f.seek(0)
7cc615f3 101 result = f.read()
41a6d859
CM
102
103 f.close()
104 os.remove(fname)
105
7cc615f3 106 return result
41a6d859
CM
107
108#
109# Classes
110#
111
8fe7e9f0
YD
112class StgitObject:
113 """An object with stgit-like properties stored as files in a directory
114 """
115 def _set_dir(self, dir):
116 self.__dir = dir
117 def _dir(self):
118 return self.__dir
119
120 def create_empty_field(self, name):
121 create_empty_file(os.path.join(self.__dir, name))
122
123 def _get_field(self, name, multiline = False):
124 id_file = os.path.join(self.__dir, name)
125 if os.path.isfile(id_file):
126 line = read_string(id_file, multiline)
127 if line == '':
128 return None
129 else:
130 return line
131 else:
132 return None
133
134 def _set_field(self, name, value, multiline = False):
135 fname = os.path.join(self.__dir, name)
136 if value and value != '':
137 write_string(fname, value, multiline)
138 elif os.path.isfile(fname):
139 os.remove(fname)
140
141
142class Patch(StgitObject):
41a6d859
CM
143 """Basic patch implementation
144 """
844a1640 145 def __init__(self, name, series_dir, refs_dir):
02ac3ad2 146 self.__series_dir = series_dir
41a6d859 147 self.__name = name
8fe7e9f0 148 self._set_dir(os.path.join(self.__series_dir, self.__name))
844a1640
CM
149 self.__refs_dir = refs_dir
150 self.__top_ref_file = os.path.join(self.__refs_dir, self.__name)
64354a2d
CM
151 self.__log_ref_file = os.path.join(self.__refs_dir,
152 self.__name + '.log')
41a6d859
CM
153
154 def create(self):
8fe7e9f0
YD
155 os.mkdir(self._dir())
156 self.create_empty_field('bottom')
157 self.create_empty_field('top')
41a6d859
CM
158
159 def delete(self):
8fe7e9f0
YD
160 for f in os.listdir(self._dir()):
161 os.remove(os.path.join(self._dir(), f))
162 os.rmdir(self._dir())
844a1640 163 os.remove(self.__top_ref_file)
64354a2d
CM
164 if os.path.exists(self.__log_ref_file):
165 os.remove(self.__log_ref_file)
41a6d859
CM
166
167 def get_name(self):
168 return self.__name
169
e55b53e0 170 def rename(self, newname):
8fe7e9f0 171 olddir = self._dir()
64354a2d
CM
172 old_top_ref_file = self.__top_ref_file
173 old_log_ref_file = self.__log_ref_file
e55b53e0 174 self.__name = newname
8fe7e9f0 175 self._set_dir(os.path.join(self.__series_dir, self.__name))
844a1640 176 self.__top_ref_file = os.path.join(self.__refs_dir, self.__name)
64354a2d
CM
177 self.__log_ref_file = os.path.join(self.__refs_dir,
178 self.__name + '.log')
e55b53e0 179
8fe7e9f0 180 os.rename(olddir, self._dir())
64354a2d
CM
181 os.rename(old_top_ref_file, self.__top_ref_file)
182 if os.path.exists(old_log_ref_file):
183 os.rename(old_log_ref_file, self.__log_ref_file)
844a1640
CM
184
185 def __update_top_ref(self, ref):
186 write_string(self.__top_ref_file, ref)
187
64354a2d
CM
188 def __update_log_ref(self, ref):
189 write_string(self.__log_ref_file, ref)
190
844a1640
CM
191 def update_top_ref(self):
192 top = self.get_top()
193 if top:
194 self.__update_top_ref(top)
e55b53e0 195
54b09584 196 def get_old_bottom(self):
8fe7e9f0 197 return self._get_field('bottom.old')
54b09584 198
41a6d859 199 def get_bottom(self):
8fe7e9f0 200 return self._get_field('bottom')
41a6d859 201
7cc615f3 202 def set_bottom(self, value, backup = False):
41a6d859 203 if backup:
8fe7e9f0
YD
204 curr = self._get_field('bottom')
205 self._set_field('bottom.old', curr)
206 self._set_field('bottom', value)
41a6d859 207
54b09584 208 def get_old_top(self):
8fe7e9f0 209 return self._get_field('top.old')
54b09584 210
41a6d859 211 def get_top(self):
8fe7e9f0 212 return self._get_field('top')
41a6d859 213
7cc615f3 214 def set_top(self, value, backup = False):
41a6d859 215 if backup:
8fe7e9f0
YD
216 curr = self._get_field('top')
217 self._set_field('top.old', curr)
218 self._set_field('top', value)
844a1640 219 self.__update_top_ref(value)
41a6d859
CM
220
221 def restore_old_boundaries(self):
8fe7e9f0
YD
222 bottom = self._get_field('bottom.old')
223 top = self._get_field('top.old')
41a6d859
CM
224
225 if top and bottom:
8fe7e9f0
YD
226 self._set_field('bottom', bottom)
227 self._set_field('top', top)
844a1640 228 self.__update_top_ref(top)
a5bbc44d 229 return True
41a6d859 230 else:
a5bbc44d 231 return False
41a6d859
CM
232
233 def get_description(self):
8fe7e9f0 234 return self._get_field('description', True)
41a6d859 235
7cc615f3 236 def set_description(self, line):
8fe7e9f0 237 self._set_field('description', line, True)
41a6d859
CM
238
239 def get_authname(self):
8fe7e9f0 240 return self._get_field('authname')
41a6d859 241
7cc615f3 242 def set_authname(self, name):
8fe7e9f0 243 self._set_field('authname', name or git.author().name)
41a6d859
CM
244
245 def get_authemail(self):
8fe7e9f0 246 return self._get_field('authemail')
41a6d859 247
9e3f506f 248 def set_authemail(self, email):
8fe7e9f0 249 self._set_field('authemail', email or git.author().email)
41a6d859
CM
250
251 def get_authdate(self):
8fe7e9f0 252 return self._get_field('authdate')
41a6d859 253
4db741b1 254 def set_authdate(self, date):
8fe7e9f0 255 self._set_field('authdate', date or git.author().date)
41a6d859
CM
256
257 def get_commname(self):
8fe7e9f0 258 return self._get_field('commname')
41a6d859 259
7cc615f3 260 def set_commname(self, name):
8fe7e9f0 261 self._set_field('commname', name or git.committer().name)
41a6d859
CM
262
263 def get_commemail(self):
8fe7e9f0 264 return self._get_field('commemail')
41a6d859 265
9e3f506f 266 def set_commemail(self, email):
8fe7e9f0 267 self._set_field('commemail', email or git.committer().email)
41a6d859 268
64354a2d 269 def get_log(self):
8fe7e9f0 270 return self._get_field('log')
64354a2d
CM
271
272 def set_log(self, value, backup = False):
8fe7e9f0 273 self._set_field('log', value)
64354a2d
CM
274 self.__update_log_ref(value)
275
41a6d859 276
8fe7e9f0 277class Series(StgitObject):
41a6d859
CM
278 """Class including the operations on series
279 """
280 def __init__(self, name = None):
40e65b92 281 """Takes a series name as the parameter.
41a6d859 282 """
98290387
CM
283 try:
284 if name:
285 self.__name = name
286 else:
287 self.__name = git.get_head_file()
170f576b 288 self.__base_dir = basedir.get()
98290387
CM
289 except git.GitException, ex:
290 raise StackException, 'GIT tree not initialised: %s' % ex
291
8fe7e9f0 292 self._set_dir(os.path.join(self.__base_dir, 'patches', self.__name))
844a1640
CM
293 self.__refs_dir = os.path.join(self.__base_dir, 'refs', 'patches',
294 self.__name)
02ac3ad2 295
8fe7e9f0
YD
296 self.__applied_file = os.path.join(self._dir(), 'applied')
297 self.__unapplied_file = os.path.join(self._dir(), 'unapplied')
841c7b2a 298 self.__hidden_file = os.path.join(self._dir(), 'hidden')
8fe7e9f0
YD
299 self.__current_file = os.path.join(self._dir(), 'current')
300 self.__descr_file = os.path.join(self._dir(), 'description')
02ac3ad2
CL
301
302 # where this series keeps its patches
8fe7e9f0 303 self.__patch_dir = os.path.join(self._dir(), 'patches')
02ac3ad2 304 if not os.path.isdir(self.__patch_dir):
8fe7e9f0 305 self.__patch_dir = self._dir()
41a6d859 306
844a1640
CM
307 # if no __refs_dir, create and populate it (upgrade old repositories)
308 if self.is_initialised() and not os.path.isdir(self.__refs_dir):
309 os.makedirs(self.__refs_dir)
310 for patch in self.get_applied() + self.get_unapplied():
311 self.get_patch(patch).update_top_ref()
312
ac50371b 313 # trash directory
8fe7e9f0 314 self.__trash_dir = os.path.join(self._dir(), 'trash')
ac50371b
CM
315 if self.is_initialised() and not os.path.isdir(self.__trash_dir):
316 os.makedirs(self.__trash_dir)
317
c1e4d7e0
CM
318 def __patch_name_valid(self, name):
319 """Raise an exception if the patch name is not valid.
320 """
321 if not name or re.search('[^\w.-]', name):
322 raise StackException, 'Invalid patch name: "%s"' % name
323
629ddd02
CM
324 def get_branch(self):
325 """Return the branch name for the Series object
326 """
327 return self.__name
328
41a6d859
CM
329 def __set_current(self, name):
330 """Sets the topmost patch
331 """
8fe7e9f0 332 self._set_field('current', name)
41a6d859
CM
333
334 def get_patch(self, name):
335 """Return a Patch object for the given name
336 """
844a1640 337 return Patch(name, self.__patch_dir, self.__refs_dir)
41a6d859 338
4d0ba818
KH
339 def get_current_patch(self):
340 """Return a Patch object representing the topmost patch, or
341 None if there is no such patch."""
342 crt = self.get_current()
343 if not crt:
344 return None
345 return Patch(crt, self.__patch_dir, self.__refs_dir)
346
41a6d859 347 def get_current(self):
4d0ba818
KH
348 """Return the name of the topmost patch, or None if there is
349 no such patch."""
8fe7e9f0 350 name = self._get_field('current')
41a6d859
CM
351 if name == '':
352 return None
353 else:
354 return name
355
356 def get_applied(self):
40e65b92 357 if not os.path.isfile(self.__applied_file):
a2dcde71 358 raise StackException, 'Branch "%s" not initialised' % self.__name
41a6d859
CM
359 f = file(self.__applied_file)
360 names = [line.strip() for line in f.readlines()]
361 f.close()
362 return names
363
364 def get_unapplied(self):
40e65b92 365 if not os.path.isfile(self.__unapplied_file):
a2dcde71 366 raise StackException, 'Branch "%s" not initialised' % self.__name
41a6d859
CM
367 f = file(self.__unapplied_file)
368 names = [line.strip() for line in f.readlines()]
369 f.close()
370 return names
371
841c7b2a
CM
372 def get_hidden(self):
373 if not os.path.isfile(self.__hidden_file):
374 return []
375 f = file(self.__hidden_file)
376 names = [line.strip() for line in f.readlines()]
377 f.close()
378 return names
379
ba66e579 380 def get_base(self):
16d69115
KH
381 # Return the parent of the bottommost patch, if there is one.
382 if os.path.isfile(self.__applied_file):
383 bottommost = file(self.__applied_file).readline().strip()
384 if bottommost:
385 return self.get_patch(bottommost).get_bottom()
386 # No bottommost patch, so just return HEAD
387 return git.get_head()
ba66e579 388
e078133e
CM
389 def get_head(self):
390 """Return the head of the branch
391 """
392 crt = self.get_current_patch()
393 if crt:
394 return crt.get_top()
395 else:
396 return self.get_base()
397
0b4b9499 398 def get_protected(self):
8fe7e9f0 399 return os.path.isfile(os.path.join(self._dir(), 'protected'))
0b4b9499
CL
400
401 def protect(self):
8fe7e9f0 402 protect_file = os.path.join(self._dir(), 'protected')
0b4b9499
CL
403 if not os.path.isfile(protect_file):
404 create_empty_file(protect_file)
405
406 def unprotect(self):
8fe7e9f0 407 protect_file = os.path.join(self._dir(), 'protected')
0b4b9499
CL
408 if os.path.isfile(protect_file):
409 os.remove(protect_file)
410
c1fe1f99 411 def get_description(self):
d1368d81 412 return self._get_field('description') or ''
8fe7e9f0
YD
413
414 def set_description(self, line):
415 self._set_field('description', line)
c1fe1f99 416
254d99f8 417 def get_parent_remote(self):
f72ad3d6
YD
418 value = config.get('branch.%s.remote' % self.__name)
419 if value:
420 return value
421 elif 'origin' in git.remotes_list():
4646e7a3
YD
422 print 'Notice: no parent remote declared for stack "%s", ' \
423 'defaulting to "origin". Consider setting "branch.%s.remote" ' \
424 'and "branch.%s.merge" with "git repo-config".' \
425 % (self.__name, self.__name, self.__name)
f72ad3d6
YD
426 return 'origin'
427 else:
428 raise StackException, 'Cannot find a parent remote for "%s"' % self.__name
254d99f8
YD
429
430 def __set_parent_remote(self, remote):
431 value = config.set('branch.%s.remote' % self.__name, remote)
432
8866feda 433 def get_parent_branch(self):
4646e7a3 434 value = config.get('branch.%s.stgit.parentbranch' % self.__name)
8866feda
YD
435 if value:
436 return value
437 elif git.rev_parse('heads/origin'):
4646e7a3
YD
438 print 'Notice: no parent branch declared for stack "%s", ' \
439 'defaulting to "heads/origin". Consider setting ' \
440 '"branch.%s.stgit.parentbranch" with "git repo-config".' \
c0167829 441 % (self.__name, self.__name)
8866feda
YD
442 return 'heads/origin'
443 else:
444 raise StackException, 'Cannot find a parent branch for "%s"' % self.__name
445
446 def __set_parent_branch(self, name):
4646e7a3
YD
447 if config.get('branch.%s.remote' % self.__name):
448 # Never set merge if remote is not set to avoid
449 # possibly-erroneous lookups into 'origin'
450 config.set('branch.%s.merge' % self.__name, name)
451 config.set('branch.%s.stgit.parentbranch' % self.__name, name)
8866feda
YD
452
453 def set_parent(self, remote, localbranch):
4646e7a3
YD
454 # policy: record local branches as remote='.'
455 recordremote = remote or '.'
8866feda 456 if localbranch:
4646e7a3 457 self.__set_parent_remote(recordremote)
8866feda 458 self.__set_parent_branch(localbranch)
4646e7a3
YD
459 # We'll enforce this later
460# else:
461# raise StackException, 'Parent branch (%s) should be specified for %s' % localbranch, self.__name
8866feda 462
41a6d859 463 def __patch_is_current(self, patch):
8fe7e9f0 464 return patch.get_name() == self.get_current()
41a6d859 465
ed0350be 466 def patch_applied(self, name):
41a6d859
CM
467 """Return true if the patch exists in the applied list
468 """
469 return name in self.get_applied()
470
ed0350be 471 def patch_unapplied(self, name):
41a6d859
CM
472 """Return true if the patch exists in the unapplied list
473 """
474 return name in self.get_unapplied()
475
841c7b2a
CM
476 def patch_hidden(self, name):
477 """Return true if the patch is hidden.
478 """
479 return name in self.get_hidden()
480
4d0ba818
KH
481 def patch_exists(self, name):
482 """Return true if there is a patch with the given name, false
483 otherwise."""
ed0350be 484 return self.patch_applied(name) or self.patch_unapplied(name)
4d0ba818 485
41a6d859
CM
486 def head_top_equal(self):
487 """Return true if the head and the top are the same
488 """
4d0ba818 489 crt = self.get_current_patch()
41a6d859
CM
490 if not crt:
491 # we don't care, no patches applied
492 return True
4d0ba818 493 return git.get_head() == crt.get_top()
41a6d859 494
2d00440c
CL
495 def is_initialised(self):
496 """Checks if series is already initialised
497 """
498 return os.path.isdir(self.__patch_dir)
499
8866feda 500 def init(self, create_at=False, parent_remote=None, parent_branch=None):
41a6d859
CM
501 """Initialises the stgit series
502 """
fe847176 503 if os.path.exists(self.__patch_dir):
41a6d859 504 raise StackException, self.__patch_dir + ' already exists'
fe847176
YD
505 if os.path.exists(self.__refs_dir):
506 raise StackException, self.__refs_dir + ' already exists'
fe847176 507
a22a62b6
YD
508 if (create_at!=False):
509 git.create_branch(self.__name, create_at)
510
41a6d859
CM
511 os.makedirs(self.__patch_dir)
512
8866feda 513 self.set_parent(parent_remote, parent_branch)
41a6d859 514
8fe7e9f0
YD
515 self.create_empty_field('applied')
516 self.create_empty_field('unapplied')
517 self.create_empty_field('description')
518 os.makedirs(os.path.join(self._dir(), 'patches'))
844a1640 519 os.makedirs(self.__refs_dir)
b6c95ada 520 self._set_field('orig-base', git.get_head())
41a6d859 521
bad9dcfc
CL
522 def convert(self):
523 """Either convert to use a separate patch directory, or
524 unconvert to place the patches in the same directory with
525 series control files
526 """
8fe7e9f0 527 if self.__patch_dir == self._dir():
bad9dcfc
CL
528 print 'Converting old-style to new-style...',
529 sys.stdout.flush()
530
8fe7e9f0 531 self.__patch_dir = os.path.join(self._dir(), 'patches')
bad9dcfc
CL
532 os.makedirs(self.__patch_dir)
533
534 for p in self.get_applied() + self.get_unapplied():
8fe7e9f0 535 src = os.path.join(self._dir(), p)
bad9dcfc
CL
536 dest = os.path.join(self.__patch_dir, p)
537 os.rename(src, dest)
538
539 print 'done'
540
541 else:
542 print 'Converting new-style to old-style...',
543 sys.stdout.flush()
544
545 for p in self.get_applied() + self.get_unapplied():
546 src = os.path.join(self.__patch_dir, p)
8fe7e9f0 547 dest = os.path.join(self._dir(), p)
bad9dcfc
CL
548 os.rename(src, dest)
549
550 if not os.listdir(self.__patch_dir):
551 os.rmdir(self.__patch_dir)
552 print 'done'
553 else:
737f3549 554 print 'Patch directory %s is not empty.' % self.__patch_dir
bad9dcfc 555
8fe7e9f0 556 self.__patch_dir = self._dir()
bad9dcfc 557
660ba985
CL
558 def rename(self, to_name):
559 """Renames a series
560 """
561 to_stack = Series(to_name)
84bf6268
CL
562
563 if to_stack.is_initialised():
564 raise StackException, '"%s" already exists' % to_stack.get_branch()
660ba985
CL
565
566 git.rename_branch(self.__name, to_name)
567
8fe7e9f0 568 if os.path.isdir(self._dir()):