--- a/hgext/largefiles/lfcommands.py Thu Oct 13 20:45:49 2011 -0400
+++ b/hgext/largefiles/lfcommands.py Thu Oct 13 21:42:54 2011 -0400
@@ -383,9 +383,9 @@
# if it exists and its hash matches, it might have been locally
# modified before updating and the user chose 'local'. in this case,
# it will not be in any store, so don't look for it.
- if (not os.path.exists(repo.wjoin(lfile)) \
- or expectedhash != lfutil.hashfile(repo.wjoin(lfile))) and \
- not lfutil.findfile(repo, expectedhash):
+ if ((not os.path.exists(repo.wjoin(lfile)) or
+ expectedhash != lfutil.hashfile(repo.wjoin(lfile))) and
+ not lfutil.findfile(repo, expectedhash)):
toget.append((lfile, expectedhash))
if toget:
@@ -441,9 +441,9 @@
if os.path.exists(absstandin+'.orig'):
shutil.copyfile(abslfile, abslfile+'.orig')
expecthash = lfutil.readstandin(repo, lfile)
- if expecthash != '' and \
- (not os.path.exists(abslfile) or \
- expecthash != lfutil.hashfile(abslfile)):
+ if (expecthash != '' and
+ (not os.path.exists(abslfile) or
+ expecthash != lfutil.hashfile(abslfile))):
if not lfutil.copyfromcache(repo, expecthash, lfile):
return None # don't try to set the mode or update the dirstate
ret = 1
@@ -468,7 +468,6 @@
# -- hg commands declarations ------------------------------------------------
-
cmdtable = {
'lfconvert': (lfconvert,
[('s', 'size', '',