From 3b52f6dae6366e12b71a68dd6d0cdee84a89519d Mon Sep 17 00:00:00 2001 Message-Id: <3b52f6dae6366e12b71a68dd6d0cdee84a89519d.1747292181.git.mdw@distorted.org.uk> From: Mark Wooding Date: Fri, 22 May 2009 09:53:36 +0100 Subject: [PATCH] Show some progress information when checking for upstream merges. Organization: Straylight/Edgeware From: Catalin Marinas Signed-off-by: Catalin Marinas --- stgit/lib/transaction.py | 2 ++ 1 file changed, 2 insertions(+) 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 -- [mdw]