Commit 4635986a235 by timeless developer

xxx

parent 0a62dd7e159
......@@ -351,7 +351,7 @@ def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=(),
pullop = exchange.pulloperation(repo, remote, heads, force,
bookmarks=bookmarks)
if trmanager:
pullop.trmanager = trmanager(repo, 'pull', remote.url())
pullop.trmanager = trmanager(repo, b'pull', remote.url())
wlock = repo.wlock()
lock = repo.lock()
try:
......
......@@ -789,9 +789,9 @@ class GitHandler(object):
extra_message += (b"rename : " + oldfile + b" => " +
newfile + b"\n")
else:
spec = b'%s:%s' % (compat.quote(oldfile),
spec = '%s:%s' % (compat.quote(oldfile),
compat.quote(newfile))
git_extra.append((b'HG:rename', spec))
git_extra.append((b'HG:rename', spec.encode('utf-8')))
# hg extra items always go at the end
extraitems = list(extra.items())
......
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