Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 23879:b88278a308c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: remove all external users of localrepo.wopener This change touches every module in which repository.wopener was being used, and changes it for the equivalent repository.wvfs. It should now be possible to remove localrepo.wopener.
author Angel Ezquerra <angel.ezquerra@gmail.com>
date Sun, 11 Jan 2015 01:51:52 +0100
parents 7cc77030c557
children 6becb9dbca25
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Jan 11 00:25:54 2015 +0100
+++ b/mercurial/merge.py	Sun Jan 11 01:51:52 2015 +0100
@@ -301,7 +301,7 @@
     if f2 is None:
         f2 = f
     return (os.path.isfile(repo.wjoin(f))
-        and repo.wopener.audit.check(f)
+        and repo.wvfs.audit.check(f)
         and repo.dirstate.normalize(f) not in repo.dirstate
         and mctx[f2].cmp(wctx[f]))
 
@@ -651,7 +651,7 @@
     verbose = repo.ui.verbose
     unlink = util.unlinkpath
     wjoin = repo.wjoin
-    audit = repo.wopener.audit
+    audit = repo.wvfs.audit
     i = 0
     for f, args, msg in actions:
         repo.ui.debug(" %s: %s -> r\n" % (f, msg))
@@ -727,7 +727,7 @@
         if f1 != f and move:
             moves.append(f1)
 
-    audit = repo.wopener.audit
+    audit = repo.wvfs.audit
     _updating = _('updating')
     _files = _('files')
     progress = repo.ui.progress