| Alphare |
| hg-reviewers |
Replace calling a complex function with a simple dedicated one
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/lfcommands.py (21 lines) |
| and repo.dirstate.normalize(lfile) not in wctx | and repo.dirstate.normalize(lfile) not in wctx | ||||
| ): | ): | ||||
| wvfs.unlinkpath(lfile) | wvfs.unlinkpath(lfile) | ||||
| removed += 1 | removed += 1 | ||||
| # largefile processing might be slow and be interrupted - be prepared | # largefile processing might be slow and be interrupted - be prepared | ||||
| lfdirstate.write() | lfdirstate.write() | ||||
| with lfdirstate.parentchange(): | |||||
| if lfiles: | if lfiles: | ||||
| lfiles = [f for f in lfiles if f not in dropped] | lfiles = [f for f in lfiles if f not in dropped] | ||||
| for f in dropped: | for f in dropped: | ||||
| repo.wvfs.unlinkpath(lfutil.standin(f)) | repo.wvfs.unlinkpath(lfutil.standin(f)) | ||||
| # This needs to happen for dropped files, otherwise they stay in | # This needs to happen for dropped files, otherwise they stay in | ||||
| # the M state. | # the M state. | ||||
| lfutil.synclfdirstate(repo, lfdirstate, f, normallookup) | lfdirstate._drop(f) | ||||
| statuswriter(_(b'getting changed largefiles\n')) | statuswriter(_(b'getting changed largefiles\n')) | ||||
| cachelfiles(ui, repo, None, lfiles) | cachelfiles(ui, repo, None, lfiles) | ||||
| with lfdirstate.parentchange(): | |||||
| for lfile in lfiles: | for lfile in lfiles: | ||||
| update1 = 0 | update1 = 0 | ||||
| expecthash = update.get(lfile) | expecthash = update.get(lfile) | ||||
| if expecthash: | if expecthash: | ||||
| if not lfutil.copyfromcache(repo, expecthash, lfile): | if not lfutil.copyfromcache(repo, expecthash, lfile): | ||||
| # failed ... but already removed and set to normallookup | # failed ... but already removed and set to normallookup | ||||
| continue | continue | ||||