[PATCH 5 of 6] fixing-import-cycle: changing imports in overrides
Pulkit Goyal
7895pulkit at gmail.com
Sun Apr 3 18:03:04 EDT 2016
# HG changeset patch
# User Pulkit Goyal <7895pulkit at gmail.com>
# Date 1459720508 -19800
# Mon Apr 04 03:25:08 2016 +0530
# Node ID 7329eef89e5a44384e1e19e492bdd77f09ab537b
# Parent e5d625b72755240df5c1dbcf7e6aa0b6c2257300
fixing-import-cycle: changing imports in overrides
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -17,7 +17,7 @@
import lfutil
import lfcommands
-import basestore
+import localstore
# -- Utility functions: commonly/repeatedly needed functionality ---------------
@@ -1094,7 +1094,7 @@
lfhashes.add(lfhash)
lfutil.getlfilestoupload(repo, missing, dedup)
if lfhashes:
- lfexists = basestore._openstore(repo, other).exists(lfhashes)
+ lfexists = localstore._openstore(repo, other).exists(lfhashes)
for fn, lfhash in knowns:
if not lfexists[lfhash]: # lfhash doesn't exist on "other"
addfunc(fn, lfhash)
@@ -1323,7 +1323,7 @@
else:
hash = lfutil.readstandin(repo, lf, ctx.rev())
if not lfutil.inusercache(repo.ui, hash):
- store = basestore._openstore(repo)
+ store = localstore._openstore(repo)
success, missing = store.get([(lf, hash)])
if len(success) != 1:
raise error.Abort(
More information about the Mercurial-devel
mailing list