| Alphare | |
| pulkit |
| hg-reviewers |
This is doing an update, so this seems more appropriate. No other change have been made, but the next changeset will :-)
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/largefiles/overrides.py (27 lines) |
| oldstandins = lfutil.getstandinsstate(repo) | oldstandins = lfutil.getstandinsstate(repo) | ||||
| wc = kwargs.get('wc') | wc = kwargs.get('wc') | ||||
| if wc and wc.isinmemory(): | if wc and wc.isinmemory(): | ||||
| # largefiles is not a good candidate for in-memory merge (large | # largefiles is not a good candidate for in-memory merge (large | ||||
| # files, custom dirstate, matcher usage). | # files, custom dirstate, matcher usage). | ||||
| raise error.ProgrammingError( | raise error.ProgrammingError( | ||||
| b'largefiles is not compatible with in-memory merge' | b'largefiles is not compatible with in-memory merge' | ||||
| ) | ) | ||||
| with lfdirstate.parentchange(): | |||||
| result = orig(repo, node, branchmerge, force, *args, **kwargs) | result = orig(repo, node, branchmerge, force, *args, **kwargs) | ||||
| newstandins = lfutil.getstandinsstate(repo) | newstandins = lfutil.getstandinsstate(repo) | ||||
| filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) | filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) | ||||
| # to avoid leaving all largefiles as dirty and thus rehash them, mark | # to avoid leaving all largefiles as dirty and thus rehash them, mark | ||||
| # all the ones that didn't change as clean | # all the ones that didn't change as clean | ||||
| for lfile in oldclean.difference(filelist): | for lfile in oldclean.difference(filelist): | ||||
| lfdirstate.normal(lfile) | lfdirstate.normal(lfile) | ||||
| lfdirstate.write() | lfdirstate.write() | ||||
| if branchmerge or force or partial: | if branchmerge or force or partial: | ||||
| filelist.extend(s.deleted + s.removed) | filelist.extend(s.deleted + s.removed) | ||||
| lfcommands.updatelfiles( | lfcommands.updatelfiles( | ||||
| repo.ui, repo, filelist=filelist, normallookup=partial | repo.ui, repo, filelist=filelist, normallookup=partial | ||||
| ) | ) | ||||
| return result | return result | ||||
| @eh.wrapfunction(scmutil, b'marktouched') | @eh.wrapfunction(scmutil, b'marktouched') | ||||
| def scmutilmarktouched(orig, repo, files, *args, **kwargs): | def scmutilmarktouched(orig, repo, files, *args, **kwargs): | ||||
| result = orig(repo, files, *args, **kwargs) | result = orig(repo, files, *args, **kwargs) | ||||