[PATCH 20 of 20] win32text: directly use repo.vfs.join

Pierre-Yves David pierre-yves.david at ens-lyon.org
Sun Mar 12 10:45:54 EDT 2017


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1489020777 28800
#      Wed Mar 08 16:52:57 2017 -0800
# Node ID 813d1adef5103b3d7b9f66949325da235d41a756
# Parent  e861b60800fc9be5d4bc33250e030c8801d87d95
# 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 813d1adef510
win32text: directly use repo.vfs.join

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

diff --git a/hgext/win32text.py b/hgext/win32text.py
--- a/hgext/win32text.py
+++ b/hgext/win32text.py
@@ -74,7 +74,7 @@ def checknewline(s, newline, ui=None, re
                   'and does not need EOL conversion by the win32text plugin.\n'
                   'Before your next commit, please reconsider your '
                   'encode/decode settings in \nMercurial.ini or %s.\n') %
-                (filename, newlinestr[newline], repo.join('hgrc')))
+                (filename, newlinestr[newline], repo.vfs.join('hgrc')))
 
 def dumbdecode(s, cmd, **kwargs):
     checknewline(s, '\r\n', **kwargs)


More information about the Mercurial-devel mailing list