# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1393781441 -3600
# Node ID b228ad1f79d7f87a3ebf03aa85490dd95ff0d475
# Parent  73a3a2386654d89c8fc179cdc37e56854daf5f2f
largefiles: override calculateupdates instead of manifestmerge

That will give calculateupdates a purpose in life ... and be convenient later.

diff -r 73a3a2386654 -r b228ad1f79d7 hgext/largefiles/overrides.py
--- 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)
diff -r 73a3a2386654 -r b228ad1f79d7 hgext/largefiles/uisetup.py
--- 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',