Mercurial > public > mercurial-scm > hg
diff mercurial/subrepoutil.py @ 42588:f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Differential Revision: https://phab.mercurial-scm.org/D6572
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Mon, 24 Jun 2019 16:01:01 -0700 |
| parents | 876494fd967d |
| children | 2372284d9457 |
line wrap: on
line diff
--- a/mercurial/subrepoutil.py Mon Jun 24 16:00:39 2019 -0700 +++ b/mercurial/subrepoutil.py Mon Jun 24 16:01:01 2019 -0700 @@ -168,8 +168,9 @@ prompts['ro'] = r[0] if repo.ui.promptchoice( _(' subrepository sources for %(s)s differ\n' - 'use (l)ocal%(l)s source (%(lo)s)' - ' or (r)emote%(o)s source (%(ro)s)?' + 'you can use (l)ocal%(l)s source (%(lo)s)' + ' or (r)emote%(o)s source (%(ro)s).\n' + 'what do you want to do?' '$$ &Local $$ &Remote') % prompts, 0): debug(s, "prompt changed, get", r) wctx.sub(s).get(r, overwrite) @@ -186,7 +187,9 @@ option = repo.ui.promptchoice( _(' subrepository %(s)s diverged (local revision: %(sl)s, ' 'remote revision: %(sr)s)\n' - '(M)erge, keep (l)ocal%(l)s or keep (r)emote%(o)s?' + 'you can (m)erge, keep (l)ocal%(l)s or keep ' + '(r)emote%(o)s.\n' + 'what do you want to do?' '$$ &Merge $$ &Local $$ &Remote') % prompts, 0) if option == 0: