4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> |
4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> |
5 # |
5 # |
6 # This software may be used and distributed according to the terms |
6 # This software may be used and distributed according to the terms |
7 # of the GNU General Public License, incorporated herein by reference. |
7 # of the GNU General Public License, incorporated herein by reference. |
8 |
8 |
9 from node import bin, hex, nullid, nullrev, short |
|
10 from repo import NoCapability, RepoError |
|
11 from i18n import _ |
9 from i18n import _ |
12 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo |
10 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo |
13 import errno, lock, os, shutil, util, extensions |
11 import errno, lock, os, shutil, util, extensions |
14 import merge as _merge |
12 import merge as _merge |
15 import verify as _verify |
13 import verify as _verify |