From: Karl Hasselström Date: Sun, 25 Nov 2007 20:51:34 GMT Subject: [StGit PATCH 06/10] Let "stg applied" and "stg unapplied" use the new infrastructure Message-ID: <20071125205134.7823.74925.stgit@yoghurt> In-Reply-To: <20071125203717.7823.70046.stgit@yoghurt> This is a trivial change since these commands are so simple, but because these are the commands used by t4000-upgrade, we now test that the new infrastructure can upgrade old stacks. Signed-off-by: Karl Hasselström --- stgit/commands/applied.py | 27 +++++++++++++-------------- stgit/commands/unapplied.py | 23 +++++++++++------------ 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/stgit/commands/applied.py b/stgit/commands/applied.py index 45d0926..522425b 100644 --- a/stgit/commands/applied.py +++ b/stgit/commands/applied.py @@ -16,25 +16,21 @@ 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 optparse import OptionParser, make_option - -from stgit.commands.common import * -from stgit.utils import * +from optparse import make_option from stgit.out import * -from stgit import stack, git +from stgit.commands import common help = 'print the applied patches' usage = """%prog [options] -List the patches from the series which were already pushed onto the -stack. They are listed in the order in which they were pushed, the +List the patches from the series which have already been pushed onto +the stack. They are listed in the order in which they were pushed, the last one being the current (topmost) patch.""" -directory = DirectoryHasRepository() +directory = common.DirectoryHasRepositoryLib() options = [make_option('-b', '--branch', - help = 'use BRANCH instead of the default one'), + help = 'use BRANCH instead of the default branch'), make_option('-c', '--count', help = 'print the number of applied patches', action = 'store_true')] @@ -46,10 +42,13 @@ def func(parser, options, args): if len(args) != 0: parser.error('incorrect number of arguments') - applied = crt_series.get_applied() + if options.branch: + s = directory.repository.get_stack(options.branch) + else: + s = directory.repository.current_stack if options.count: - out.stdout(len(applied)) + out.stdout(len(s.patchorder.applied)) else: - for p in applied: - out.stdout(p) + for pn in s.patchorder.applied: + out.stdout(pn) diff --git a/stgit/commands/unapplied.py b/stgit/commands/unapplied.py index d5bb43e..7702207 100644 --- a/stgit/commands/unapplied.py +++ b/stgit/commands/unapplied.py @@ -16,13 +16,9 @@ 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 optparse import OptionParser, make_option - -from stgit.commands.common import * -from stgit.utils import * +from optparse import make_option from stgit.out import * -from stgit import stack, git +from stgit.commands import common help = 'print the unapplied patches' @@ -31,9 +27,9 @@ usage = """%prog [options] List the patches from the series which are not pushed onto the stack. They are listed in the reverse order in which they were popped.""" -directory = DirectoryHasRepository() +directory = common.DirectoryHasRepositoryLib() options = [make_option('-b', '--branch', - help = 'use BRANCH instead of the default one'), + help = 'use BRANCH instead of the default branch'), make_option('-c', '--count', help = 'print the number of unapplied patches', action = 'store_true')] @@ -45,10 +41,13 @@ def func(parser, options, args): if len(args) != 0: parser.error('incorrect number of arguments') - unapplied = crt_series.get_unapplied() + if options.branch: + s = directory.repository.get_stack(options.branch) + else: + s = directory.repository.current_stack if options.count: - out.stdout(len(unapplied)) + out.stdout(len(s.patchorder.unapplied)) else: - for p in unapplied: - out.stdout(p) + for pn in s.patchorder.unapplied: + out.stdout(pn)