Comments
Patch
@@ -370,9 +370,6 @@ def copyandhash(instream, outfile):
outfile.write(data)
return hasher.hexdigest()
-def hashrepofile(repo, file):
- return hashfile(repo.wjoin(file))
-
def hashfile(file):
if not os.path.exists(file):
return ''
@@ -1400,7 +1400,7 @@ def mergeupdate(orig, repo, node, branch
lfileabs = repo.wvfs.join(lfile)
if not repo.wvfs.exists(lfileabs):
continue
- lfhash = lfutil.hashrepofile(repo, lfile)
+ lfhash = lfutil.hashfile(lfileabs)
standin = lfutil.standin(lfile)
lfutil.writestandin(repo, standin, lfhash,
lfutil.getexecutable(lfileabs))