# HG changeset patch # User IBBoard # Date 1579379332 0 # Node ID f71524147eb40daa3f466a77bb63a470c90b4721 # Parent fcd34011b0f0740cb81a4ef2cceeb89d7df38d61 Fix some more binary vs str handling that I missed diff -r fcd34011b0f0 -r f71524147eb4 prompt.py --- a/prompt.py Sat Jan 18 20:00:20 2020 +0000 +++ b/prompt.py Sat Jan 18 20:28:52 2020 +0000 @@ -452,7 +452,7 @@ def _pull_with_cache(orig, ui, repo, *args, **opts): """Wrap the pull command to delete the incoming cache as well.""" res = orig(ui, repo, *args, **opts) - cache = path.join(repo.root, CACHE_PATH, 'incoming') + cache = path.join(repo.root, CACHE_PATH, b'incoming') if path.isfile(cache): os.remove(cache) return res @@ -460,7 +460,7 @@ def _push_with_cache(orig, ui, repo, *args, **opts): """Wrap the push command to delete the outgoing cache as well.""" res = orig(ui, repo, *args, **opts) - cache = path.join(repo.root, CACHE_PATH, 'outgoing') + cache = path.join(repo.root, CACHE_PATH, b'outgoing') if path.isfile(cache): os.remove(cache) return res @@ -474,8 +474,8 @@ pass help.helptable += ( - (['prompt-keywords'], _('Keywords supported by hg-prompt'), - lambda _: r'''hg-prompt currently supports a number of keywords. + ([b'prompt-keywords'], _(b'Keywords supported by hg-prompt'), + lambda _: rb'''hg-prompt currently supports a number of keywords. Some keywords support filters. Filters can be chained when it makes sense to do so. When in doubt, try it!