facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity

merge: consistently use repo.wopener.audit instead of creating a new auditor

Browse Source
This commit is contained in:
Mads Kiilerich 2013-01-09 00:01:33 +01:00
parent 0d0f5ceab6
commit 0fea0bfee8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mercurial/merge.py
View File

@ -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, mctx, actx, overwrite):
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, mctx, actx, overwrite):
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, mctx, actx, overwrite):
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'))