merge: make messages translatable
These messages have been overlooked by check-code, because they start
with non-alphabet character (' ').
Making these messages translatable seems reasonable, because all other
'ui.note()'-ed messages in calculateupdates() are already
translatable.
This is also a part of preparation for making "missing _() in ui
message" detection of check-code more exact.
--- a/mercurial/merge.py Thu May 26 01:57:34 2016 +0900
+++ b/mercurial/merge.py Thu May 26 01:57:34 2016 +0900
@@ -989,19 +989,19 @@
if len(bids) == 1: # all bids are the same kind of method
m, l = bids.items()[0]
if all(a == l[0] for a in l[1:]): # len(bids) is > 1
- repo.ui.note(" %s: consensus for %s\n" % (f, m))
+ repo.ui.note(_(" %s: consensus for %s\n") % (f, m))
actions[f] = l[0]
continue
# If keep is an option, just do it.
if 'k' in bids:
- repo.ui.note(" %s: picking 'keep' action\n" % f)
+ repo.ui.note(_(" %s: picking 'keep' action\n") % f)
actions[f] = bids['k'][0]
continue
# If there are gets and they all agree [how could they not?], do it.
if 'g' in bids:
ga0 = bids['g'][0]
if all(a == ga0 for a in bids['g'][1:]):
- repo.ui.note(" %s: picking 'get' action\n" % f)
+ repo.ui.note(_(" %s: picking 'get' action\n") % f)
actions[f] = ga0
continue
# TODO: Consider other simple actions such as mode changes