Patchwork [03,of,14] merge: consistently use repo.wopener.audit instead of creating a new auditor

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 13, 2013, 7:02 p.m.
Message ID <1bf1f4612f344d80ec12.1358103758@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/578/
State Superseded
Commit 26627c30735a610f59979a36885b327b25d8dbff
Headers show

Comments

Mads Kiilerich - Jan. 13, 2013, 7:02 p.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1357686093 -3600
# Node ID 1bf1f4612f344d80ec12bb844f34f2b6e3e4c345
# Parent  0b18eac3ef2b52ce21928ad2ec95c76dbb917c2b
merge: consistently use repo.wopener.audit instead of creating a new auditor

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -7,7 +7,7 @@ 
 
 from node import nullid, nullrev, hex, bin
 from i18n import _
-import error, scmutil, util, filemerge, copies, subrepo
+import error, util, filemerge, copies, subrepo
 import errno, os, shutil
 
 class mergestate(object):
@@ -360,7 +360,7 @@  def applyupdates(repo, action, wctx, mct
             if f != fd and move:
                 moves.append(f)
 
-    audit = scmutil.pathauditor(repo.root)
+    audit = repo.wopener.audit
 
     # remove renamed files after safely stored
     for f in moves:
@@ -393,7 +393,7 @@  def applyupdates(repo, action, wctx, mct
                                  overwrite)
                 continue
             f2, fd, flags, move = a[2:]
-            repo.wopener.audit(fd)
+            audit(fd)
             r = ms.resolve(fd, wctx, mctx)
             if r is not None and r > 0:
                 unresolved += 1
@@ -443,7 +443,7 @@  def applyupdates(repo, action, wctx, mct
                 repo.ui.warn(" %s\n" % nf)
         elif m == "e": # exec
             flags = a[2]
-            repo.wopener.audit(f)
+            audit(f)
             util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
     ms.commit()
     repo.ui.progress(_('updating'), None, total=numupdates, unit=_('files'))