X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/bae29dddde41058567a5ef9b44c160dd76b1c025..09d8f8c55a4193fbabba723c2f257b447c0edaf4:/stgit/stack.py diff --git a/stgit/stack.py b/stgit/stack.py index dc7c19f..0a20f4b 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import sys, os from stgit.utils import * -from stgit import git +from stgit import git, basedir, templates from stgit.config import config @@ -65,14 +65,14 @@ def __clean_comments(f): f.writelines(lines) def edit_file(series, line, comment, show_patch = True): - fname = '.stgit.msg' - tmpl = os.path.join(git.get_base_dir(), 'patchdescr.tmpl') + fname = '.stgitmsg.txt' + tmpl = templates.get_template('patchdescr.tmpl') f = file(fname, 'w+') if line: print >> f, line - elif os.path.isfile(tmpl): - print >> f, file(tmpl).read().rstrip() + elif tmpl: + print >> f, tmpl, else: print >> f print >> f, __comment_prefix, comment @@ -119,35 +119,18 @@ def edit_file(series, line, comment, show_patch = True): # Classes # -class Patch: - """Basic patch implementation +class StgitObject: + """An object with stgit-like properties stored as files in a directory """ - def __init__(self, name, patch_dir): - self.__patch_dir = patch_dir - self.__name = name - self.__dir = os.path.join(self.__patch_dir, self.__name) - - def create(self): - os.mkdir(self.__dir) - create_empty_file(os.path.join(self.__dir, 'bottom')) - create_empty_file(os.path.join(self.__dir, 'top')) - - def delete(self): - for f in os.listdir(self.__dir): - os.remove(os.path.join(self.__dir, f)) - os.rmdir(self.__dir) - - def get_name(self): - return self.__name + def _set_dir(self, dir): + self.__dir = dir + def _dir(self): + return self.__dir - def rename(self, newname): - olddir = self.__dir - self.__name = newname - self.__dir = os.path.join(self.__patch_dir, self.__name) + def create_empty_field(self, name): + create_empty_file(os.path.join(self.__dir, name)) - os.rename(olddir, self.__dir) - - def __get_field(self, name, multiline = False): + def _get_field(self, name, multiline = False): id_file = os.path.join(self.__dir, name) if os.path.isfile(id_file): line = read_string(id_file, multiline) @@ -158,120 +141,190 @@ class Patch: else: return None - def __set_field(self, name, value, multiline = False): + def _set_field(self, name, value, multiline = False): fname = os.path.join(self.__dir, name) if value and value != '': write_string(fname, value, multiline) elif os.path.isfile(fname): os.remove(fname) + +class Patch(StgitObject): + """Basic patch implementation + """ + def __init__(self, name, series_dir, refs_dir): + 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') + + def create(self): + os.mkdir(self._dir()) + self.create_empty_field('bottom') + self.create_empty_field('top') + + def delete(self): + 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) + + 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 + 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') + + 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) + + def __update_log_ref(self, ref): + write_string(self.__log_ref_file, ref) + + def update_top_ref(self): + top = self.get_top() + if top: + self.__update_top_ref(top) + def get_old_bottom(self): - return self.__get_field('bottom.old') + return self._get_field('bottom.old') def get_bottom(self): - return self.__get_field('bottom') + return self._get_field('bottom') def set_bottom(self, value, backup = False): if backup: - curr = self.__get_field('bottom') - if curr != value: - self.__set_field('bottom.old', curr) - else: - self.__set_field('bottom.old', None) - self.__set_field('bottom', value) + curr = self._get_field('bottom') + self._set_field('bottom.old', curr) + self._set_field('bottom', value) def get_old_top(self): - return self.__get_field('top.old') + return self._get_field('top.old') def get_top(self): - return self.__get_field('top') + return self._get_field('top') def set_top(self, value, backup = False): if backup: - curr = self.__get_field('top') - if curr != value: - self.__set_field('top.old', curr) - else: - self.__set_field('top.old', None) - self.__set_field('top', value) + curr = self._get_field('top') + self._set_field('top.old', curr) + self._set_field('top', value) + self.__update_top_ref(value) def restore_old_boundaries(self): - bottom = self.__get_field('bottom.old') - top = self.__get_field('top.old') + bottom = self._get_field('bottom.old') + top = self._get_field('top.old') if top and bottom: - self.__set_field('bottom', bottom) - self.__set_field('top', top) + self._set_field('bottom', bottom) + self._set_field('top', top) + self.__update_top_ref(top) return True else: return False def get_description(self): - return self.__get_field('description', True) + return self._get_field('description', True) def set_description(self, line): - self.__set_field('description', line, True) + self._set_field('description', line, True) def get_authname(self): - return self.__get_field('authname') + return self._get_field('authname') def set_authname(self, name): - if not name and config.has_option('stgit', 'authname'): - name = config.get('stgit', 'authname') - self.__set_field('authname', name) + self._set_field('authname', name or git.author().name) def get_authemail(self): - return self.__get_field('authemail') + return self._get_field('authemail') - def set_authemail(self, address): - if not address and config.has_option('stgit', 'authemail'): - address = config.get('stgit', 'authemail') - self.__set_field('authemail', address) + def set_authemail(self, email): + self._set_field('authemail', email or git.author().email) def get_authdate(self): - return self.__get_field('authdate') + return self._get_field('authdate') - def set_authdate(self, authdate): - self.__set_field('authdate', authdate) + def set_authdate(self, date): + self._set_field('authdate', date or git.author().date) def get_commname(self): - return self.__get_field('commname') + return self._get_field('commname') def set_commname(self, name): - if not name and config.has_option('stgit', 'commname'): - name = config.get('stgit', 'commname') - self.__set_field('commname', name) + self._set_field('commname', name or git.committer().name) def get_commemail(self): - return self.__get_field('commemail') + return self._get_field('commemail') + + def set_commemail(self, email): + self._set_field('commemail', email or git.committer().email) - def set_commemail(self, address): - if not address and config.has_option('stgit', 'commemail'): - address = config.get('stgit', 'commemail') - self.__set_field('commemail', address) + def get_log(self): + return self._get_field('log') + def set_log(self, value, backup = False): + self._set_field('log', value) + self.__update_log_ref(value) -class Series: + +class Series(StgitObject): """Class including the operations on series """ def __init__(self, name = None): """Takes a series name as the parameter. """ - if name: - self.__name = name - else: - self.__name = git.get_head_file() - - if self.__name: - base_dir = git.get_base_dir() - self.__patch_dir = os.path.join(base_dir, 'patches', - self.__name) - self.__base_file = os.path.join(base_dir, 'refs', 'bases', - self.__name) - self.__applied_file = os.path.join(self.__patch_dir, 'applied') - self.__unapplied_file = os.path.join(self.__patch_dir, 'unapplied') - self.__current_file = os.path.join(self.__patch_dir, 'current') - self.__descr_file = os.path.join(self.__patch_dir, 'description') + try: + if name: + self.__name = name + else: + self.__name = git.get_head_file() + self.__base_dir = basedir.get() + except git.GitException, ex: + raise StackException, 'GIT tree not initialised: %s' % ex + + self._set_dir(os.path.join(self.__base_dir, 'patches', self.__name)) + self.__refs_dir = os.path.join(self.__base_dir, 'refs', 'patches', + self.__name) + self.__base_file = os.path.join(self.__base_dir, 'refs', 'bases', + self.__name) + + self.__applied_file = os.path.join(self._dir(), 'applied') + self.__unapplied_file = os.path.join(self._dir(), 'unapplied') + self.__current_file = os.path.join(self._dir(), 'current') + self.__descr_file = os.path.join(self._dir(), 'description') + + # where this series keeps its patches + self.__patch_dir = os.path.join(self._dir(), 'patches') + if not os.path.isdir(self.__patch_dir): + self.__patch_dir = self._dir() + + # if no __refs_dir, create and populate it (upgrade old repositories) + if self.is_initialised() and not os.path.isdir(self.__refs_dir): + os.makedirs(self.__refs_dir) + for patch in self.get_applied() + self.get_unapplied(): + self.get_patch(patch).update_top_ref() + + # trash directory + self.__trash_dir = os.path.join(self._dir(), 'trash') + if self.is_initialised() and not os.path.isdir(self.__trash_dir): + os.makedirs(self.__trash_dir) def get_branch(self): """Return the branch name for the Series object @@ -281,23 +334,25 @@ class Series: def __set_current(self, name): """Sets the topmost patch """ - if name: - write_string(self.__current_file, name) - else: - create_empty_file(self.__current_file) + self._set_field('current', name) def get_patch(self, name): """Return a Patch object for the given name """ - return Patch(name, self.__patch_dir) + return Patch(name, self.__patch_dir, self.__refs_dir) - def get_current(self): - """Return a Patch object representing the topmost patch - """ - if os.path.isfile(self.__current_file): - name = read_string(self.__current_file) - else: + def get_current_patch(self): + """Return a Patch object representing the topmost patch, or + None if there is no such patch.""" + crt = self.get_current() + if not crt: return None + return Patch(crt, self.__patch_dir, self.__refs_dir) + + def get_current(self): + """Return the name of the topmost patch, or None if there is + no such patch.""" + name = self._get_field('current') if name == '': return None else: @@ -320,40 +375,46 @@ class Series: return names def get_base_file(self): + self.__begin_stack_check() return self.__base_file def get_protected(self): - return os.path.isfile(os.path.join(self.__patch_dir, 'protected')) + return os.path.isfile(os.path.join(self._dir(), 'protected')) def protect(self): - protect_file = os.path.join(self.__patch_dir, 'protected') + protect_file = os.path.join(self._dir(), 'protected') if not os.path.isfile(protect_file): create_empty_file(protect_file) def unprotect(self): - protect_file = os.path.join(self.__patch_dir, 'protected') + protect_file = os.path.join(self._dir(), 'protected') if os.path.isfile(protect_file): os.remove(protect_file) def get_description(self): - if os.path.isfile(self.__descr_file): - return read_string(self.__descr_file) - else: - return '' + return self._get_field('description') + + def set_description(self, line): + self._set_field('description', line) def __patch_is_current(self, patch): - return patch.get_name() == read_string(self.__current_file) + return patch.get_name() == self.get_current() - def __patch_applied(self, name): + def patch_applied(self, name): """Return true if the patch exists in the applied list """ return name in self.get_applied() - def __patch_unapplied(self, name): + def patch_unapplied(self, name): """Return true if the patch exists in the unapplied list """ return name in self.get_unapplied() + def patch_exists(self, name): + """Return true if there is a patch with the given name, false + otherwise.""" + return self.patch_applied(name) or self.patch_unapplied(name) + def __begin_stack_check(self): """Save the current HEAD into .git/refs/heads/base if the stack is empty @@ -373,34 +434,79 @@ class Series: def head_top_equal(self): """Return true if the head and the top are the same """ - crt = self.get_current() + crt = self.get_current_patch() if not crt: # we don't care, no patches applied return True - return git.get_head() == Patch(crt, self.__patch_dir).get_top() + return git.get_head() == crt.get_top() def is_initialised(self): """Checks if series is already initialised """ return os.path.isdir(self.__patch_dir) - def init(self): + def init(self, create_at=False): """Initialises the stgit series """ - bases_dir = os.path.join(git.get_base_dir(), 'refs', 'bases') + bases_dir = os.path.join(self.__base_dir, 'refs', 'bases') - if self.is_initialised(): + if os.path.exists(self.__patch_dir): raise StackException, self.__patch_dir + ' already exists' + if os.path.exists(self.__refs_dir): + raise StackException, self.__refs_dir + ' already exists' + if os.path.exists(self.__base_file): + raise StackException, self.__base_file + ' already exists' + + if (create_at!=False): + git.create_branch(self.__name, create_at) + os.makedirs(self.__patch_dir) - if not os.path.isdir(bases_dir): - os.makedirs(bases_dir) + create_dirs(bases_dir) - create_empty_file(self.__applied_file) - create_empty_file(self.__unapplied_file) - create_empty_file(self.__descr_file) + self.create_empty_field('applied') + self.create_empty_field('unapplied') + self.create_empty_field('description') + os.makedirs(os.path.join(self._dir(), 'patches')) + os.makedirs(self.__refs_dir) self.__begin_stack_check() + def convert(self): + """Either convert to use a separate patch directory, or + unconvert to place the patches in the same directory with + series control files + """ + if self.__patch_dir == self._dir(): + print 'Converting old-style to new-style...', + sys.stdout.flush() + + self.__patch_dir = os.path.join(self._dir(), 'patches') + os.makedirs(self.__patch_dir) + + for p in self.get_applied() + self.get_unapplied(): + src = os.path.join(self._dir(), p) + dest = os.path.join(self.__patch_dir, p) + os.rename(src, dest) + + print 'done' + + else: + print 'Converting new-style to old-style...', + sys.stdout.flush() + + for p in self.get_applied() + self.get_unapplied(): + src = os.path.join(self.__patch_dir, p) + dest = os.path.join(self._dir(), p) + os.rename(src, dest) + + if not os.listdir(self.__patch_dir): + os.rmdir(self.__patch_dir) + print 'done' + else: + print 'Patch directory %s is not empty.' % self.__name + + self.__patch_dir = self._dir() + def rename(self, to_name): """Renames a series """ @@ -413,13 +519,54 @@ class Series: git.rename_branch(self.__name, to_name) - if os.path.isdir(self.__patch_dir): - os.rename(self.__patch_dir, to_stack.__patch_dir) + if os.path.isdir(self._dir()): + rename(os.path.join(self.__base_dir, 'patches'), + self.__name, to_stack.__name) if os.path.exists(self.__base_file): - os.rename(self.__base_file, to_stack.__base_file) + rename(os.path.join(self.__base_dir, 'refs', 'bases'), + self.__name, to_stack.__name) + if os.path.exists(self.__refs_dir): + rename(os.path.join(self.__base_dir, 'refs', 'patches'), + self.__name, to_stack.__name) self.__init__(to_name) + def clone(self, target_series): + """Clones a series + """ + try: + # allow cloning of branches not under StGIT control + base = read_string(self.get_base_file()) + except: + base = git.get_head() + Series(target_series).init(create_at = base) + new_series = Series(target_series) + + # generate an artificial description file + new_series.set_description('clone of "%s"' % self.__name) + + # clone self's entire series as unapplied patches + try: + # allow cloning of branches not under StGIT control + applied = self.get_applied() + unapplied = self.get_unapplied() + patches = applied + unapplied + patches.reverse() + except: + patches = applied = unapplied = [] + for p in patches: + patch = self.get_patch(p) + new_series.new_patch(p, message = patch.get_description(), + can_edit = False, unapplied = True, + bottom = patch.get_bottom(), + top = patch.get_top(), + author_name = patch.get_authname(), + author_email = patch.get_authemail(), + author_date = patch.get_authdate()) + + # fast forward the cloned series to self's top + new_series.forward_patches(applied) + def delete(self, force = False): """Deletes an stgit series """ @@ -429,8 +576,15 @@ class Series: raise StackException, \ 'Cannot delete: the series still contains patches' for p in patches: - Patch(p, self.__patch_dir).delete() + Patch(p, self.__patch_dir, self.__refs_dir).delete() + # remove the trash directory + for fname in os.listdir(self.__trash_dir): + os.remove(fname) + os.rmdir(self.__trash_dir) + + # FIXME: find a way to get rid of those manual removals + # (move functionnality to StgitObject ?) if os.path.exists(self.__applied_file): os.remove(self.__applied_file) if os.path.exists(self.__unapplied_file): @@ -442,23 +596,36 @@ class Series: if not os.listdir(self.__patch_dir): os.rmdir(self.__patch_dir) else: + print 'Patch directory %s is not empty.' % self.__name + if not os.listdir(self._dir()): + remove_dirs(os.path.join(self.__base_dir, 'patches'), + self.__name) + else: print 'Series directory %s is not empty.' % self.__name + if not os.listdir(self.__refs_dir): + remove_dirs(os.path.join(self.__base_dir, 'refs', 'patches'), + self.__name) + else: + print 'Refs directory %s is not empty.' % self.__refs_dir if os.path.exists(self.__base_file): - os.remove(self.__base_file) + remove_file_and_dirs( + os.path.join(self.__base_dir, 'refs', 'bases'), self.__name) - def refresh_patch(self, message = None, edit = False, show_patch = False, + def refresh_patch(self, files = None, message = None, edit = False, + show_patch = False, cache_update = True, author_name = None, author_email = None, author_date = None, - committer_name = None, committer_email = None): + committer_name = None, committer_email = None, + backup = False, sign_str = None, log = 'refresh'): """Generates a new commit for the given patch """ name = self.get_current() if not name: raise StackException, 'No patches applied' - patch = Patch(name, self.__patch_dir) + patch = Patch(name, self.__patch_dir, self.__refs_dir) descr = patch.get_description() if not (message or descr): @@ -483,7 +650,14 @@ class Series: if not committer_email: committer_email = patch.get_commemail() - commit_id = git.commit(message = descr, parents = [patch.get_bottom()], + if sign_str: + descr = '%s\n%s: %s <%s>\n' % (descr.rstrip(), sign_str, + committer_name, committer_email) + + bottom = patch.get_bottom() + + commit_id = git.commit(files = files, + message = descr, parents = [bottom], cache_update = cache_update, allowempty = True, author_name = author_name, @@ -492,7 +666,8 @@ class Series: committer_name = committer_name, committer_email = committer_email) - patch.set_top(commit_id) + patch.set_bottom(bottom, backup = backup) + patch.set_top(commit_id, backup = backup) patch.set_description(descr) patch.set_authname(author_name) patch.set_authemail(author_email) @@ -500,16 +675,40 @@ class Series: patch.set_commname(committer_name) patch.set_commemail(committer_email) + if log: + self.log_patch(patch, log) + return commit_id + def undo_refresh(self): + """Undo the patch boundaries changes caused by 'refresh' + """ + name = self.get_current() + assert(name) + + patch = Patch(name, self.__patch_dir, self.__refs_dir) + old_bottom = patch.get_old_bottom() + old_top = patch.get_old_top() + + # the bottom of the patch is not changed by refresh. If the + # old_bottom is different, there wasn't any previous 'refresh' + # command (probably only a 'push') + if old_bottom != patch.get_bottom() or old_top == patch.get_top(): + raise StackException, 'No refresh undo information available' + + git.reset(tree_id = old_top, check_out = False) + if patch.restore_old_boundaries(): + self.log_patch(patch, 'undo') + def new_patch(self, name, message = None, can_edit = True, unapplied = False, show_patch = False, top = None, bottom = None, author_name = None, author_email = None, author_date = None, - committer_name = None, committer_email = None): + committer_name = None, committer_email = None, + before_existing = False, refresh = True): """Creates a new patch """ - if self.__patch_applied(name) or self.__patch_unapplied(name): + if self.patch_applied(name) or self.patch_unapplied(name): raise StackException, 'Patch "%s" already exists' % name if not message and can_edit: @@ -523,7 +722,7 @@ class Series: self.__begin_stack_check() - patch = Patch(name, self.__patch_dir) + patch = Patch(name, self.__patch_dir, self.__refs_dir) patch.create() if bottom: @@ -543,28 +742,41 @@ class Series: patch.set_commemail(committer_email) if unapplied: + self.log_patch(patch, 'new') + patches = [patch.get_name()] + self.get_unapplied() f = file(self.__unapplied_file, 'w+') f.writelines([line + '\n' for line in patches]) f.close() + elif before_existing: + self.log_patch(patch, 'new') + + insert_string(self.__applied_file, patch.get_name()) + if not self.get_current(): + self.__set_current(name) else: append_string(self.__applied_file, patch.get_name()) self.__set_current(name) + if refresh: + self.refresh_patch(cache_update = False, log = 'new') def delete_patch(self, name): """Deletes a patch """ - patch = Patch(name, self.__patch_dir) + patch = Patch(name, self.__patch_dir, self.__refs_dir) if self.__patch_is_current(patch): self.pop_patch(name) - elif self.__patch_applied(name): + elif self.patch_applied(name): raise StackException, 'Cannot remove an applied patch, "%s", ' \ 'which is not current' % name elif not name in self.get_unapplied(): raise StackException, 'Unknown patch "%s"' % name + # save the commit id to a trash file + write_string(os.path.join(self.__trash_dir, name), patch.get_top()) + patch.delete() unapplied = self.get_unapplied() @@ -572,6 +784,7 @@ class Series: f = file(self.__unapplied_file, 'w+') f.writelines([line + '\n' for line in unapplied]) f.close() + self.__begin_stack_check() def forward_patches(self, names): """Try to fast-forward an array of patches. @@ -588,7 +801,7 @@ class Series: for name in names: assert(name in unapplied) - patch = Patch(name, self.__patch_dir) + patch = Patch(name, self.__patch_dir, self.__refs_dir) head = top bottom = patch.get_bottom() @@ -596,7 +809,8 @@ class Series: # top != bottom always since we have a commit for each patch if head == bottom: - # reset the backup information + # reset the backup information. No logging since the + # patch hasn't changed patch.set_bottom(head, backup = True) patch.set_top(top, backup = True) @@ -627,6 +841,8 @@ class Series: patch.set_bottom(head, backup = True) patch.set_top(top, backup = True) + + self.log_patch(patch, 'push(f)') else: top = head # stop the fast-forwarding, must do a real merge @@ -635,6 +851,9 @@ class Series: forwarded+=1 unapplied.remove(name) + if forwarded == 0: + return 0 + git.switch(top) append_strings(self.__applied_file, names[0:forwarded]) @@ -647,7 +866,27 @@ class Series: return forwarded - def push_patch(self, name): + def merged_patches(self, names): + """Test which patches were merged upstream by reverse-applying + them in reverse order. The function returns the list of + 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.reverse() + + merged = [] + for p in patches: + if git.apply_diff(p.get_top(), p.get_bottom()): + merged.append(p.get_name()) + merged.reverse() + + git.reset() + + return merged + + def push_patch(self, name, empty = False): """Pushes a patch on the stack """ unapplied = self.get_unapplied() @@ -655,7 +894,7 @@ class Series: self.__begin_stack_check() - patch = Patch(name, self.__patch_dir) + patch = Patch(name, self.__patch_dir, self.__refs_dir) head = git.get_head() bottom = patch.get_bottom() @@ -665,8 +904,16 @@ class Series: modified = False # top != bottom always since we have a commit for each patch - if head == bottom: - # reset the backup information + if empty: + # just make an empty patch (top = bottom = HEAD). This + # option is useful to allow undoing already merged + # patches. The top is updated by refresh_patch since we + # need an empty commit + patch.set_bottom(head, backup = True) + patch.set_top(head, backup = True) + modified = True + elif head == bottom: + # reset the backup information. No need for logging patch.set_bottom(bottom, backup = True) patch.set_top(top, backup = True) @@ -702,11 +949,15 @@ class Series: self.__set_current(name) # head == bottom case doesn't need to refresh the patch - if head != bottom: + if empty or head != bottom: if not ex: # if the merge was OK and no conflicts, just refresh the patch # The GIT cache was already updated by the merge operation - self.refresh_patch(cache_update = False) + if modified: + log = 'push(m)' + else: + log = 'push' + self.refresh_patch(cache_update = False, log = log) else: raise StackException, str(ex) @@ -716,21 +967,40 @@ class Series: name = self.get_current() assert(name) - patch = Patch(name, self.__patch_dir) + patch = Patch(name, self.__patch_dir, self.__refs_dir) + old_bottom = patch.get_old_bottom() + old_top = patch.get_old_top() + + # the top of the patch is changed by a push operation only + # together with the bottom (otherwise the top was probably + # modified by 'refresh'). If they are both unchanged, there + # was a fast forward + if old_bottom == patch.get_bottom() and old_top != patch.get_top(): + raise StackException, 'No push undo information available' + git.reset() self.pop_patch(name) - return patch.restore_old_boundaries() + ret = patch.restore_old_boundaries() + if ret: + self.log_patch(patch, 'undo') + + return ret - def pop_patch(self, name): + def pop_patch(self, name, keep = False): """Pops the top patch from the stack """ applied = self.get_applied() applied.reverse() assert(name in applied) - patch = Patch(name, self.__patch_dir) + patch = Patch(name, self.__patch_dir, self.__refs_dir) - git.switch(patch.get_bottom()) + # only keep the local changes + if keep and not git.apply_diff(git.get_head(), patch.get_bottom()): + raise StackException, \ + 'Failed to pop patches while preserving the local changes' + + git.switch(patch.get_bottom(), keep) # save the new applied list idx = applied.index(name) + 1 @@ -760,7 +1030,7 @@ class Series: def empty_patch(self, name): """Returns True if the patch is empty """ - patch = Patch(name, self.__patch_dir) + patch = Patch(name, self.__patch_dir, self.__refs_dir) bottom = patch.get_bottom() top = patch.get_top() @@ -783,14 +1053,14 @@ class Series: raise StackException, 'Patch "%s" already exists' % newname if oldname in unapplied: - Patch(oldname, self.__patch_dir).rename(newname) + Patch(oldname, self.__patch_dir, self.__refs_dir).rename(newname) unapplied[unapplied.index(oldname)] = newname f = file(self.__unapplied_file, 'w+') f.writelines([line + '\n' for line in unapplied]) f.close() elif oldname in applied: - Patch(oldname, self.__patch_dir).rename(newname) + Patch(oldname, self.__patch_dir, self.__refs_dir).rename(newname) if oldname == self.get_current(): self.__set_current(newname) @@ -801,3 +1071,20 @@ class Series: f.close() else: raise StackException, 'Unknown patch "%s"' % oldname + + def log_patch(self, patch, message): + """Generate a log commit for a patch + """ + top = git.get_commit(patch.get_top()) + msg = '%s\t%s' % (message, top.get_id_hash()) + + old_log = patch.get_log() + if old_log: + parents = [old_log] + else: + parents = [] + + log = git.commit(message = msg, parents = parents, + cache_update = False, tree_id = top.get_tree(), + allowempty = True) + patch.set_log(log)