##// END OF EJS Templates
largefiles: use readasstandin() to read hex hash directly from filectx...
FUJIWARA Katsunori -
r31740:a40e979b default
parent child Browse files
Show More
@@ -130,7 +130,7 b' class basestore(object):'
130 key = (filename, fctx.filenode())
130 key = (filename, fctx.filenode())
131 if key not in verified:
131 if key not in verified:
132 verified.add(key)
132 verified.add(key)
133 expectedhash = fctx.data().strip()
133 expectedhash = lfutil.readasstandin(fctx)
134 filestocheck.append((cset, filename, expectedhash))
134 filestocheck.append((cset, filename, expectedhash))
135
135
136 failed = self._verifyfiles(contents, filestocheck)
136 failed = self._verifyfiles(contents, filestocheck)
@@ -406,7 +406,7 b' def cachelfiles(ui, repo, node, filelist'
406 ctx = repo[node]
406 ctx = repo[node]
407 for lfile in lfiles:
407 for lfile in lfiles:
408 try:
408 try:
409 expectedhash = ctx[lfutil.standin(lfile)].data().strip()
409 expectedhash = lfutil.readasstandin(ctx[lfutil.standin(lfile)])
410 except IOError as err:
410 except IOError as err:
411 if err.errno == errno.ENOENT:
411 if err.errno == errno.ENOENT:
412 continue # node must be None and standin wasn't found in wctx
412 continue # node must be None and standin wasn't found in wctx
@@ -174,7 +174,7 b' def lfdirstatestatus(lfdirstate, repo):'
174 fctx = pctx[standin(lfile)]
174 fctx = pctx[standin(lfile)]
175 except LookupError:
175 except LookupError:
176 fctx = None
176 fctx = None
177 if not fctx or fctx.data().strip() != hashfile(repo.wjoin(lfile)):
177 if not fctx or readasstandin(fctx) != hashfile(repo.wjoin(lfile)):
178 modified.append(lfile)
178 modified.append(lfile)
179 else:
179 else:
180 clean.append(lfile)
180 clean.append(lfile)
@@ -528,7 +528,7 b' def getlfilestoupload(repo, missing, add'
528 files.add(f)
528 files.add(f)
529 for fn in files:
529 for fn in files:
530 if isstandin(fn) and fn in ctx:
530 if isstandin(fn) and fn in ctx:
531 addfunc(fn, ctx[fn].data().strip())
531 addfunc(fn, readasstandin(ctx[fn]))
532 repo.ui.progress(_('finding outgoing largefiles'), None)
532 repo.ui.progress(_('finding outgoing largefiles'), None)
533
533
534 def updatestandinsbymatch(repo, match):
534 def updatestandinsbymatch(repo, match):
@@ -553,9 +553,9 b' def overridefilemerge(origfn, premerge, '
553 return origfn(premerge, repo, mynode, orig, fcd, fco, fca,
553 return origfn(premerge, repo, mynode, orig, fcd, fco, fca,
554 labels=labels)
554 labels=labels)
555
555
556 ahash = fca.data().strip().lower()
556 ahash = lfutil.readasstandin(fca).lower()
557 dhash = fcd.data().strip().lower()
557 dhash = lfutil.readasstandin(fcd).lower()
558 ohash = fco.data().strip().lower()
558 ohash = lfutil.readasstandin(fco).lower()
559 if (ohash != ahash and
559 if (ohash != ahash and
560 ohash != dhash and
560 ohash != dhash and
561 (dhash == ahash or
561 (dhash == ahash or
@@ -172,7 +172,7 b' def reposetup(ui, repo):'
172 if standin not in ctx1:
172 if standin not in ctx1:
173 # from second parent
173 # from second parent
174 modified.append(lfile)
174 modified.append(lfile)
175 elif ctx1[standin].data().strip() \
175 elif lfutil.readasstandin(ctx1[standin]) \
176 != lfutil.hashfile(self.wjoin(lfile)):
176 != lfutil.hashfile(self.wjoin(lfile)):
177 modified.append(lfile)
177 modified.append(lfile)
178 else:
178 else:
@@ -188,7 +188,7 b' def reposetup(ui, repo):'
188 standin = lfutil.standin(lfile)
188 standin = lfutil.standin(lfile)
189 if standin in ctx1:
189 if standin in ctx1:
190 abslfile = self.wjoin(lfile)
190 abslfile = self.wjoin(lfile)
191 if ((ctx1[standin].data().strip() !=
191 if ((lfutil.readasstandin(ctx1[standin]) !=
192 lfutil.hashfile(abslfile)) or
192 lfutil.hashfile(abslfile)) or
193 (checkexec and
193 (checkexec and
194 ('x' in ctx1.flags(standin)) !=
194 ('x' in ctx1.flags(standin)) !=
General Comments 0
You need to be logged in to leave comments. Login now