Mercurial > hg-stable
changeset 20638:b228ad1f79d7
largefiles: override calculateupdates instead of manifestmerge
That will give calculateupdates a purpose in life ... and be convenient later.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sun, 02 Mar 2014 18:30:41 +0100 |
| parents | 73a3a2386654 |
| children | 1df033640a8e |
| files | hgext/largefiles/overrides.py hgext/largefiles/uisetup.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Tue Feb 25 20:28:40 2014 +0100 +++ b/hgext/largefiles/overrides.py Sun Mar 02 18:30:41 2014 +0100 @@ -365,8 +365,8 @@ # Finally, the merge.applyupdates function will then take care of # writing the files into the working copy and lfcommands.updatelfiles # will update the largefiles. -def overridemanifestmerge(origfn, repo, p1, p2, pa, branchmerge, force, - partial, acceptremote=False): +def overridecalculateupdates(origfn, repo, p1, p2, pa, branchmerge, force, + partial, acceptremote=False): overwrite = force and not branchmerge actions = origfn(repo, p1, p2, pa, branchmerge, force, partial, acceptremote)
--- a/hgext/largefiles/uisetup.py Tue Feb 25 20:28:40 2014 +0100 +++ b/hgext/largefiles/uisetup.py Sun Mar 02 18:30:41 2014 +0100 @@ -96,8 +96,8 @@ overrides.overridecat) entry = extensions.wrapfunction(merge, '_checkunknownfile', overrides.overridecheckunknownfile) - entry = extensions.wrapfunction(merge, 'manifestmerge', - overrides.overridemanifestmerge) + entry = extensions.wrapfunction(merge, 'calculateupdates', + overrides.overridecalculateupdates) entry = extensions.wrapfunction(filemerge, 'filemerge', overrides.overridefilemerge) entry = extensions.wrapfunction(cmdutil, 'copy',