[StGIT PATCH 1/2] Have series show empty hidden patches as hidden rather than empty.

[StGIT PATCH 1/2] Have series show empty hidden patches as hidden rather than empty.

[Yann Dirson]

It is probably more important to show the hidden status of an empty
patch, since "clean" will not delete it anyway, and the display would
be ambiguous for a patch tagged "0" just before a patch tagged "!".
---

 stgit/commands/series.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/stgit/commands/series.py b/stgit/commands/series.py
index 402356c..fe4e468 100644
--- a/stgit/commands/series.py
+++ b/stgit/commands/series.py
@@ -215,4 +215,4 @@ def func(parser, options, args):
             __print_patch(p, branch_str, '- ', '0 ', max_len, options)
 
         for p in hidden:
-            __print_patch(p, branch_str, '! ', '0 ', max_len, options)
+            __print_patch(p, branch_str, '! ', '! ', max_len, options)

[StGIT PATCH 2/2] Have mail take the default for --prefix from stgit.mail.prefix.

[Yann Dirson]

It is more convenient to set the prefix once and for all in the config
file than each time on command line.
---

 stgit/commands/mail.py |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index cec1828..899cb1a 100644
--- a/stgit/commands/mail.py
+++ b/stgit/commands/mail.py
@@ -296,7 +296,11 @@ def __build_cover(tmpl, total_nr, msg_id, options):
     if options.prefix:
         prefix_str = options.prefix + ' '
     else:
-        prefix_str = ''
+        confprefix = config.get('stgit.mail.prefix')
+        if confprefix:
+            prefix_str = confprefix + ' '
+        else:
+            prefix_str = ''
         
     total_nr_str = str(total_nr)
     patch_nr_str = '0'.zfill(len(total_nr_str))
@@ -374,7 +378,11 @@ def __build_message(tmpl, patch, patch_nr, total_nr, msg_id, ref_id, options):
     if options.prefix:
         prefix_str = options.prefix + ' '
     else:
-        prefix_str = ''
+        confprefix = config.get('stgit.mail.prefix')
+        if confprefix:
+            prefix_str = confprefix + ' '
+        else:
+            prefix_str = ''
         
     if options.diff_opts:
         diff_flags = options.diff_opts.split()