Read about our upcoming Code of Conduct on this issue

Commit 9ce50bf6 authored by Raphaël Gomès's avatar Raphaël Gomès
Browse files

python3: enforce byte prefix for vfs.open()

Changeset ea8da5aa23c6 added raw prefix to open(),
but also to vfs.open(). The latter only handles bytestring arguments.
parent e1dc374909bd
......@@ -1057,7 +1057,7 @@ def _evolvemerge(repo, orig, dest, pctx, keepbranch):
if not orig.topic() and repo.vfs.exists('topic'):
repo.vfs.unlink('topic')
else:
with repo.vfs.open(r'topic', r'w') as f:
with repo.vfs.open(b'topic', b'w') as f:
f.write(orig.topic())
return merge.graft(repo, orig, pctx, ['destination', 'evolving'], True)
......
......@@ -923,7 +923,7 @@ def _changecurrenttopic(repo, newtopic):
if newtopic:
with repo.wlock():
with repo.vfs.open(r'topic', r'w') as f:
with repo.vfs.open(b'topic', b'w') as f:
f.write(newtopic)
else:
if repo.vfs.exists('topic'):
......@@ -1185,7 +1185,7 @@ def commitwrap(orig, ui, repo, *args, **opts):
hint = _("see 'hg help -e topic.topic-mode' for details")
if opts.get('topic'):
t = opts['topic']
with repo.vfs.open(r'topic', r'w') as f:
with repo.vfs.open(b'topic', b'w') as f:
f.write(t)
elif opts.get('amend'):
pass
......@@ -1197,7 +1197,7 @@ def commitwrap(orig, ui, repo, *args, **opts):
if not ui.quiet:
ui.warn(("(%s)\n") % hint)
elif notopic and mayrandom:
with repo.vfs.open(r'topic', r'w') as f:
with repo.vfs.open(b'topic', b'w') as f:
f.write(randomname.randomtopicname(ui))
return orig(ui, repo, *args, **opts)
......@@ -1241,7 +1241,7 @@ def mergeupdatewrap(orig, repo, node, branchmerge, force, *args, **kwargs):
pctx = repo[node]
if pctx.phase() > phases.public:
t = pctx.topic()
with repo.vfs.open(r'topic', r'w') as f:
with repo.vfs.open(b'topic', b'w') as f:
f.write(t)
if t and t != ot:
repo.ui.status(_("switching to topic %s\n") % t)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment