From: Catalin Marinas Date: Tue, 28 Apr 2009 15:09:46 GMT Subject: [StGit PATCH 2/9] Show some progress information when checking for upstream merges. Message-ID: <20090428150946.27261.60198.stgit@pc1117.cambridge.arm.com> In-Reply-To: <20090428150742.27261.19620.stgit@pc1117.cambridge.arm.com> Signed-off-by: Catalin Marinas --- stgit/lib/transaction.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py index 582ee72..13323dd 100644 --- a/stgit/lib/transaction.py +++ b/stgit/lib/transaction.py @@ -390,6 +390,7 @@ class StackTransaction(object): def check_merged(self, patches): """Return a subset of patches already merged.""" + out.start('Checking for patches merged upstream') merged = [] if self.temp_index_tree != self.stack.head.data.tree: self.temp_index.read_tree(self.stack.head.data.tree) @@ -408,4 +409,5 @@ class StackTransaction(object): self.temp_index_tree = None except git.MergeException: pass + out.done('%d found' % len(merged)) return merged