Add "fedpkg clone --initial-merge" argumentenh/initial-merge

1 files changed, 11 insertions, 3 deletions

diff --git a/src/fedpkg.py b/src/fedpkg.py
index d50d7dc..5c51061 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -417,6 +417,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)
@@ -825,9 +827,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')