20
from mercurial import commands, extensions, hg, util as hgutil
20
from mercurial import commands
21
from mercurial import extensions
22
from mercurial import hg
23
from mercurial import localrepo
24
from mercurial import util as hgutil
21
25
from mercurial.i18n import _
23
27
import gitrepo, hgrepo
92
96
map(f.write, new_map)
93
97
ui.status(_('git commit map cleaned\n'))
99
# drop this when we're 1.6-only, this just backports new behavior
100
def sortednodetags(orig, *args, **kwargs):
101
ret = orig(*args, **kwargs)
104
extensions.wrapfunction(localrepo.localrepository, 'nodetags', sortednodetags)
107
from mercurial import discovery
108
def findoutgoing(orig, local, remote, base=None, heads=None, force=False):
109
if isinstance(remote, gitrepo.gitrepo):
110
git = GitHandler(local, local.ui)
111
base, heads = git.get_refs(remote.path)
112
r = orig(local, remote, base=base, heads=heads,
114
return [x[0] for x in r]
115
return orig(local, remote, base=base, heads=heads, force=force)
116
extensions.wrapfunction(discovery, 'findoutgoing', findoutgoing)
97
122
(gimport, [], _('hg gimport')),