[PATCH 4 of 4 v2-vfs] vfs: use repo.vfs.rename
Mads Kiilerich
mads at kiilerich.com
Sat Mar 11 17:08:06 EST 2017
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1489259054 28800
# Sat Mar 11 11:04:14 2017 -0800
# Node ID 243a751bf6a01483e5f4ed4110213959d926af9f
# Parent ccc0f541eec23587a03c980e001a7a7e760f6e05
vfs: use repo.vfs.rename
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -3339,7 +3339,7 @@ def qqueue(ui, repo, name=None, **opts):
continue
fh.write('%s\n' % (queue,))
fh.close()
- util.rename(repo.join('patches.queues.new'), repo.join(_allqueues))
+ repo.vfs.rename('patches.queues.new', _allqueues)
if not name or opts.get('list') or opts.get('active'):
current = _getcurrent()
@@ -3392,7 +3392,7 @@ def qqueue(ui, repo, name=None, **opts):
else:
fh.write('%s\n' % (queue,))
fh.close()
- util.rename(repo.join('patches.queues.new'), repo.join(_allqueues))
+ repo.vfs.rename('patches.queues.new', _allqueues)
_setactivenocheck(name)
elif opts.get('delete'):
_delete(name)
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -551,15 +551,13 @@ def unshelveabort(ui, repo, state, opts)
try:
checkparents(repo, state)
- util.rename(repo.join('unshelverebasestate'),
- repo.join('rebasestate'))
+ repo.vfs.rename('unshelverebasestate', 'rebasestate')
try:
rebase.rebase(ui, repo, **{
'abort' : True
})
except Exception:
- util.rename(repo.join('rebasestate'),
- repo.join('unshelverebasestate'))
+ repo.vfs.rename('rebasestate', 'unshelverebasestate')
raise
mergefiles(ui, repo, state.wctx, state.pendingctx)
@@ -619,15 +617,13 @@ def unshelvecontinue(ui, repo, state, op
_("unresolved conflicts, can't continue"),
hint=_("see 'hg resolve', then 'hg unshelve --continue'"))
- util.rename(repo.join('unshelverebasestate'),
- repo.join('rebasestate'))
+ repo.vfs.rename('unshelverebasestate', 'rebasestate')
try:
rebase.rebase(ui, repo, **{
'continue' : True
})
except Exception:
- util.rename(repo.join('rebasestate'),
- repo.join('unshelverebasestate'))
+ repo.vfs.rename('rebasestate', 'unshelverebasestate')
raise
shelvectx = repo['tip']
@@ -698,8 +694,7 @@ def _rebaserestoredcommit(ui, repo, opts
shelvedstate.save(repo, basename, pctx, tmpwctx, stripnodes,
branchtorestore, opts.get('keep'))
- util.rename(repo.join('rebasestate'),
- repo.join('unshelverebasestate'))
+ repo.vfs.rename('rebasestate', 'unshelverebasestate')
raise error.InterventionRequired(
_("unresolved conflicts (see 'hg resolve', then "
"'hg unshelve --continue')"))
More information about the Mercurial-devel
mailing list