[PATCH 11 of 20] histedit: directly use repo.vfs.join
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Sun Mar 12 10:45:45 EDT 2017
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1489020703 28800
# Wed Mar 08 16:51:43 2017 -0800
# Node ID d2ac8dae3e90a2971062288b7db78103a81ecf0a
# Parent d59fed8faa12306ec821b3191ff36a6a313fdaf6
# EXP-Topic vfs.cleanup
# Available At https://www.mercurial-scm.org/repo/users/marmoute/mercurial/
# hg pull https://www.mercurial-scm.org/repo/users/marmoute/mercurial/ -r d2ac8dae3e90
histedit: directly use repo.vfs.join
The 'repo.join' method is about to be deprecated.
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -1171,7 +1171,7 @@ def _aborthistedit(ui, repo, state):
# Recover our old commits if necessary
if not state.topmost in repo and state.backupfile:
- backupfile = repo.join(state.backupfile)
+ backupfile = repo.vfs.join(state.backupfile)
f = hg.openpath(ui, backupfile)
gen = exchange.readbundle(ui, f, backupfile)
with repo.transaction('histedit.abort') as tr:
@@ -1357,7 +1357,7 @@ def ruleeditor(repo, ui, actions, editco
# Save edit rules in .hg/histedit-last-edit.txt in case
# the user needs to ask for help after something
# surprising happens.
- f = open(repo.join('histedit-last-edit.txt'), 'w')
+ f = open(repo.vfs.join('histedit-last-edit.txt'), 'w')
f.write(rules)
f.close()
@@ -1598,7 +1598,7 @@ def stripwrapper(orig, ui, repo, nodelis
extensions.wrapfunction(repair, 'strip', stripwrapper)
def summaryhook(ui, repo):
- if not os.path.exists(repo.join('histedit-state')):
+ if not os.path.exists(repo.vfs.join('histedit-state')):
return
state = histeditstate(repo)
state.read()
More information about the Mercurial-devel
mailing list