Merge branch '5/initial-merge' into 5/ALL

1 files changed, 14 insertions, 3 deletions

diff --git a/src/fedpkg.py b/src/fedpkg.py
index cfb0bcc..fd16f49 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -446,6 +446,8 @@ def clone(args):
             pyfedpkg.clone_with_dirs(args.module[0], user)
         else:
             pyfedpkg.clone(args.module[0], user, args.path, args.branch)
+            if args.initial_merge:
+                pyfedpkg.initial_merge.handle_repo(args.module[0])
     except pyfedpkg.FedpkgError, e:
         log.error('Could not clone: %s' % e)
         sys.exit(1)
@@ -945,9 +947,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')
@@ -1044,6 +1052,9 @@ packages will be built sequentially.
                                     help = 'Source rpm to import')
     parser_import_srpm.set_defaults(command = import_srpm)
 
+    # Initial branch merges
+    pyfedpkg.initial_merge.add_parser_to(subparsers)
+
     # install locally
     parser_install = subparsers.add_parser('install',
                                         help = 'Local test rpmbuild install')