From 0e3f5570181777e6dfdeadb3d65ded4615435430 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 10 Aug 2010 13:13:15 +0200 Subject: Add "fedpkg clone --initial-merge" argument --- src/fedpkg.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/fedpkg.py') diff --git a/src/fedpkg.py b/src/fedpkg.py index cee3c1c..15bec05 100755 --- a/src/fedpkg.py +++ b/src/fedpkg.py @@ -410,6 +410,8 @@ def clone(args): pyfedpkg.clone_with_dirs(module, args.user) else: pyfedpkg.clone(module, args.user, args.path, args.branch) + if args.initial_merge: + pyfedpkg.initial_merge.handle_repo(module) except pyfedpkg.FedpkgError, e: log.error('Could not clone: %s' % e) sys.exit(1) @@ -732,9 +734,15 @@ packages will be built sequentially. parser_clone = subparsers.add_parser('clone', help = 'Clone and checkout a module') # Allow an old style clone with subdirs for branches - parser_clone.add_argument('--branches', '-B', - action = 'store_true', - help = 'Do an old style checkout with subdirs for branches') + parser_clone_branches_group = parser_clone.add_mutually_exclusive_group() + parser_clone_branches_group.add_argument( + '--branches', '-B', + action = 'store_true', + help = 'Do an old style checkout with subdirs for branches') + parser_clone_branches_group.add_argument( + '--initial-merge', '-i', + action = 'store_true', + help = 'Run initial-merge on the cloned repo immediately') # provide a convenient way to get to a specific branch parser_clone.add_argument('--branch', '-b', help = 'Check out a specific branch') -- cgit