Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: directly use repo.vfs.join
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Wed, 08 Mar 2017 16:52:16 -0800
changeset 31342 f897a088377c
parent 31341 a5ae1d79e271
child 31343 553680d1b654
mq: directly use repo.vfs.join The 'repo.join' method is about to be deprecated.
hgext/mq.py file | annotate | diff | comparison | revisions 
--- a/hgext/mq.py	Wed Mar 08 16:52:06 2017 -0800
+++ b/hgext/mq.py	Wed Mar 08 16:52:16 2017 -0800
@@ -2920,7 +2920,7 @@
     opts = fixkeepchangesopts(ui, opts)
     if opts.get('merge'):
         if opts.get('name'):
-            newpath = repo.join(opts.get('name'))
+            newpath = repo.vfs.join(opts.get('name'))
         else:
             newpath, i = lastsavename(q.path)
         if not newpath:
@@ -2960,7 +2960,7 @@
     opts = fixkeepchangesopts(ui, opts)
     localupdate = True
     if opts.get('name'):
-        q = queue(ui, repo.baseui, repo.path, repo.join(opts.get('name')))
+        q = queue(ui, repo.baseui, repo.path, repo.vfs.join(opts.get('name')))
         ui.warn(_('using patch queue: %s\n') % q.path)
         localupdate = False
     else:
@@ -3314,9 +3314,9 @@
 
     def _queuedir(name):
         if name == 'patches':
-            return repo.join('patches')
+            return repo.vfs.join('patches')
         else:
-            return repo.join('patches-' + name)
+            return repo.vfs.join('patches-' + name)
 
     def _validname(name):
         for n in name:
hg-stable