Mercurial > repos > other > linux
diff prompt.py @ 137:f71524147eb4
Fix some more binary vs str handling that I missed
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sat, 18 Jan 2020 20:28:52 +0000 |
| parents | fcd34011b0f0 |
| children | c09729100dd2 |
line wrap: on
line diff
--- 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!