From 7829d19d9aa7468f65b98d1cc1bd76389346b594 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Tue, 12 Dec 2006 22:07:17 +0000 Subject: [PATCH] Add the --unapplied option to pick This option picks a commit id but doesn't actually apply it to the stack (also useful for duplicating patches). Signed-off-by: Catalin Marinas --- stgit/commands/pick.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py index 400e4eb..edd614d 100644 --- a/stgit/commands/pick.py +++ b/stgit/commands/pick.py @@ -44,6 +44,9 @@ options = [make_option('-n', '--name', action = 'store_true'), make_option('--update', help = 'like fold but only update the current patch files', + action = 'store_true'), + make_option('--unapplied', + help = 'keep the patch unapplied', action = 'store_true')] @@ -53,9 +56,10 @@ def func(parser, options, args): if len(args) != 1: parser.error('incorrect number of arguments') - check_local_changes() - check_conflicts() - check_head_top_equal() + if not options.unapplied: + check_local_changes() + check_conflicts() + check_head_top_equal() commit_str = args[0] commit_id = git_id(commit_str) @@ -119,7 +123,10 @@ def func(parser, options, args): author_name = author_name, author_email = author_email, author_date = author_date) - modified = crt_series.push_patch(patch) + if not options.unapplied: + modified = crt_series.push_patch(patch) + else: + modified = False if crt_series.empty_patch(patch): print 'done (empty patch)' -- 2.11.0