diff options
author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-01-21 11:09:39 +0100 |
---|---|---|
committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-01-21 11:09:39 +0100 |
commit | 7a70e8ab79d46d06271c75be1f726fd164cbf9ce (patch) | |
tree | d11f53e95819d9252e434e46f36f7effbc5f2c8b /src/fedpkg.py | |
parent | 06fda5ee1e0338330e44bc0d08ca5026e4fb5618 (diff) | |
parent | 39b9be927e4cbbfeed1ee2e28a1badde0db5c19d (diff) | |
download | fedora-packager-7a70e8ab79d46d06271c75be1f726fd164cbf9ce.tar.gz fedora-packager-7a70e8ab79d46d06271c75be1f726fd164cbf9ce.tar.xz fedora-packager-7a70e8ab79d46d06271c75be1f726fd164cbf9ce.zip |
Merge branch '4/initial-merge' into 4/ALL4/ALL
Diffstat (limited to 'src/fedpkg.py')
-rwxr-xr-x | src/fedpkg.py | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py index 9e97b77..86cf832 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) @@ -940,9 +942,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') @@ -1039,6 +1047,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') |