Patchwork [2,of,5] localrepo: kill off sopener

login
register
mail settings
Submitter Siddharth Agarwal
Date June 26, 2015, 5:24 a.m.
Message ID <438c204ed884e6e349e5.1435296249@devbig136.prn2.facebook.com>
Download mbox | patch
Permalink /patch/9785/
State Accepted
Headers show

Comments

Siddharth Agarwal - June 26, 2015, 5:24 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1435295872 25200
#      Thu Jun 25 22:17:52 2015 -0700
# Node ID 438c204ed884e6e349e5ea0a1bff6ed17f58797c
# Parent  66710aec23053660f0bd621940108745f05150b6
localrepo: kill off sopener
Pierre-Yves David - June 26, 2015, 9:27 a.m.
On 06/25/2015 10:24 PM, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1435295872 25200
> #      Thu Jun 25 22:17:52 2015 -0700
> # Node ID 438c204ed884e6e349e5ea0a1bff6ed17f58797c
> # Parent  66710aec23053660f0bd621940108745f05150b6
> localrepo: kill off sopener


I've added (API) to the subject line and the following to the description.


sopener is deprecated since 7034365089bf (Mercurial 2.3). It's annoying 
for extension authors to have to deal with both. Let's just kill it off.

The result is pushed to the clowncopter.

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -293,7 +293,6 @@  class localrepository(object):
                 self.requirements, self.sharedpath, scmutil.vfs)
         self.spath = self.store.path
         self.svfs = self.store.vfs
-        self.sopener = self.svfs
         self.sjoin = self.store.join
         self.vfs.createmode = self.store.createmode
         self._applyopenerreqs()
@@ -983,7 +982,7 @@  class localrepository(object):
             reporef().hook('pretxnclose', throw=True, pending=pending,
                            txnname=desc, **tr.hookargs)
 
-        tr = transaction.transaction(rp, self.sopener, vfsmap,
+        tr = transaction.transaction(rp, self.svfs, vfsmap,
                                      "journal",
                                      "undo",
                                      aftertrans(renames),