mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
commands: read/write the graftstate as utf8
Reviewed By: sfilipco Differential Revision: D20949689 fbshipit-source-id: 8541e9869dc0f4f9e595e011a3109d1cfb539a1a
This commit is contained in:
parent
e61591decc
commit
fee55b5c0d
@ -2416,7 +2416,7 @@ def _dograft(ui, repo, *revs, **opts):
|
||||
|
||||
# read in unfinished revisions
|
||||
try:
|
||||
nodes = repo.localvfs.read("graftstate").splitlines()
|
||||
nodes = repo.localvfs.readutf8("graftstate").splitlines()
|
||||
revs = [repo[node].rev() for node in nodes]
|
||||
except IOError as inst:
|
||||
if inst.errno != errno.ENOENT:
|
||||
@ -2560,7 +2560,7 @@ def _dograft(ui, repo, *revs, **opts):
|
||||
if stats and stats[3] > 0:
|
||||
# write out state for --continue
|
||||
nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
|
||||
repo.localvfs.write("graftstate", "".join(nodelines))
|
||||
repo.localvfs.writeutf8("graftstate", "".join(nodelines))
|
||||
extra = ""
|
||||
if opts.get("user"):
|
||||
extra += " --user %s" % util.shellquote(opts["user"])
|
||||
|
@ -1,4 +1,3 @@
|
||||
#require py2
|
||||
#chg-compatible
|
||||
|
||||
$ enable mergedriver
|
||||
|
Loading…
Reference in New Issue
Block a user