Mercurial > hg

comparison mercurial/subrepo.py @ 42588:f6540aba8e3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 aaad36b88298
children 2372284d9457
comparison
equal deleted inserted replaced
42587:421fdf30c37c 42588:f6540aba8e3e
86 return decoratedmethod 86 return decoratedmethod
87 87
88 def _updateprompt(ui, sub, dirty, local, remote): 88 def _updateprompt(ui, sub, dirty, local, remote):
89 if dirty: 89 if dirty:
90 msg = (_(' subrepository sources for %s differ\n' 90 msg = (_(' subrepository sources for %s differ\n'
91 'use (l)ocal source (%s) or (r)emote source (%s)?' 91 'you can use (l)ocal source (%s) or (r)emote source (%s).\n'
92 'what do you want to do?'
92 '$$ &Local $$ &Remote') 93 '$$ &Local $$ &Remote')
93 % (subrelpath(sub), local, remote)) 94 % (subrelpath(sub), local, remote))
94 else: 95 else:
95 msg = (_(' subrepository sources for %s differ (in checked out ' 96 msg = (_(' subrepository sources for %s differ (in checked out '
96 'version)\n' 97 'version)\n'
97 'use (l)ocal source (%s) or (r)emote source (%s)?' 98 'you can use (l)ocal source (%s) or (r)emote source (%s).\n'
99 'what do you want to do?'
98 '$$ &Local $$ &Remote') 100 '$$ &Local $$ &Remote')
99 % (subrelpath(sub), local, remote)) 101 % (subrelpath(sub), local, remote))
100 return ui.promptchoice(msg, 0) 102 return ui.promptchoice(msg, 0)
101 103
102 def _sanitize(ui, vfs, ignore): 104 def _sanitize(ui, vfs, ignore):