mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
imports: import from hgext instead of hgext3rd
The only reason these worked is because they were in the system python path. Which means the in-repo code wasn't actually being tested.
This commit is contained in:
parent
bf8527e7a9
commit
8103079702
@ -44,7 +44,7 @@ def extsetup(ui):
|
||||
try:
|
||||
conduit = extensions.find("fbconduit")
|
||||
except KeyError:
|
||||
from hgext3rd import fbconduit as conduit
|
||||
from hgext import fbconduit as conduit
|
||||
except ImportError:
|
||||
ui.warn(_('Unable to find fbconduit extension\n'))
|
||||
return
|
||||
|
@ -43,7 +43,7 @@ rev numbers for nodes should be correct too.
|
||||
|
||||
from collections import defaultdict
|
||||
from functools import partial
|
||||
from hgext3rd.generic_bisect import bisect
|
||||
from hgext.generic_bisect import bisect
|
||||
|
||||
from mercurial import (
|
||||
changelog,
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
from __future__ import absolute_import
|
||||
|
||||
from hgext3rd import extutil
|
||||
from hgext import extutil
|
||||
|
||||
from mercurial.node import short
|
||||
from mercurial import (
|
||||
|
@ -20,7 +20,7 @@ from mercurial import (
|
||||
)
|
||||
from mercurial import pycompat, scmutil
|
||||
from hgext import blackbox
|
||||
from hgext3rd import (
|
||||
from hgext import (
|
||||
shareutil,
|
||||
smartlog,
|
||||
fbsparse as sparse,
|
||||
|
@ -9,7 +9,7 @@ from __future__ import absolute_import
|
||||
from mercurial import error, filelog, revlog
|
||||
from mercurial.node import bin, hex, nullid, short
|
||||
from mercurial.i18n import _
|
||||
from hgext3rd import extutil
|
||||
from hgext import extutil
|
||||
from . import (
|
||||
constants,
|
||||
datapack,
|
||||
|
@ -22,7 +22,7 @@ def createconduit(ui):
|
||||
conduit = extensions.find("fbconduit")
|
||||
except KeyError:
|
||||
try:
|
||||
from hgext3rd import fbconduit as conduit
|
||||
from hgext import fbconduit as conduit
|
||||
except ImportError:
|
||||
ui.log('linkrevfixup',
|
||||
_('unable to find fbconduit extension\n'))
|
||||
|
@ -1,7 +1,7 @@
|
||||
from __future__ import absolute_import
|
||||
|
||||
import os
|
||||
from hgext3rd.extutil import runshellcommand, flock
|
||||
from hgext.extutil import runshellcommand, flock
|
||||
from mercurial import (
|
||||
encoding,
|
||||
error,
|
||||
|
@ -6,7 +6,7 @@
|
||||
# GNU General Public License version 2 or any later version.
|
||||
from __future__ import absolute_import
|
||||
|
||||
from hgext3rd.extutil import runshellcommand
|
||||
from hgext.extutil import runshellcommand
|
||||
from mercurial.i18n import _
|
||||
from mercurial.node import hex, nullid, nullrev
|
||||
from mercurial import encoding, error, localrepo, util, match, scmutil
|
||||
|
@ -42,7 +42,7 @@ from mercurial.node import (
|
||||
nullid,
|
||||
)
|
||||
|
||||
from hgext3rd import (
|
||||
from hgext import (
|
||||
interactiveui,
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user