Skip to content
Snippets Groups Projects
Commit af48a596 authored by Augie Fackler's avatar Augie Fackler
Browse files

Add just enough code to handle changes to cset discovery.

parent 56f55c77
No related branches found
No related tags found
No related merge requests found
......@@ -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')),
......
......@@ -19,6 +19,8 @@
def local(self):
if not self.path:
raise RepoError
def heads(self):
return []
instance = gitrepo
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment