##// END OF EJS Templates
mq: directly use repo.vfs.join...
Pierre-Yves David -
r31333:f897a088 default
parent child Browse files
Show More
@@ -2920,7 +2920,7 b' def push(ui, repo, patch=None, **opts):'
2920 opts = fixkeepchangesopts(ui, opts)
2920 opts = fixkeepchangesopts(ui, opts)
2921 if opts.get('merge'):
2921 if opts.get('merge'):
2922 if opts.get('name'):
2922 if opts.get('name'):
2923 newpath = repo.join(opts.get('name'))
2923 newpath = repo.vfs.join(opts.get('name'))
2924 else:
2924 else:
2925 newpath, i = lastsavename(q.path)
2925 newpath, i = lastsavename(q.path)
2926 if not newpath:
2926 if not newpath:
@@ -2960,7 +2960,7 b' def pop(ui, repo, patch=None, **opts):'
2960 opts = fixkeepchangesopts(ui, opts)
2960 opts = fixkeepchangesopts(ui, opts)
2961 localupdate = True
2961 localupdate = True
2962 if opts.get('name'):
2962 if opts.get('name'):
2963 q = queue(ui, repo.baseui, repo.path, repo.join(opts.get('name')))
2963 q = queue(ui, repo.baseui, repo.path, repo.vfs.join(opts.get('name')))
2964 ui.warn(_('using patch queue: %s\n') % q.path)
2964 ui.warn(_('using patch queue: %s\n') % q.path)
2965 localupdate = False
2965 localupdate = False
2966 else:
2966 else:
@@ -3314,9 +3314,9 b' def qqueue(ui, repo, name=None, **opts):'
3314
3314
3315 def _queuedir(name):
3315 def _queuedir(name):
3316 if name == 'patches':
3316 if name == 'patches':
3317 return repo.join('patches')
3317 return repo.vfs.join('patches')
3318 else:
3318 else:
3319 return repo.join('patches-' + name)
3319 return repo.vfs.join('patches-' + name)
3320
3320
3321 def _validname(name):
3321 def _validname(name):
3322 for n in name:
3322 for n in name:
General Comments 0
You need to be logged in to leave comments. Login now