Show More
@@ -121,8 +121,9 b" def fetch(ui, repo, source='default', **" | |||
|
121 | 121 | err = hg.merge(repo, secondparent, remind=False) |
|
122 | 122 | |
|
123 | 123 | if not err: |
|
124 | # we don't translate commit messages | |
|
124 | 125 | message = (cmdutil.logmessage(opts) or |
|
125 |
|
|
|
126 | ('Automated merge with %s' % | |
|
126 | 127 | url.removeauth(other.url()))) |
|
127 | 128 | editor = cmdutil.commiteditor |
|
128 | 129 | if opts.get('force_editor') or opts.get('edit'): |
@@ -251,7 +251,8 b' def sign(ui, repo, *revs, **opts):' | |||
|
251 | 251 | |
|
252 | 252 | message = opts['message'] |
|
253 | 253 | if not message: |
|
254 | message = "\n".join([_("Added signature for changeset %s") | |
|
254 | # we don't translate commit messages | |
|
255 | message = "\n".join(["Added signature for changeset %s" | |
|
255 | 256 | % hgnode.short(n) |
|
256 | 257 | for n in nodes]) |
|
257 | 258 | try: |
@@ -163,6 +163,7 b' def concludenode(repo, rev, p1, p2, stat' | |||
|
163 | 163 | newrev = nullrev |
|
164 | 164 | try: |
|
165 | 165 | if last: |
|
166 | # we don't translate commit messages | |
|
166 | 167 | commitmsg = 'Collapsed revision' |
|
167 | 168 | for rebased in state: |
|
168 | 169 | if rebased not in skipped: |
@@ -206,6 +206,7 b' class transplanter(object):' | |||
|
206 | 206 | (user, date, message) = self.filter(filter, cl, patchfile) |
|
207 | 207 | |
|
208 | 208 | if log: |
|
209 | # we don't translate messages inserted into commits | |
|
209 | 210 | message += '\n(transplanted from %s)' % revlog.hex(node) |
|
210 | 211 | |
|
211 | 212 | self.ui.status(_('applying %s\n') % revlog.short(node)) |
@@ -246,7 +246,8 b' def backout(ui, repo, node=None, rev=Non' | |||
|
246 | 246 | commit_opts = opts.copy() |
|
247 | 247 | commit_opts['addremove'] = False |
|
248 | 248 | if not commit_opts['message'] and not commit_opts['logfile']: |
|
249 | commit_opts['message'] = _("Backed out changeset %s") % (short(node)) | |
|
249 | # we don't translate commit messages | |
|
250 | commit_opts['message'] = "Backed out changeset %s" % (short(node)) | |
|
250 | 251 | commit_opts['force_editor'] = True |
|
251 | 252 | commit(ui, repo, **commit_opts) |
|
252 | 253 | def nice(node): |
@@ -2914,7 +2915,8 b' def tag(ui, repo, name1, *names, **opts)' | |||
|
2914 | 2915 | raise util.Abort(_('tag \'%s\' is not a local tag') % n) |
|
2915 | 2916 | rev_ = nullid |
|
2916 | 2917 | if not message: |
|
2917 | message = _('Removed tag %s') % ', '.join(names) | |
|
2918 | # we don't translate commit messages | |
|
2919 | message = 'Removed tag %s' % ', '.join(names) | |
|
2918 | 2920 | elif not opts.get('force'): |
|
2919 | 2921 | for n in names: |
|
2920 | 2922 | if n in repo.tags(): |
@@ -2926,7 +2928,8 b' def tag(ui, repo, name1, *names, **opts)' | |||
|
2926 | 2928 | r = repo[rev_].node() |
|
2927 | 2929 | |
|
2928 | 2930 | if not message: |
|
2929 | message = (_('Added tag %s for changeset %s') % | |
|
2931 | # we don't translate commit messages | |
|
2932 | message = ('Added tag %s for changeset %s' % | |
|
2930 | 2933 | (', '.join(names), short(r))) |
|
2931 | 2934 | |
|
2932 | 2935 | date = opts.get('date') |
General Comments 0
You need to be logged in to leave comments.
Login now