From: Karl Hasselström Date: Tue, 15 Apr 2008 20:04:14 +0000 (+0200) Subject: If a patch is not changed when pushing, reuse the same commit object X-Git-Tag: v0.15-rc1~247 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/352446d45ea5eddb05d77179eeb94cec424587c7?hp=-c If a patch is not changed when pushing, reuse the same commit object It should be marginally faster since we don't have to create a new commit object, but mostly it's a cleanliness issue: rewriting history when we don't have to is bad. Signed-off-by: Karl Hasselström --- 352446d45ea5eddb05d77179eeb94cec424587c7 diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py index 2946a67..1ece01e 100644 --- a/stgit/lib/transaction.py +++ b/stgit/lib/transaction.py @@ -1,4 +1,5 @@ from stgit import exception, utils +from stgit.utils import any, all from stgit.out import * from stgit.lib import git @@ -175,8 +176,8 @@ class StackTransaction(object): """Attempt to push the named patch. If this results in conflicts, halts the transaction. If index+worktree are given, spill any conflicts to them.""" - cd = self.patches[pn].data - cd = cd.set_committer(None) + orig_cd = self.patches[pn].data + cd = orig_cd.set_committer(None) s = ['', ' (empty)'][cd.is_nochange()] oldparent = cd.parent cd = cd.set_parent(self.__head) @@ -204,7 +205,11 @@ class StackTransaction(object): except git.MergeException, e: self.__halt(str(e)) cd = cd.set_tree(tree) - self.patches[pn] = self.__stack.repository.commit(cd) + if any(getattr(cd, a) != getattr(orig_cd, a) for a in + ['parent', 'tree', 'author', 'message']): + self.patches[pn] = self.__stack.repository.commit(cd) + else: + s = ' (unmodified)' del self.unapplied[self.unapplied.index(pn)] self.applied.append(pn) out.info('Pushed %s%s' % (pn, s))