Show some progress information when checking for upstream merges.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py
index 582ee724ebfe49f0fb87572c0d43e029da663572..13323dddc7d8fa3583310df17ec8e8bf4fe4b822 100644 (file)
--- 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."""
 
     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)
         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
                 self.temp_index_tree = None
             except git.MergeException:
                 pass

+        out.done('%d found' % len(merged))

         return merged
         return merged