Patchwork [16,of,20] rebase: directly use repo.vfs.join

login
register
mail settings
Submitter Pierre-Yves David
Date March 12, 2017, 2:45 p.m.
Message ID <e54bacb4b99787c7f111.1489329950@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/19161/
State Accepted
Headers show

Comments

Pierre-Yves David - March 12, 2017, 2:45 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1489020743 28800
#      Wed Mar 08 16:52:23 2017 -0800
# Node ID e54bacb4b99787c7f11150e91025b7c2e8f199d6
# Parent  70f3c8089b655f927ecae985e1633835c83bcdb8
# 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 e54bacb4b997
rebase: directly use repo.vfs.join

The 'repo.join' method is about to be deprecated.

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1099,7 +1099,7 @@  def storecollapsemsg(repo, collapsemsg):
 
 def clearcollapsemsg(repo):
     'Remove collapse message file'
-    util.unlinkpath(repo.join("last-message.txt"), ignoremissing=True)
+    util.unlinkpath(repo.vfs.join("last-message.txt"), ignoremissing=True)
 
 def restorecollapsemsg(repo, isabort):
     'Restore previously stored collapse message'
@@ -1120,7 +1120,7 @@  def restorecollapsemsg(repo, isabort):
 def clearstatus(repo):
     'Remove the status files'
     _clearrebasesetvisibiliy(repo)
-    util.unlinkpath(repo.join("rebasestate"), ignoremissing=True)
+    util.unlinkpath(repo.vfs.join("rebasestate"), ignoremissing=True)
 
 def needupdate(repo, state):
     '''check whether we should `update --clean` away from a merge, or if