[PATCH 03 of 16] largefiles: override calculateupdates instead of manifestmerge
Mads Kiilerich
mads at kiilerich.com
Sun Mar 2 13:15:36 CST 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1393781441 -3600
# Sun Mar 02 18:30:41 2014 +0100
# Node ID e265102a5342cc09743238aac2283d97c271a0b1
# Parent 607a2f736a1b77639bbc7c6dc4b0c47241dd0f3d
largefiles: override calculateupdates instead of manifestmerge
That will give calculateupdates a purpose in life ... and be convenient later.
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -365,8 +365,8 @@ def overridecheckunknownfile(origfn, rep
# 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)
diff --git a/hgext/largefiles/uisetup.py b/hgext/largefiles/uisetup.py
--- a/hgext/largefiles/uisetup.py
+++ b/hgext/largefiles/uisetup.py
@@ -96,8 +96,8 @@ def uisetup(ui):
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',
More information about the Mercurial-devel
mailing list