Skip to content
This repository has been archived by the owner on Jul 24, 2020. It is now read-only.

Commit

Permalink
gitdirstate: regularize mercurial imports
Browse files Browse the repository at this point in the history
  • Loading branch information
sunshowers committed Dec 31, 2015
1 parent c9de964 commit 6297b58
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions hggit/gitdirstate.py
Expand Up @@ -3,24 +3,27 @@
import re
import errno

from mercurial import dirstate
from mercurial import (
dirstate,
match as matchmod,
osutil,
scmutil,
util,
)

try:
from mercurial import ignore
ignore.readpats
ignoremod = True
except ImportError:
# ignore module was removed in Mercurial 3.5
ignoremod = False
from mercurial import match as matchmod
from mercurial import osutil
from mercurial import scmutil
# pathauditor moved to pathutil in 2.8
try:
from mercurial import pathutil
pathutil.pathauditor
except ImportError:
pathutil = scmutil
from mercurial import util
from mercurial.i18n import _

def gignorepats(orig, lines, root=None):
Expand Down

0 comments on commit 6297b58

Please sign in to comment.