Show status for accepted patches

When dealing with a patch series attached to one bug, it's hard to
know which of the attachments have been marked as "accepted-commit_now"
or "accepted-commit_after_freeze". This patch shows those statuses
in the original apply question, and in the interactive application
questions.

https://bugzilla.gnome.org/show_bug.cgi?id=678152

1 files changed, 6 insertions, 1 deletions

diff --git a/git-bz b/git-bz
index 219168e..f17495e 100755
--- a/git-bz
+++ b/git-bz
@@ -1682,7 +1682,10 @@ def do_apply(*args):
                 patches.append(patch)
 
         for patch in patches:
-            print "%d - %s" % (patch.attach_id, patch.description)
+            if patch.status == 'accepted-commit_now' or patch.status == 'accepted-commit_after_freeze':
+                print "%d (%s) - %s" % (patch.attach_id, patch.status, patch.description)
+            else:
+                print "%d - %s" % (patch.attach_id, patch.description)
         print
         opt = prompt_multi("Apply? [(y)es, (n)o, (i)nteractive]", ["y", "n", "i"])
 
@@ -1695,6 +1698,8 @@ def do_apply(*args):
                 patches_by_id[patch.attach_id] = patch
                 if patch.status == 'committed' or patch.status == 'rejected':
                     template.write("#%d - %s (%s)\n" % (patch.attach_id, patch.description, patch.status))
+                elif patch.status == 'accepted-commit_now' or patch.status == 'accepted-commit_after_freeze':
+                    template.write("%d - %s (%s)\n" % (patch.attach_id, patch.description, patch.status))
                 else:
                     template.write("%d - %s\n" % (patch.attach_id, patch.description))
             template.write("\n")