From: Yann Dirson Date: Thu, 28 Jun 2007 21:44:15 GMT Subject: [StGIT PATCH 3/3] Make hidden patches visible to various commands (notably log, show, pick). Message-ID: <20070628214415.26983.73520.stgit@gandelf.nowhere.earth> In-Reply-To: <20070628214242.26983.99859.stgit@gandelf.nowhere.earth> Signed-off-by: Yann Dirson --- stgit/commands/common.py | 3 ++- stgit/commands/log.py | 3 ++- stgit/commands/show.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stgit/commands/common.py b/stgit/commands/common.py index b05979b..14dbf67 100644 --- a/stgit/commands/common.py +++ b/stgit/commands/common.py @@ -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': diff --git a/stgit/commands/log.py b/stgit/commands/log.py index e3e17f9..9259290 100644 --- a/stgit/commands/log.py +++ b/stgit/commands/log.py @@ -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') diff --git a/stgit/commands/show.py b/stgit/commands/show.py index 3bf4f20..2b22744 100644 --- a/stgit/commands/show.py +++ b/stgit/commands/show.py @@ -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()