7 # GNU General Public License version 2 or any later version. |
7 # GNU General Public License version 2 or any later version. |
8 |
8 |
9 from i18n import _ |
9 from i18n import _ |
10 from lock import release |
10 from lock import release |
11 from node import hex, nullid |
11 from node import hex, nullid |
12 import localrepo, bundlerepo, httppeer, sshpeer, statichttprepo, bookmarks |
12 import localrepo, bundlerepo, unionrepo, httppeer, sshpeer, statichttprepo |
13 import lock, util, extensions, error, node, scmutil, phases, url |
13 import bookmarks, lock, util, extensions, error, node, scmutil, phases, url |
14 import cmdutil, discovery |
14 import cmdutil, discovery |
15 import merge as mergemod |
15 import merge as mergemod |
16 import verify as verifymod |
16 import verify as verifymod |
17 import errno, os, shutil |
17 import errno, os, shutil |
18 |
18 |