Show some progress information when checking for upstream merges.
authorCatalin Marinas <catalin.marinas@gmail.com>
Fri, 22 May 2009 08:53:36 +0000 (09:53 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 22 May 2009 08:53:36 +0000 (09:53 +0100)
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/lib/transaction.py

index 582ee72..13323dd 100644 (file)
@@ -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