Mercurial > hg
comparison hgext/mq.py @ 31333:f897a088377c
mq: directly use repo.vfs.join
The 'repo.join' method is about to be deprecated.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 08 Mar 2017 16:52:16 -0800 |
| parents | 7eb53603744b |
| children | fd3d8eb7f545 |
comparison
equal
deleted
inserted
replaced
| 31332:a5ae1d79e271 | 31333:f897a088377c |
|---|---|
| 2918 mergeq = None | 2918 mergeq = None |
| 2919 | 2919 |
| 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: |
| 2927 ui.warn(_("no saved queues found, please use -n\n")) | 2927 ui.warn(_("no saved queues found, please use -n\n")) |
| 2928 return 1 | 2928 return 1 |
| 2958 Return 0 on success. | 2958 Return 0 on success. |
| 2959 """ | 2959 """ |
| 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: |
| 2967 q = repo.mq | 2967 q = repo.mq |
| 2968 ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate, | 2968 ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate, |
| 3312 fh.write('%s\n' % (name,)) | 3312 fh.write('%s\n' % (name,)) |
| 3313 fh.close() | 3313 fh.close() |
| 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: |
| 3323 if n in ':\\/.': | 3323 if n in ':\\/.': |
| 3324 return False | 3324 return False |