From f421375c46f3d05e43779e555044d0d510f16f44 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 22 May 2009 09:53:38 +0100 Subject: [PATCH] Convert 'unhide' to the lib infrastructure Signed-off-by: Catalin Marinas --- stgit/commands/unhide.py | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/stgit/commands/unhide.py b/stgit/commands/unhide.py index 0c0832a..656ddea 100644 --- a/stgit/commands/unhide.py +++ b/stgit/commands/unhide.py @@ -1,5 +1,5 @@ __copyright__ = """ -Copyright (C) 2007, Catalin Marinas +Copyright (C) 2009, Catalin Marinas This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as @@ -15,12 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -import sys, os +from stgit.commands import common +from stgit.lib import transaction +from stgit import argparse from stgit.argparse import opt -from stgit.commands.common import * -from stgit.utils import * -from stgit.out import * -from stgit import argparse, stack, git help = 'Unhide a hidden patch' kind = 'stack' @@ -34,19 +32,24 @@ options = [ opt('-b', '--branch', args = [argparse.stg_branches], short = 'Use BRANCH instead of the default branch')] -directory = DirectoryHasRepository(log = True) +directory = common.DirectoryHasRepositoryLib() def func(parser, options, args): - """Unhide a range of patches in the series - """ - if args: - # parsing all the patches for a more meaningful error reporting - all_patches = crt_series.get_applied() + crt_series.get_unapplied() \ - + crt_series.get_hidden() - patches = parse_patches(args, all_patches) - else: + """Unhide a range of patch in the series.""" + stack = directory.repository.current_stack + trans = transaction.StackTransaction(stack, 'hide') + + if not args: parser.error('No patches specified') - for patch in patches: - crt_series.unhide_patch(patch) - out.info('Patch "%s" unhidden' % patch) + patches = common.parse_patches(args, trans.all_patches) + for p in patches: + if not p in trans.hidden: + raise common.CmdException('Patch "%s" not hidden' % p) + + applied = list(trans.applied) + unapplied = trans.unapplied + patches + hidden = [p for p in trans.hidden if not p in set(patches)] + + trans.reorder_patches(applied, unapplied, hidden) + return trans.run() -- 2.11.0