From patchwork Thu Oct 15 21:46:56 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1,of,2] convert: temporarily disable hg p2 optimization
From: Mads Kiilerich <mads@kiilerich.com>
X-Patchwork-Id: 11124
Message-Id: <8c7010f12530b69c86d2.1444945616@localhost.localdomain>
To: mercurial-devel@selenic.com
Date: Thu, 15 Oct 2015 23:46:56 +0200

# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1444945384 -7200
#      Thu Oct 15 23:43:04 2015 +0200
# Node ID 8c7010f12530b69c86d2bcdd70098ced582ece49
# Parent  07db7e95c464537aeb2dd7aba39de0813eaffd04
convert: temporarily disable hg p2 optimization

Disabling the optimization gives a test change. That proves that the optimized
code path is wrong. That seems to have been introduced in a75d24539aba.

diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -221,7 +221,7 @@ class mercurial_sink(converter_sink):
         files = dict(files)
 
         def getfilectx(repo, memctx, f):
-            if p2ctx and f in p2files and f not in copies:
+            if p2ctx and f in p2files and f not in copies and False:
                 self.ui.debug('reusing %s from p2\n' % f)
                 try:
                     return p2ctx[f]
diff --git a/tests/test-convert-filemap.t b/tests/test-convert-filemap.t
--- a/tests/test-convert-filemap.t
+++ b/tests/test-convert-filemap.t
@@ -723,11 +723,11 @@ test converting merges into a repo that 
   $ hg -R merge-test2 manifest -r tip
   converted/a
   converted/b
-  x
   $ hg -R merge-test2 log -G -T '{shortest(node)} {desc}\n{files % "- {file}\n"}\n'
-  o    6eaa merge a & b
+  o    0390 merge a & b
   |\   - converted/a
   | |  - toberemoved
+  | |  - x
   | |
   | o  2995 add b
   | |  - converted/b