Patchwork [5,of,5,V2] merge: don't pre-check for locally unknown files

mail settings
Submitter Siddharth Agarwal
Date Feb. 8, 2013, 10:18 p.m.
Message ID <b93fa3c1eebc281670cf.1360361888@sid0x220>
Download mbox | patch
Permalink /patch/844/
State Superseded
Commit 26627c30735a610f59979a36885b327b25d8dbff
Headers show


Siddharth Agarwal - Feb. 8, 2013, 10:18 p.m.
# HG changeset patch
# User Siddharth Agarwal <>
# Date 1360339767 0
# Node ID b93fa3c1eebc281670cff81b8a0870362fbe170f
# Parent  a3d0334527f026f4eb338c10f225b09def43d911
merge: don't pre-check for locally unknown files

Now that unknown files are checked in manifestmerge, this is no longer
necessary. On a repository with over 150,000 files, this speeds up an update
by 0.6-0.8 seconds, which is up to 25%.


diff --git a/mercurial/ b/mercurial/
--- a/mercurial/
+++ b/mercurial/
@@ -472,8 +472,6 @@  def calculateupdates(repo, tctx, mctx, a
             _checkcollision(mctx, None)
             _checkcollision(mctx, (tctx, ancestor))
-    if not force:
-        _checkunknown(repo, tctx, mctx)
     if tctx.rev() is None:
         actions += _forgetremoved(tctx, mctx, branchmerge)
     actions += manifestmerge(repo, tctx, mctx,