summaryrefslogtreecommitdiffstats
path: root/src/pyfedpkg/initial_merge.py
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2010-08-10 13:13:15 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2011-01-11 15:56:11 +0100
commit8b73d6cb31d0a3fed328acd31d524a671238f51a (patch)
tree71ef34c193717ed8378268d565395abcc98884fc /src/pyfedpkg/initial_merge.py
parentc3f6a19ac55170baa33fbbfb583ff3f0d4ad2710 (diff)
downloadfedora-packager-8b73d6cb31d0a3fed328acd31d524a671238f51a.tar.gz
fedora-packager-8b73d6cb31d0a3fed328acd31d524a671238f51a.tar.xz
fedora-packager-8b73d6cb31d0a3fed328acd31d524a671238f51a.zip
Add "fedpkg clone --initial-merge" argumentinitial-merge/3
Diffstat (limited to 'src/pyfedpkg/initial_merge.py')
-rwxr-xr-xsrc/pyfedpkg/initial_merge.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/pyfedpkg/initial_merge.py b/src/pyfedpkg/initial_merge.py
index 4964745..f22453f 100755
--- a/src/pyfedpkg/initial_merge.py
+++ b/src/pyfedpkg/initial_merge.py
@@ -169,7 +169,17 @@ class Filter(object):
self.branch_list = [item]
+class UnknownRepoTypeError(pyfedpkg.FedpkgError):
+ pass
+
+
def handle_repo(repo, dry_run=False):
+ if type(repo) == str:
+ repo = git.Repo(repo)
+ elif isinstance(repo, git.Repo):
+ pass
+ else:
+ raise UnknownRepoTypeError("%s" % repo)
log.info("######## initial-merge %s ########" % repo.working_tree_dir)
_locals, remotes = pyfedpkg._list_branches(repo=repo)
aa = [ Branch(repo.git.rev_parse('%s^{tree}' % b), b) for b in remotes ]