Mercurial > hg-git
diff hggit/__init__.py @ 344:af48a5961432
Add just enough code to handle changes to cset discovery.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Sat, 12 Jun 2010 21:49:14 -0500 |
parents | eb345bacc1da |
children | dd90394cd13b |
line wrap: on
line diff
--- a/hggit/__init__.py Sat Jun 12 21:48:41 2010 -0500 +++ b/hggit/__init__.py Sat Jun 12 21:49:14 2010 -0500 @@ -103,6 +103,20 @@ return ret extensions.wrapfunction(localrepo.localrepository, 'nodetags', sortednodetags) +try: + from mercurial import discovery + def findoutgoing(orig, local, remote, base=None, heads=None, force=False): + if isinstance(remote, gitrepo.gitrepo): + git = GitHandler(local, local.ui) + base, heads = git.get_refs(remote.path) + r = orig(local, remote, base=base, heads=heads, + force=force) + return [x[0] for x in r] + return orig(local, remote, base=base, heads=heads, force=force) + extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing) +except ImportError: + pass + cmdtable = { "gimport": (gimport, [], _('hg gimport')),