Mercurial > hg
changeset 9196:07d127e771a1
merge with crew-stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Wed, 22 Jul 2009 22:56:45 +0200 |
| parents | 8c719222ddd7 (current diff) d0225fa2f6c4 (diff) |
| children | a05aa192a00a |
| files | hgext/fetch.py hgext/rebase.py hgext/transplant.py mercurial/commands.py |
| diffstat | 5 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/fetch.py Wed Jul 22 08:28:30 2009 +0100 +++ b/hgext/fetch.py Wed Jul 22 22:56:45 2009 +0200 @@ -120,8 +120,9 @@ err = hg.merge(repo, secondparent, remind=False) if not err: + # we don't translate commit messages message = (cmdutil.logmessage(opts) or - (_('Automated merge with %s') % + ('Automated merge with %s' % url.removeauth(other.url()))) editor = cmdutil.commiteditor if opts.get('force_editor') or opts.get('edit'):
--- a/hgext/gpg.py Wed Jul 22 08:28:30 2009 +0100 +++ b/hgext/gpg.py Wed Jul 22 22:56:45 2009 +0200 @@ -251,7 +251,8 @@ message = opts['message'] if not message: - message = "\n".join([_("Added signature for changeset %s") + # we don't translate commit messages + message = "\n".join(["Added signature for changeset %s" % hgnode.short(n) for n in nodes]) try:
--- a/hgext/rebase.py Wed Jul 22 08:28:30 2009 +0100 +++ b/hgext/rebase.py Wed Jul 22 22:56:45 2009 +0200 @@ -162,6 +162,7 @@ newrev = nullrev try: if last: + # we don't translate commit messages commitmsg = 'Collapsed revision' for rebased in state: if rebased not in skipped:
--- a/hgext/transplant.py Wed Jul 22 08:28:30 2009 +0100 +++ b/hgext/transplant.py Wed Jul 22 22:56:45 2009 +0200 @@ -206,6 +206,7 @@ (user, date, message) = self.filter(filter, cl, patchfile) if log: + # we don't translate messages inserted into commits message += '\n(transplanted from %s)' % revlog.hex(node) self.ui.status(_('applying %s\n') % revlog.short(node))
--- a/mercurial/commands.py Wed Jul 22 08:28:30 2009 +0100 +++ b/mercurial/commands.py Wed Jul 22 22:56:45 2009 +0200 @@ -238,7 +238,8 @@ commit_opts = opts.copy() commit_opts['addremove'] = False if not commit_opts['message'] and not commit_opts['logfile']: - commit_opts['message'] = _("Backed out changeset %s") % (short(node)) + # we don't translate commit messages + commit_opts['message'] = "Backed out changeset %s" % (short(node)) commit_opts['force_editor'] = True commit(ui, repo, **commit_opts) def nice(node): @@ -2883,7 +2884,8 @@ raise util.Abort(_('tag \'%s\' is not a local tag') % n) rev_ = nullid if not message: - message = _('Removed tag %s') % ', '.join(names) + # we don't translate commit messages + message = 'Removed tag %s' % ', '.join(names) elif not opts.get('force'): for n in names: if n in repo.tags(): @@ -2895,7 +2897,8 @@ r = repo[rev_].node() if not message: - message = (_('Added tag %s for changeset %s') % + # we don't translate commit messages + message = ('Added tag %s for changeset %s' % (', '.join(names), short(r))) date = opts.get('date')