X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/9a6bcbe26b6032c39031773da020fd7bf4015953..ca2160163b2a8209e5b04e155a8f4dafbe9334c8:/stgit/stack.py diff --git a/stgit/stack.py b/stgit/stack.py index adfff25..d889f37 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -23,6 +23,7 @@ from email.Utils import formatdate from stgit.utils import * from stgit.out import * +from stgit.run import * from stgit import git, basedir, templates from stgit.config import config from shutil import copyfile @@ -508,11 +509,17 @@ class Series(PatchSet): raise StackException, 'Branch "%s" not initialised' % self.get_name() return read_strings(self.__applied_file) + def set_applied(self, applied): + write_strings(self.__applied_file, applied) + def get_unapplied(self): if not os.path.isfile(self.__unapplied_file): raise StackException, 'Branch "%s" not initialised' % self.get_name() return read_strings(self.__unapplied_file) + def set_unapplied(self, unapplied): + write_strings(self.__unapplied_file, unapplied) + def get_hidden(self): if not os.path.isfile(self.__hidden_file): return [] @@ -754,15 +761,13 @@ class Series(PatchSet): author_date = None, committer_name = None, committer_email = None, backup = False, sign_str = None, log = 'refresh', - notes = None): - """Generates a new commit for the given patch + notes = None, bottom = None): + """Generates a new commit for the topmost patch """ - name = self.get_current() - if not name: + patch = self.get_current_patch() + if not patch: raise StackException, 'No patches applied' - patch = self.get_patch(name) - descr = patch.get_description() if not (message or descr): edit = True @@ -775,7 +780,7 @@ class Series(PatchSet): if not message and edit: descr = edit_file(self, descr.rstrip(), \ 'Please edit the description for patch "%s" ' \ - 'above.' % name, show_patch) + 'above.' % patch.get_name(), show_patch) if not author_name: author_name = patch.get_authname() @@ -790,7 +795,8 @@ class Series(PatchSet): descr = add_sign_line(descr, sign_str, committer_name, committer_email) - bottom = patch.get_bottom() + if not bottom: + bottom = patch.get_bottom() commit_id = git.commit(files = files, message = descr, parents = [bottom], @@ -842,9 +848,16 @@ class Series(PatchSet): author_name = None, author_email = None, author_date = None, committer_name = None, committer_email = None, before_existing = False): - """Creates a new patch + """Creates a new patch, either pointing to an existing commit object, + or by creating a new commit object. """ + assert commit or (top and bottom) + assert not before_existing or (top and bottom) + assert not (commit and before_existing) + assert (top and bottom) or (not top and not bottom) + assert not top or (bottom == git.get_commit(top).get_parent()) + if name != None: self.__patch_name_valid(name) if self.patch_exists(name): @@ -868,13 +881,6 @@ class Series(PatchSet): patch = self.get_patch(name) patch.create() - if not bottom: - bottom = head - if not top: - top = head - - patch.set_bottom(bottom) - patch.set_top(top) patch.set_description(descr) patch.set_authname(author_name) patch.set_authemail(author_email) @@ -884,9 +890,6 @@ class Series(PatchSet): if before_existing: insert_string(self.__applied_file, patch.get_name()) - # no need to commit anything as the object is already - # present (mainly used by 'uncommit') - commit = False elif unapplied: patches = [patch.get_name()] + self.get_unapplied() write_strings(self.__unapplied_file, patches) @@ -896,10 +899,15 @@ class Series(PatchSet): set_head = True if commit: + if top: + top_commit = git.get_commit(top) + else: + bottom = head + top_commit = git.get_commit(head) + # create a commit for the patch (may be empty if top == bottom); # only commit on top of the current branch assert(unapplied or bottom == head) - top_commit = git.get_commit(top) commit_id = git.commit(message = descr, parents = [bottom], cache_update = False, tree_id = top_commit.get_tree(), @@ -910,7 +918,12 @@ class Series(PatchSet): committer_name = committer_name, committer_email = committer_email) # set the patch top to the new commit + patch.set_bottom(bottom) patch.set_top(commit_id) + else: + assert top != bottom + patch.set_bottom(bottom) + patch.set_top(top) self.log_patch(patch, 'new') @@ -1032,7 +1045,23 @@ class Series(PatchSet): return merged - def push_patch(self, name, empty = False): + def push_empty_patch(self, name): + """Pushes an empty patch on the stack + """ + unapplied = self.get_unapplied() + assert(name in unapplied) + + # patch = self.get_patch(name) + head = git.get_head() + + append_string(self.__applied_file, name) + + unapplied.remove(name) + write_strings(self.__unapplied_file, unapplied) + + self.refresh_patch(bottom = head, cache_update = False, log = 'push(m)') + + def push_patch(self, name): """Pushes a patch on the stack """ unapplied = self.get_unapplied() @@ -1043,68 +1072,61 @@ class Series(PatchSet): head = git.get_head() bottom = patch.get_bottom() top = patch.get_top() + # top != bottom always since we have a commit for each patch + if head == bottom: + # A fast-forward push. Just reset the backup + # information. No need for logging + patch.set_bottom(bottom, backup = True) + patch.set_top(top, backup = True) + + git.switch(top) + append_string(self.__applied_file, name) + + unapplied.remove(name) + write_strings(self.__unapplied_file, unapplied) + return False + + # Need to create a new commit an merge in the old patch ex = None modified = False - # top != bottom always since we have a commit for each patch - 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) + # Try the fast applying first. If this fails, fall back to the + # three-way merge + if not git.apply_diff(bottom, top): + # if git.apply_diff() fails, the patch requires a diff3 + # merge and can be reported as modified 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) - git.switch(top) - else: - # new patch needs to be refreshed. - # The current patch is empty after merge. - patch.set_bottom(head, backup = True) - patch.set_top(head, backup = True) - - # Try the fast applying first. If this fails, fall back to the - # three-way merge - if not git.apply_diff(bottom, top): - # if git.apply_diff() fails, the patch requires a diff3 - # merge and can be reported as modified - modified = True - - # merge can fail but the patch needs to be pushed - try: - git.merge(bottom, head, top, recursive = True) - except git.GitException, ex: - out.error('The merge failed during "push".', - 'Use "refresh" after fixing the conflicts or' - ' revert the operation with "push --undo".') + # merge can fail but the patch needs to be pushed + try: + git.merge(bottom, head, top, recursive = True) + except git.GitException, ex: + out.error('The merge failed during "push".', + 'Use "refresh" after fixing the conflicts or' + ' revert the operation with "push --undo".') append_string(self.__applied_file, name) unapplied.remove(name) write_strings(self.__unapplied_file, unapplied) - # head == bottom case doesn't need to refresh the patch - 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 - if modified: - log = 'push(m)' - else: - log = 'push' - self.refresh_patch(cache_update = False, log = log) + 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 + if modified: + log = 'push(m)' else: - # we store the correctly merged files only for - # tracking the conflict history. Note that the - # git.merge() operations should always leave the index - # in a valid state (i.e. only stage 0 files) - self.refresh_patch(cache_update = False, log = 'push(c)') - raise StackException, str(ex) + log = 'push' + self.refresh_patch(bottom = head, cache_update = False, log = log) + else: + # we store the correctly merged files only for + # tracking the conflict history. Note that the + # git.merge() operations should always leave the index + # in a valid state (i.e. only stage 0 files) + self.refresh_patch(bottom = head, cache_update = False, + log = 'push(c)') + raise StackException, str(ex) return modified