# HG changeset patch
# User Wagner Bruna <[email protected]>
# Date 1272076299 10800
# Branch stable
# Node ID 817df0d323a37a25326e7091dfded45b4909f0e6
# Parent 56b42d08d6033272c287b6a96c2c3d5dd43ec6e3
status, i18n: revert parameterized messages introduced by 56b42d08d603
diff --git a/tortoisehg/hgtk/status.py b/tortoisehg/hgtk/status.py
--- a/tortoisehg/hgtk/status.py
+++ b/tortoisehg/hgtk/status.py
@@ -1047,13 +1047,13 @@
opts.git = True
wctx = self.repo[None]
pctx1, pctx2 = wctx.parents()
- header = _('===== Diff to %s parent %d:%s =====\n')
- difftext = [header % (_('first'), pctx1.rev(), str(pctx1))]
+ difftext = [_('===== Diff to first parent %d:%s =====\n') % (
+ pctx1.rev(), str(pctx1))]
try:
for s in patch.diff(self.repo, pctx1.node(), None, opts=opts):
difftext.extend(s.splitlines(True))
- difftext.append('\n')
- difftext.append(header % (_('second'), pctx2.rev(),
str(pctx2)))
+ difftext.append(_('\n===== Diff to second parent %d:%s
=====\n') % (
+ pctx2.rev(), str(pctx2)))
for s in patch.diff(self.repo, pctx2.node(), None, opts=opts):
difftext.extend(s.splitlines(True))
except (IOError, error.RepoError, error.LookupError, util.Abort),
e:
@@ -1121,17 +1121,17 @@
opts = patch.diffopts(self.ui, self.opts)
opts.git = True
difftext = []
- header = _('===== Diff to %s parent %d:%s =====\n')
if self.is_merge():
wctx = self.repo[None]
pctx1, pctx2 = wctx.parents()
- difftext = [header % (_('first'), pctx1.rev(), str(pctx1))]
+ difftext = [_('===== Diff to first parent %d:%s =====\n') % (
+ pctx1.rev(), str(pctx1))]
try:
for s in patch.diff(self.repo, pctx1.node(), None,
match=matcher, opts=opts):
difftext.extend(s.splitlines(True))
- difftext.append('\n')
- difftext.append(header % (_('second'), pctx2.rev(),
str(pctx2)))
+ difftext.append(_('\n===== Diff to second parent %d:%s
=====\n') % (
+ pctx2.rev(), str(pctx2)))
for s in patch.diff(self.repo, pctx2.node(), None,
match=matcher, opts=opts):
difftext.extend(s.splitlines(True))
------------------------------------------------------------------------------
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
