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

hgsql: use with context for locking and config overrides

Browse Source 
Summary:
Modernize the code to use `with` instead of `try`. The motivation is to get rid
of `ui.backupconfig`.

Reviewed By: DurhamG

Differential Revision: D8886249

fbshipit-source-id: 21591a2e74e61215b0b55a493a8c3b94a63ca5d9
This commit is contained in:
Jun Wu 2018-08-09 21:07:09 -07:00 committed by Facebook Github Bot
parent 3e4c952d62
commit 1c4f6377fc
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hgext/hgsql.py
View File

@ -774,7 +774,8 @@ def wraprepo(repo):
# afterwards.
oldmancache = self.manifestlog._dirmancache
wlock = lock = None
wlock = util.nullcontextmanager()
lock = util.nullcontextmanager()
try:
wlock = self.wlock(wait=waitforlock)
lock = self.lock(wait=waitforlock)
@ -785,24 +786,20 @@ def wraprepo(repo):
ui.debug("skipping sync for current operation\n")
return
configbackups = []
try:
# Disable all pretxnclose hooks, since these revisions are
# technically already commited.
for name, value in ui.configitems("hooks"):
if name.startswith("pretxnclose"):
configbackups.append(ui.backupconfig("hooks", name))
ui.setconfig("hooks", name, None)
# Disable all pretxnclose hooks, since these revisions are
# technically already committed.
overrides = {}
for name, value in ui.configitems("hooks"):
# The hg-ssh wrapper installs a hook to block all writes. We need to
# circumvent this when we sync from the server.
configbackups.append(ui.backupconfig("hooks", "pretxnopen.hg-ssh"))
self.ui.setconfig("hooks", "pretxnopen.hg-ssh", None)
configbackups.append(ui.backupconfig("hooks", "pretxnopen.hg-rsh"))
self.ui.setconfig("hooks", "pretxnopen.hg-rsh", None)
configbackups.append(
ui.backupconfig("hooks", "pretxnopen.readonlyrejectpush")
)
self.ui.setconfig("hooks", "pretxnopen.readonlyrejectpush", None)
if name.startswith("pretxnclose") or name in {
"pretxnopen.hg-ssh",
"pretxnopen.hg-rsh",
"pretxnopen.readonlyrejectpush",
}:
overrides[("hooks", name)] = None
with ui.configoverride(overrides, "hgsql"), wlock, lock:
# Someone else may have synced us while we were waiting.
# Restart the transaction so we have access to the latest rows.
self.sqlconn.rollback()
@ -897,13 +894,6 @@ def wraprepo(repo):
if bm != sqlbookmarks:
raise CorruptionException("bookmarks don't match after sync")
finally:
for backup in configbackups:
ui.restoreconfig(backup)
if lock:
lock.release()
if wlock:
wlock.release()
# Since we just exited the lock, the changelog and bookmark
# in-memory structures will need to be reloaded. If we loaded