From: Catalin Marinas Date: Wed, 16 Sep 2009 21:41:00 GMT Subject: [StGit PATCH 2/5] Add the --reject option to fold Message-ID: <20090916214100.6622.90078.stgit@toshiba-laptop> In-Reply-To: <20090916214049.6622.44662.stgit@toshiba-laptop> Signed-off-by: Catalin Marinas --- stgit/commands/fold.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/stgit/commands/fold.py b/stgit/commands/fold.py index 66a2dd9..28e824c 100644 --- a/stgit/commands/fold.py +++ b/stgit/commands/fold.py @@ -38,7 +38,9 @@ options = [ opt('-t', '--threeway', action = 'store_true', short = 'Perform a three-way merge with the current patch'), opt('-b', '--base', args = [argparse.commit], - short = 'Use BASE instead of HEAD applying the patch')] + short = 'Use BASE instead of HEAD when applying the patch'), + opt('--reject', action = 'store_true', + short = 'Leave the rejected hunks in corresponding *.rej files')] directory = DirectoryHasRepository(log = True) @@ -72,11 +74,12 @@ def func(parser, options, args): if options.threeway: crt_patch = crt_series.get_patch(current) bottom = crt_patch.get_bottom() - git.apply_patch(filename = filename, base = bottom) + git.apply_patch(filename = filename, base = bottom, + reject = options.reject) elif options.base: - git.apply_patch(filename = filename, + git.apply_patch(filename = filename, reject = options.reject, base = git_id(crt_series, options.base)) else: - git.apply_patch(filename = filename) + git.apply_patch(filename = filename, reject = options.reject) out.done()