Patchwork [12,of,20] journal: directly use repo.vfs.join

login
register
mail settings
Submitter Pierre-Yves David
Date March 12, 2017, 2:45 p.m.
Message ID <dd60e7685c86beee4e87.1489329946@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/19157/
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 1489020709 28800
#      Wed Mar 08 16:51:49 2017 -0800
# Node ID dd60e7685c86beee4e87bc4cc1529da4bfc94eab
# Parent  d2ac8dae3e90a2971062288b7db78103a81ecf0a
# 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 dd60e7685c86
journal: directly use repo.vfs.join

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

Patch

diff --git a/hgext/journal.py b/hgext/journal.py
--- a/hgext/journal.py
+++ b/hgext/journal.py
@@ -163,7 +163,7 @@  def unsharejournal(orig, ui, repo, repop
             # to copy. move shared date over from source to destination but
             # move the local file first
             if repo.vfs.exists('namejournal'):
-                journalpath = repo.join('namejournal')
+                journalpath = repo.vfs.join('namejournal')
                 util.rename(journalpath, journalpath + '.bak')
             storage = repo.journal
             local = storage._open(