From patchwork Tue Feb 5 18:13:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D5849: merge: don't unnecessarily calculate absolute path From: phabricator X-Patchwork-Id: 38450 Message-Id: <2ae56d8a8ae6247c386b5854c45d3445@localhost.localdomain> To: mercurial-devel@mercurial-scm.org Date: Tue, 5 Feb 2019 18:13:38 +0000 This revision was automatically updated to reflect the committed changes. Closed by commit rHG1f2714052d7e: merge: don't unnecessarily calculate absolute path (authored by martinvonz, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5849?vs=13810&id=13827 REVISION DETAIL https://phab.mercurial-scm.org/D5849 AFFECTED FILES mercurial/merge.py CHANGE DETAILS To: martinvonz, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1499,13 +1499,14 @@ # If a file or directory exists with the same name, back that # up. Otherwise, look to see if there is a file that conflicts # with a directory this file is in, and if so, back that up. - absf = repo.wjoin(f) + conflicting = f if not repo.wvfs.lexists(f): for p in util.finddirs(f): if repo.wvfs.isfileorlink(p): - absf = repo.wjoin(p) + conflicting = p break - if repo.wvfs.lexists(absf): + if repo.wvfs.lexists(conflicting): + absf = repo.wjoin(conflicting) orig = scmutil.origpath(ui, repo, absf) util.rename(absf, orig) wctx[f].clearunknown()