chiark / gitweb /
Make the "name" argument to "stg new" optional
[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 299 self.__descr_file = os.path.join(self._dir(), 'description')
02ac3ad2
CL
300
301 # where this series keeps its patches
8fe7e9f0 302 self.__patch_dir = os.path.join(self._dir(), 'patches')
02ac3ad2 303 if not os.path.isdir(self.__patch_dir):
8fe7e9f0 304 self.__patch_dir = self._dir()
41a6d859 305
844a1640
CM
306 # if no __refs_dir, create and populate it (upgrade old repositories)
307 if self.is_initialised() and not os.path.isdir(self.__refs_dir):
308 os.makedirs(self.__refs_dir)
309 for patch in self.get_applied() + self.get_unapplied():
310 self.get_patch(patch).update_top_ref()
311
ac50371b 312 # trash directory
8fe7e9f0 313 self.__trash_dir = os.path.join(self._dir(), 'trash')
ac50371b
CM
314 if self.is_initialised() and not os.path.isdir(self.__trash_dir):
315 os.makedirs(self.__trash_dir)
316
c1e4d7e0
CM
317 def __patch_name_valid(self, name):
318 """Raise an exception if the patch name is not valid.
319 """
320 if not name or re.search('[^\w.-]', name):
321 raise StackException, 'Invalid patch name: "%s"' % name
322
629ddd02
CM
323 def get_branch(self):
324 """Return the branch name for the Series object
325 """
326 return self.__name
327
41a6d859
CM
328 def get_patch(self, name):
329 """Return a Patch object for the given name
330 """
844a1640 331 return Patch(name, self.__patch_dir, self.__refs_dir)
41a6d859 332
4d0ba818
KH
333 def get_current_patch(self):
334 """Return a Patch object representing the topmost patch, or
335 None if there is no such patch."""
336 crt = self.get_current()
337 if not crt:
338 return None
339 return Patch(crt, self.__patch_dir, self.__refs_dir)
340
41a6d859 341 def get_current(self):
4d0ba818
KH
342 """Return the name of the topmost patch, or None if there is
343 no such patch."""
532cdf94
KH
344 try:
345 applied = self.get_applied()
346 except StackException:
347 # No "applied" file: branch is not initialized.
348 return None
349 try:
350 return applied[-1]
351 except IndexError:
352 # No patches applied.
41a6d859 353 return None
41a6d859
CM
354
355 def get_applied(self):
40e65b92 356 if not os.path.isfile(self.__applied_file):
a2dcde71 357 raise StackException, 'Branch "%s" not initialised' % self.__name
41a6d859
CM
358 f = file(self.__applied_file)
359 names = [line.strip() for line in f.readlines()]
360 f.close()
361 return names
362
363 def get_unapplied(self):
40e65b92 364 if not os.path.isfile(self.__unapplied_file):
a2dcde71 365 raise StackException, 'Branch "%s" not initialised' % self.__name
41a6d859
CM
366 f = file(self.__unapplied_file)
367 names = [line.strip() for line in f.readlines()]
368 f.close()
369 return names
370
841c7b2a
CM
371 def get_hidden(self):
372 if not os.path.isfile(self.__hidden_file):
373 return []
374 f = file(self.__hidden_file)
375 names = [line.strip() for line in f.readlines()]
376 f.close()
377 return names
378
ba66e579 379 def get_base(self):
16d69115
KH
380 # Return the parent of the bottommost patch, if there is one.
381 if os.path.isfile(self.__applied_file):
382 bottommost = file(self.__applied_file).readline().strip()
383 if bottommost:
384 return self.get_patch(bottommost).get_bottom()
385 # No bottommost patch, so just return HEAD
386 return git.get_head()
ba66e579 387
e078133e
CM
388 def get_head(self):
389 """Return the head of the branch
390 """
391 crt = self.get_current_patch()
392 if crt:
393 return crt.get_top()
394 else:
395 return self.get_base()
396
0b4b9499 397 def get_protected(self):
8fe7e9f0 398 return os.path.isfile(os.path.join(self._dir(), 'protected'))
0b4b9499
CL
399
400 def protect(self):
8fe7e9f0 401 protect_file = os.path.join(self._dir(), 'protected')
0b4b9499
CL
402 if not os.path.isfile(protect_file):
403 create_empty_file(protect_file)
404
405 def unprotect(self):
8fe7e9f0 406 protect_file = os.path.join(self._dir(), 'protected')
0b4b9499
CL
407 if os.path.isfile(protect_file):
408 os.remove(protect_file)
409
c1fe1f99 410 def get_description(self):
d1368d81 411 return self._get_field('description') or ''
8fe7e9f0
YD
412
413 def set_description(self, line):
414 self._set_field('description', line)
c1fe1f99 415
254d99f8 416 def get_parent_remote(self):
f72ad3d6
YD
417 value = config.get('branch.%s.remote' % self.__name)
418 if value:
419 return value
420 elif 'origin' in git.remotes_list():
4646e7a3
YD
421 print 'Notice: no parent remote declared for stack "%s", ' \
422 'defaulting to "origin". Consider setting "branch.%s.remote" ' \
423 'and "branch.%s.merge" with "git repo-config".' \
424 % (self.__name, self.__name, self.__name)
f72ad3d6
YD
425 return 'origin'
426 else:
427 raise StackException, 'Cannot find a parent remote for "%s"' % self.__name
254d99f8
YD
428
429 def __set_parent_remote(self, remote):
430 value = config.set('branch.%s.remote' % self.__name, remote)
431
8866feda 432 def get_parent_branch(self):
4646e7a3 433 value = config.get('branch.%s.stgit.parentbranch' % self.__name)
8866feda
YD
434 if value:
435 return value
436 elif git.rev_parse('heads/origin'):
4646e7a3
YD
437 print 'Notice: no parent branch declared for stack "%s", ' \
438 'defaulting to "heads/origin". Consider setting ' \
439 '"branch.%s.stgit.parentbranch" with "git repo-config".' \
c0167829 440 % (self.__name, self.__name)
8866feda
YD
441 return 'heads/origin'
442 else:
443 raise StackException, 'Cannot find a parent branch for "%s"' % self.__name
444
445 def __set_parent_branch(self, name):
4646e7a3
YD
446 if config.get('branch.%s.remote' % self.__name):
447 # Never set merge if remote is not set to avoid
448 # possibly-erroneous lookups into 'origin'
449 config.set('branch.%s.merge' % self.__name, name)
450 config.set('branch.%s.stgit.parentbranch' % self.__name, name)
8866feda
YD
451
452 def set_parent(self, remote, localbranch):
453 if localbranch:
1fa161d6 454 self.__set_parent_remote(remote)
8866feda 455 self.__set_parent_branch(localbranch)
4646e7a3
YD
456 # We'll enforce this later
457# else:
458# raise StackException, 'Parent branch (%s) should be specified for %s' % localbranch, self.__name
8866feda 459
41a6d859 460 def __patch_is_current(self, patch):
8fe7e9f0 461 return patch.get_name() == self.get_current()
41a6d859 462
ed0350be 463 def patch_applied(self, name):
41a6d859
CM
464 """Return true if the patch exists in the applied list
465 """
466 return name in self.get_applied()
467
ed0350be 468 def patch_unapplied(self, name):
41a6d859
CM
469 """Return true if the patch exists in the unapplied list
470 """
471 return name in self.get_unapplied()
472
841c7b2a
CM
473 def patch_hidden(self, name):
474 """Return true if the patch is hidden.
475 """
476 return name in self.get_hidden()
477
4d0ba818
KH
478 def patch_exists(self, name):
479 """Return true if there is a patch with the given name, false
480 otherwise."""
ed0350be 481 return self.patch_applied(name) or self.patch_unapplied(name)
4d0ba818 482
41a6d859
CM
483 def head_top_equal(self):
484 """Return true if the head and the top are the same
485 """
4d0ba818 486 crt = self.get_current_patch()
41a6d859
CM
487 if not crt:
488 # we don't care, no patches applied
489 return True
4d0ba818 490 return git.get_head() == crt.get_top()
41a6d859 491
2d00440c
CL
492 def is_initialised(self):
493 """Checks if series is already initialised
494 """
495 return os.path.isdir(self.__patch_dir)
496
8866feda 497 def init(self, create_at=False, parent_remote=None, parent_branch=None):
41a6d859
CM
498 """Initialises the stgit series
499 """
fe847176 500 if os.path.exists(self.__patch_dir):
41a6d859 501 raise StackException, self.__patch_dir + ' already exists'
fe847176
YD
502 if os.path.exists(self.__refs_dir):
503 raise StackException, self.__refs_dir + ' already exists'
fe847176 504
a22a62b6
YD
505 if (create_at!=False):
506 git.create_branch(self.__name, create_at)
507
41a6d859
CM
508 os.makedirs(self.__patch_dir)
509
8866feda 510 self.set_parent(parent_remote, parent_branch)
41a6d859 511
8fe7e9f0
YD
512 self.create_empty_field('applied')
513 self.create_empty_field('unapplied')
514 self.create_empty_field('description')
515 os.makedirs(os.path.join(self._dir(), 'patches'))
844a1640 516 os.makedirs(self.__refs_dir)
b6c95ada 517 self._set_field('orig-base', git.get_head())
41a6d859 518
bad9dcfc
CL
519 def convert(self):
520 """Either convert to use a separate patch directory, or
521 unconvert to place the patches in the same directory with
522 series control files
523 """
8fe7e9f0 524 if self.__patch_dir == self._dir():
bad9dcfc
CL
525 print 'Converting old-style to new-style...',
526 sys.stdout.flush()
527
8fe7e9f0 528 self.__patch_dir = os.path.join(self._dir(), 'patches')
bad9dcfc
CL
529 os.makedirs(self.__patch_dir)
530
531 for p in self.get_applied() + self.get_unapplied():
8fe7e9f0 532 src = os.path.join(self._dir(), p)
bad9dcfc
CL
533 dest = os.path.join(self.__patch_dir, p)
534 os.rename(src, dest)
535
536 print 'done'
537
538 else:
539 print 'Converting new-style to old-style...',
540 sys.stdout.flush()
541
542 for p in self.get_applied() + self.get_unapplied():
543 src = os.path.join(self.__patch_dir, p)
8fe7e9f0 544 dest = os.path.join(self._dir(), p)
bad9dcfc
CL
545 os.rename(src, dest)
546
547 if not os.listdir(self.__patch_dir):
548 os.rmdir(self.__patch_dir)
549 print 'done'
550 else:
737f3549 551 print 'Patch directory %s is not empty.' % self.__patch_dir
bad9dcfc 552
8fe7e9f0 553 self.__patch_dir = self._dir()
bad9dcfc 554
660ba985
CL
555 def rename(self, to_name):
556 """Renames a series
557 """
558 to_stack = Series(to_name)
84bf6268
CL
559
560 if to_stack.is_initialised():
561 raise StackException, '"%s" already exists' % to_stack.get_branch()
660ba985
CL
562
563 git.rename_branch(self.__name, to_name)
564
8fe7e9f0 565 if os.path.isdir(self._dir()):