Mercurial > evolve
diff hgext/evolve.py @ 1496:62aa11956a40
evolve: _() should not contain %
| author | timeless@mozdev.org |
|---|---|
| date | Wed, 09 Sep 2015 22:13:11 -0400 |
| parents | 625b75a01196 |
| children | cebe06c16837 |
line wrap: on
line diff
--- a/hgext/evolve.py Wed Sep 09 19:43:24 2015 -0400 +++ b/hgext/evolve.py Wed Sep 09 22:13:11 2015 -0400 @@ -1077,8 +1077,8 @@ fn, opts, _syn = entry else: fn, opts, = entry - deprecationwarning = _('%s have been deprecated in favor of %s\n' % ( - oldalias, newalias)) + deprecationwarning = _('%s have been deprecated in favor of %s\n') % ( + oldalias, newalias) def newfn(*args, **kwargs): ui = args[0] ui.warn(deprecationwarning) @@ -1702,7 +1702,7 @@ obs = obs.parents()[0] newer = obsolete.successorssets(repo, obs.node()) if len(newer) > 1: - msg = _("skipping %s: divergent rewriting. can't choose destination\n" % obs) + msg = _("skipping %s: divergent rewriting. can't choose destination\n") % obs ui.write_err(msg) return 2 targets = newer[0] @@ -1753,13 +1753,13 @@ bumped = repo[bumped.rev()] # For now we deny bumped merge if len(bumped.parents()) > 1: - msg = _('skipping %s : we do not handle merge yet\n' % bumped) + msg = _('skipping %s : we do not handle merge yet\n') % bumped ui.write_err(msg) return 2 prec = repo.set('last(allprecursors(%d) and public())', bumped).next() # For now we deny target merge if len(prec.parents()) > 1: - msg = _('skipping: %s: public version is a merge, this not handled yet\n' % prec) + msg = _('skipping: %s: public version is a merge, this not handled yet\n') % prec ui.write_err(msg) return 2 @@ -2598,7 +2598,7 @@ if disallowunstable: # XXX We should check head revs if repo.revs("(%d::) - %d", rev, rev): - raise util.Abort(_("cannot split commit: %s not a head" % ctx)) + raise util.Abort(_("cannot split commit: %s not a head") % ctx) if len(ctx.parents()) > 1: raise util.Abort(_("cannot split merge commits"))