Mercurial > hg
comparison hgext/largefiles/uisetup.py @ 22289:e26df4e774f6
largefiles: update largefiles even if transplant is aborted by conflict
Before this patch, largefiles in the working directory aren't updated
correctly, if transplant is aborted by conflict. This prevents users
from viewing appropriate largefiles while resolving conflicts.
While transplant, largefiles in the working directory are updated only
at successful committing in the special code path of
"lfilesrepo.commit()".
To update largefiles even if transplant is aborted by conflict, this
patch wraps "scmutil.marktouched", which is invoked from "patch.patch"
with "files" list of added/modified/deleted files.
This patch invokes "updatelfiles" with:
- "printmessage=False", to suppress "getting changed largefiles ..."
messages while automated committing by transplant
- "normallookup=True", because "patch.patch" doesn't update dirstate
for modified files
in such case, "normallookup=False" may cause marking modified
largefiles as "clean" unexpectedly
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sun, 24 Aug 2014 23:47:26 +0900 |
| parents | 4e2559841d6c |
| children | 9b6c3947b4a7 |
comparison
equal
deleted
inserted
replaced
| 22288:4e2559841d6c | 22289:e26df4e774f6 |
|---|---|
| 123 extensions.wrapfunction(subrepo.hgsubrepo, 'archive', | 123 extensions.wrapfunction(subrepo.hgsubrepo, 'archive', |
| 124 overrides.hgsubrepoarchive) | 124 overrides.hgsubrepoarchive) |
| 125 extensions.wrapfunction(cmdutil, 'bailifchanged', | 125 extensions.wrapfunction(cmdutil, 'bailifchanged', |
| 126 overrides.overridebailifchanged) | 126 overrides.overridebailifchanged) |
| 127 | 127 |
| 128 extensions.wrapfunction(scmutil, 'marktouched', | |
| 129 overrides.scmutilmarktouched) | |
| 130 | |
| 128 # create the new wireproto commands ... | 131 # create the new wireproto commands ... |
| 129 wireproto.commands['putlfile'] = (proto.putlfile, 'sha') | 132 wireproto.commands['putlfile'] = (proto.putlfile, 'sha') |
| 130 wireproto.commands['getlfile'] = (proto.getlfile, 'sha') | 133 wireproto.commands['getlfile'] = (proto.getlfile, 'sha') |
| 131 wireproto.commands['statlfile'] = (proto.statlfile, 'sha') | 134 wireproto.commands['statlfile'] = (proto.statlfile, 'sha') |
| 132 | 135 |