chiark / gitweb /
Make hidden patches visible to various commands (notably log, show, pick).
authorYann Dirson <ydirson@altern.org>
Fri, 13 Jul 2007 22:43:55 +0000 (23:43 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 13 Jul 2007 22:43:55 +0000 (23:43 +0100)
Signed-off-by: Yann Dirson <ydirson@altern.org>
stgit/commands/common.py
stgit/commands/log.py
stgit/commands/show.py

index b05979b3289a0b34c9d838d10292f57f2c126381..14dbf678b6b36387f3c3bc6c6cfa6160a0cd3000 100644 (file)
@@ -89,7 +89,8 @@ def git_id(rev):
             patch = series.get_current()
             if not patch:
                 raise CmdException, 'No patches applied'
-        if patch in series.get_applied() or patch in series.get_unapplied():
+        if patch in series.get_applied() or patch in series.get_unapplied() or \
+               patch in series.get_hidden():
             if patch_id in ['top', '', None]:
                 return series.get_patch(patch).get_top()
             elif patch_id == 'bottom':
index e3e17f95ce96f6fd1bec77ba6fb049419029edf7..1c79c7c717dd3be33c426e4f9859d16163f3bb88 100644 (file)
@@ -90,7 +90,8 @@ def func(parser, options, args):
             raise CmdException, 'No patches applied'
     elif len(args) == 1:
         name = args[0]
-        if not name in crt_series.get_applied() + crt_series.get_unapplied():
+        if not name in crt_series.get_applied() + crt_series.get_unapplied() + \
+               crt_series.get_hidden():
             raise CmdException, 'Unknown patch "%s"' % name
     else:
         parser.error('incorrect number of arguments')
index 3bf4f20c2e4e715f36494480b68240876d2dfc14..2b2274491cdd7ef949e58ac5d1ec018f4b32d550 100644 (file)
@@ -55,7 +55,8 @@ def func(parser, options, args):
     elif len(args) == 0:
         patches = ['HEAD']
     else:
-        patches = parse_patches(args, applied + unapplied, len(applied))
+        patches = parse_patches(args, applied + unapplied +\
+                                crt_series.get_hidden(), len(applied))
 
     if options.diff_opts:
         diff_flags = options.diff_opts.split()