X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/501d024430ebad7e010362cc60f73713da6e787e..ed60fdae02d9317475eb64328ec683e1148c3f7b:/stgit/stack.py diff --git a/stgit/stack.py b/stgit/stack.py index dbd7ea4..d6f6a6e 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -19,8 +19,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ import sys, os, re +from email.Utils import formatdate from stgit.utils import * +from stgit.out import * from stgit import git, basedir, templates from stgit.config import config from shutil import copyfile @@ -65,6 +67,8 @@ def __clean_comments(f): f.seek(0); f.truncate() f.writelines(lines) +# TODO: move this out of the stgit.stack module, it is really for +# higher level commands to handle the user interaction def edit_file(series, line, comment, show_patch = True): fname = '.stgitmsg.txt' tmpl = templates.get_template('patchdescr.tmpl') @@ -86,7 +90,8 @@ def edit_file(series, line, comment, show_patch = True): if show_patch: print >> f, __patch_prefix # series.get_patch(series.get_current()).get_top() - git.diff([], series.get_patch(series.get_current()).get_bottom(), None, f) + diff_str = git.diff(rev1 = series.get_patch(series.get_current()).get_bottom()) + f.write(diff_str) #Vim modeline must be near the end. print >> f, __comment_prefix, 'vi: set textwidth=75 filetype=diff nobackup:' @@ -142,14 +147,16 @@ class StgitObject: class Patch(StgitObject): """Basic patch implementation """ - def __init__(self, name, series_dir, refs_dir): + def __init_refs(self): + self.__top_ref = self.__refs_base + '/' + self.__name + self.__log_ref = self.__top_ref + '.log' + + def __init__(self, name, series_dir, refs_base): self.__series_dir = series_dir self.__name = name self._set_dir(os.path.join(self.__series_dir, self.__name)) - self.__refs_dir = refs_dir - self.__top_ref_file = os.path.join(self.__refs_dir, self.__name) - self.__log_ref_file = os.path.join(self.__refs_dir, - self.__name + '.log') + self.__refs_base = refs_base + self.__init_refs() def create(self): os.mkdir(self._dir()) @@ -160,33 +167,31 @@ class Patch(StgitObject): for f in os.listdir(self._dir()): os.remove(os.path.join(self._dir(), f)) os.rmdir(self._dir()) - os.remove(self.__top_ref_file) - if os.path.exists(self.__log_ref_file): - os.remove(self.__log_ref_file) + git.delete_ref(self.__top_ref) + if git.ref_exists(self.__log_ref): + git.delete_ref(self.__log_ref) def get_name(self): return self.__name def rename(self, newname): olddir = self._dir() - old_top_ref_file = self.__top_ref_file - old_log_ref_file = self.__log_ref_file + old_top_ref = self.__top_ref + old_log_ref = self.__log_ref self.__name = newname self._set_dir(os.path.join(self.__series_dir, self.__name)) - self.__top_ref_file = os.path.join(self.__refs_dir, self.__name) - self.__log_ref_file = os.path.join(self.__refs_dir, - self.__name + '.log') + self.__init_refs() + git.rename_ref(old_top_ref, self.__top_ref) + if git.ref_exists(old_log_ref): + git.rename_ref(old_log_ref, self.__log_ref) os.rename(olddir, self._dir()) - os.rename(old_top_ref_file, self.__top_ref_file) - if os.path.exists(old_log_ref_file): - os.rename(old_log_ref_file, self.__log_ref_file) def __update_top_ref(self, ref): - write_string(self.__top_ref_file, ref) + git.set_ref(self.__top_ref, ref) def __update_log_ref(self, ref): - write_string(self.__log_ref_file, ref) + git.set_ref(self.__log_ref, ref) def update_top_ref(self): top = self.get_top() @@ -249,7 +254,16 @@ class Patch(StgitObject): self._set_field('authemail', email or git.author().email) def get_authdate(self): - return self._get_field('authdate') + date = self._get_field('authdate') + if not date: + return date + + if re.match('[0-9]+\s+[+-][0-9]+', date): + # Unix time (seconds) + time zone + secs_tz = date.split() + date = formatdate(int(secs_tz[0]))[:-5] + secs_tz[1] + + return date def set_authdate(self, date): self._set_field('authdate', date or git.author().date) @@ -346,6 +360,12 @@ class PatchSet(StgitObject): return bool(config.get(self.format_version_key())) +def shortlog(patches): + log = ''.join(Run('git-log', '--pretty=short', + p.get_top(), '^%s' % p.get_bottom()).raw_output() + for p in patches) + return Run('git-shortlog').raw_input(log).raw_output() + class Series(PatchSet): """Class including the operations on series """ @@ -358,8 +378,7 @@ class Series(PatchSet): # initialized, but don't touch it if it isn't. self.update_to_current_format_version() - self.__refs_dir = os.path.join(self._basedir(), 'refs', 'patches', - self.get_name()) + self.__refs_base = 'refs/patches/%s' % self.get_name() self.__applied_file = os.path.join(self._dir(), 'applied') self.__unapplied_file = os.path.join(self._dir(), 'unapplied') @@ -416,20 +435,22 @@ class Series(PatchSet): def rm(f): if os.path.exists(f): os.remove(f) + def rm_ref(ref): + if git.ref_exists(ref): + git.delete_ref(ref) # Update 0 -> 1. if get_format_version() == 0: mkdir(os.path.join(branch_dir, 'trash')) patch_dir = os.path.join(branch_dir, 'patches') mkdir(patch_dir) - refs_dir = os.path.join(self._basedir(), 'refs', 'patches', self.get_name()) - mkdir(refs_dir) + refs_base = 'refs/patches/%s' % self.get_name() for patch in (file(os.path.join(branch_dir, 'unapplied')).readlines() + file(os.path.join(branch_dir, 'applied')).readlines()): patch = patch.strip() os.rename(os.path.join(branch_dir, patch), os.path.join(patch_dir, patch)) - Patch(patch, patch_dir, refs_dir).update_top_ref() + Patch(patch, patch_dir, refs_base).update_top_ref() set_format_version(1) # Update 1 -> 2. @@ -441,7 +462,7 @@ class Series(PatchSet): config.set('branch.%s.description' % self.get_name(), desc) rm(desc_file) rm(os.path.join(branch_dir, 'current')) - rm(os.path.join(self._basedir(), 'refs', 'bases', self.get_name())) + rm_ref('refs/bases/%s' % self.get_name()) set_format_version(2) # Make sure we're at the latest version. @@ -458,7 +479,7 @@ class Series(PatchSet): def get_patch(self, name): """Return a Patch object for the given name """ - return Patch(name, self.__patch_dir, self.__refs_dir) + return Patch(name, self.__patch_dir, self.__refs_base) def get_current_patch(self): """Return a Patch object representing the topmost patch, or @@ -466,7 +487,7 @@ class Series(PatchSet): crt = self.get_current() if not crt: return None - return Patch(crt, self.__patch_dir, self.__refs_dir) + return self.get_patch(crt) def get_current(self): """Return the name of the topmost patch, or None if there is @@ -514,7 +535,7 @@ class Series(PatchSet): out.note(('No parent remote declared for stack "%s",' ' defaulting to "origin".' % self.get_name()), ('Consider setting "branch.%s.remote" and' - ' "branch.%s.merge" with "git repo-config".' + ' "branch.%s.merge" with "git config".' % (self.get_name(), self.get_name()))) return 'origin' else: @@ -531,7 +552,7 @@ class Series(PatchSet): out.note(('No parent branch declared for stack "%s",' ' defaulting to "heads/origin".' % self.get_name()), ('Consider setting "branch.%s.stgit.parentbranch"' - ' with "git repo-config".' % self.get_name())) + ' with "git config".' % self.get_name())) return 'heads/origin' else: raise StackException, 'Cannot find a parent branch for "%s"' % self.get_name() @@ -545,7 +566,8 @@ class Series(PatchSet): def set_parent(self, remote, localbranch): if localbranch: - self.__set_parent_remote(remote) + if remote: + self.__set_parent_remote(remote) self.__set_parent_branch(localbranch) # We'll enforce this later # else: @@ -580,7 +602,7 @@ class Series(PatchSet): """ if self.is_initialised(): raise StackException, '%s already initialized' % self.get_name() - for d in [self._dir(), self.__refs_dir]: + for d in [self._dir()]: if os.path.exists(d): raise StackException, '%s already exists' % d @@ -593,7 +615,6 @@ class Series(PatchSet): self.create_empty_field('applied') self.create_empty_field('unapplied') - os.makedirs(self.__refs_dir) self._set_field('orig-base', git.get_head()) config.set(self.format_version_key(), str(FORMAT_VERSION)) @@ -606,18 +627,22 @@ class Series(PatchSet): if to_stack.is_initialised(): raise StackException, '"%s" already exists' % to_stack.get_name() + patches = self.get_applied() + self.get_unapplied() + git.rename_branch(self.get_name(), to_name) + for patch in patches: + git.rename_ref('refs/patches/%s/%s' % (self.get_name(), patch), + 'refs/patches/%s/%s' % (to_name, patch)) + git.rename_ref('refs/patches/%s/%s.log' % (self.get_name(), patch), + 'refs/patches/%s/%s.log' % (to_name, patch)) if os.path.isdir(self._dir()): rename(os.path.join(self._basedir(), 'patches'), self.get_name(), to_stack.get_name()) - if os.path.exists(self.__refs_dir): - rename(os.path.join(self._basedir(), 'refs', 'patches'), - self.get_name(), to_stack.get_name()) # Rename the config section - config.rename_section("branch.%s" % self.get_name(), - "branch.%s" % to_name) + for k in ['branch.%s', 'branch.%s.stgit']: + config.rename_section(k % self.get_name(), k % to_name) self.__init__(to_name) @@ -684,7 +709,7 @@ class Series(PatchSet): raise StackException, \ 'Cannot delete: the series still contains patches' for p in patches: - Patch(p, self.__patch_dir, self.__refs_dir).delete() + self.get_patch(p).delete() # remove the trash directory if any if os.path.exists(self.__trash_dir): @@ -715,9 +740,9 @@ class Series(PatchSet): % self._dir()) try: - os.removedirs(self.__refs_dir) - except OSError: - out.warn('Refs directory %s is not empty' % self.__refs_dir) + git.delete_branch(self.get_name()) + except GitException: + out.warn('Could not delete branch "%s"' % self.get_name()) # Cleanup parent informations # FIXME: should one day make use of git-config --section-remove, @@ -741,7 +766,7 @@ class Series(PatchSet): if not name: raise StackException, 'No patches applied' - patch = Patch(name, self.__patch_dir, self.__refs_dir) + patch = self.get_patch(name) descr = patch.get_description() if not (message or descr): @@ -750,6 +775,8 @@ class Series(PatchSet): elif message: descr = message + # TODO: move this out of the stgit.stack module, it is really + # for higher level commands to handle the user interaction if not message and edit: descr = edit_file(self, descr.rstrip(), \ 'Please edit the description for patch "%s" ' \ @@ -766,14 +793,7 @@ class Series(PatchSet): if not committer_email: committer_email = patch.get_commemail() - if sign_str: - descr = descr.rstrip() - if descr.find("\nSigned-off-by:") < 0 \ - and descr.find("\nAcked-by:") < 0: - descr = descr + "\n" - - descr = '%s\n%s: %s <%s>\n' % (descr, sign_str, - committer_name, committer_email) + descr = add_sign_line(descr, sign_str, committer_name, committer_email) bottom = patch.get_bottom() @@ -807,7 +827,7 @@ class Series(PatchSet): name = self.get_current() assert(name) - patch = Patch(name, self.__patch_dir, self.__refs_dir) + patch = self.get_patch(name) old_bottom = patch.get_old_bottom() old_top = patch.get_old_top() @@ -835,6 +855,8 @@ class Series(PatchSet): if self.patch_exists(name): raise StackException, 'Patch "%s" already exists' % name + # TODO: move this out of the stgit.stack module, it is really + # for higher level commands to handle the user interaction if not message and can_edit: descr = edit_file( self, None, @@ -848,7 +870,7 @@ class Series(PatchSet): if name == None: name = make_patch_name(descr, self.patch_exists) - patch = Patch(name, self.__patch_dir, self.__refs_dir) + patch = self.get_patch(name) patch.create() if not bottom: @@ -903,7 +925,7 @@ class Series(PatchSet): """Deletes a patch """ self.__patch_name_valid(name) - patch = Patch(name, self.__patch_dir, self.__refs_dir) + patch = self.get_patch(name) if self.__patch_is_current(patch): self.pop_patch(name) @@ -936,7 +958,7 @@ class Series(PatchSet): for name in names: assert(name in unapplied) - patch = Patch(name, self.__patch_dir, self.__refs_dir) + patch = self.get_patch(name) head = top bottom = patch.get_bottom() @@ -1002,8 +1024,7 @@ class Series(PatchSet): patches detected to have been applied. The state of the tree is restored to the original one """ - patches = [Patch(name, self.__patch_dir, self.__refs_dir) - for name in names] + patches = [self.get_patch(name) for name in names] patches.reverse() merged = [] @@ -1022,7 +1043,7 @@ class Series(PatchSet): unapplied = self.get_unapplied() assert(name in unapplied) - patch = Patch(name, self.__patch_dir, self.__refs_dir) + patch = self.get_patch(name) head = git.get_head() bottom = patch.get_bottom() @@ -1096,7 +1117,7 @@ class Series(PatchSet): name = self.get_current() assert(name) - patch = Patch(name, self.__patch_dir, self.__refs_dir) + patch = self.get_patch(name) old_bottom = patch.get_old_bottom() old_top = patch.get_old_top() @@ -1122,7 +1143,7 @@ class Series(PatchSet): applied.reverse() assert(name in applied) - patch = Patch(name, self.__patch_dir, self.__refs_dir) + patch = self.get_patch(name) if git.get_head_file() == self.get_name(): if keep and not git.apply_diff(git.get_head(), patch.get_bottom()): @@ -1148,7 +1169,7 @@ class Series(PatchSet): """Returns True if the patch is empty """ self.__patch_name_valid(name) - patch = Patch(name, self.__patch_dir, self.__refs_dir) + patch = self.get_patch(name) bottom = patch.get_bottom() top = patch.get_top() @@ -1173,11 +1194,11 @@ class Series(PatchSet): raise StackException, 'Patch "%s" already exists' % newname if oldname in unapplied: - Patch(oldname, self.__patch_dir, self.__refs_dir).rename(newname) + self.get_patch(oldname).rename(newname) unapplied[unapplied.index(oldname)] = newname write_strings(self.__unapplied_file, unapplied) elif oldname in applied: - Patch(oldname, self.__patch_dir, self.__refs_dir).rename(newname) + self.get_patch(oldname).rename(newname) applied[applied.index(oldname)] = newname write_strings(self.__applied_file, applied)