Mercurial > hg > hg-git
changeset 964:5db7e2be619e
gitdirstate: regularize mercurial imports
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 31 Dec 2015 12:36:16 -0800 |
parents | a539321562ef |
children | b867b5f0a63a |
files | hggit/gitdirstate.py |
diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hggit/gitdirstate.py +++ b/hggit/gitdirstate.py @@ -3,7 +3,14 @@ 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 @@ -11,16 +18,12 @@ 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):