equal
deleted
inserted
replaced
172 for lfile in unsure: |
172 for lfile in unsure: |
173 try: |
173 try: |
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) |
181 lfdirstate.normal(lfile) |
181 lfdirstate.normal(lfile) |
182 return s |
182 return s |
526 for f in mc: |
526 for f in mc: |
527 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None): |
527 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None): |
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): |
535 '''Update standins in the working directory according to specified match |
535 '''Update standins in the working directory according to specified match |
536 |
536 |