261 return sm |
261 return sm |
262 |
262 |
263 def _updateprompt(ui, sub, dirty, local, remote): |
263 def _updateprompt(ui, sub, dirty, local, remote): |
264 if dirty: |
264 if dirty: |
265 msg = (_(' subrepository sources for %s differ\n' |
265 msg = (_(' subrepository sources for %s differ\n' |
266 'use (l)ocal source (%s) or (r)emote source (%s)?\n' |
266 'use (l)ocal source (%s) or (r)emote source (%s)?' |
267 '$$ &Local $$ &Remote') |
267 '$$ &Local $$ &Remote') |
268 % (subrelpath(sub), local, remote)) |
268 % (subrelpath(sub), local, remote)) |
269 else: |
269 else: |
270 msg = (_(' subrepository sources for %s differ (in checked out ' |
270 msg = (_(' subrepository sources for %s differ (in checked out ' |
271 'version)\n' |
271 'version)\n' |
272 'use (l)ocal source (%s) or (r)emote source (%s)?\n' |
272 'use (l)ocal source (%s) or (r)emote source (%s)?' |
273 '$$ &Local $$ &Remote') |
273 '$$ &Local $$ &Remote') |
274 % (subrelpath(sub), local, remote)) |
274 % (subrelpath(sub), local, remote)) |
275 return ui.promptchoice(msg, 0) |
275 return ui.promptchoice(msg, 0) |
276 |
276 |
277 def reporelpath(repo): |
277 def reporelpath(repo): |