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-02-01 16:23:45 +0100
commit18ea3c13dc5bcda0c086efe11809795773f5167b (patch)
tree3c0cf9658ff6894d796df5697176ce0ad403897e /src/pyfedpkg/initial_merge.py
parentc139cc05d3101187d7292e220b1734bb03be99da (diff)
downloadfedora-packager-18ea3c13dc5bcda0c086efe11809795773f5167b.tar.gz
fedora-packager-18ea3c13dc5bcda0c086efe11809795773f5167b.tar.xz
fedora-packager-18ea3c13dc5bcda0c086efe11809795773f5167b.zip
Add "fedpkg clone --initial-merge" argument5/initial-merge
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 ]