Show More
@@ -147,7 +147,7 b' def bookmark(ui, repo, mark=None, rev=No' | |||
|
147 | 147 | if rev: |
|
148 | 148 | raise util.Abort(_("bookmark name required")) |
|
149 | 149 | if len(marks) == 0: |
|
150 | ui.status("no bookmarks set\n") | |
|
150 | ui.status(_("no bookmarks set\n")) | |
|
151 | 151 | else: |
|
152 | 152 | for bmark, n in marks.iteritems(): |
|
153 | 153 | if ui.configbool('bookmarks', 'track.current'): |
@@ -221,8 +221,8 b' def sign(ui, repo, *revs, **opts):' | |||
|
221 | 221 | |
|
222 | 222 | for n in nodes: |
|
223 | 223 | hexnode = hgnode.hex(n) |
|
224 | ui.write("Signing %d:%s\n" % (repo.changelog.rev(n), | |
|
225 | hgnode.short(n))) | |
|
224 | ui.write(_("Signing %d:%s\n") % (repo.changelog.rev(n), | |
|
225 | hgnode.short(n))) | |
|
226 | 226 | # build data |
|
227 | 227 | data = node2txt(repo, n, sigver) |
|
228 | 228 | sig = mygpg.sign(data) |
@@ -2199,7 +2199,7 b' def header(ui, repo, patch=None):' | |||
|
2199 | 2199 | patch = q.lookup(patch) |
|
2200 | 2200 | else: |
|
2201 | 2201 | if not q.applied: |
|
2202 | ui.write('no patches applied\n') | |
|
2202 | ui.write(_('no patches applied\n')) | |
|
2203 | 2203 | return 1 |
|
2204 | 2204 | patch = q.lookup('qtip') |
|
2205 | 2205 | ph = patchheader(q.join(patch), q.plainmode) |
@@ -2302,8 +2302,7 b' def rename(ui, repo, patch, name=None, *' | |||
|
2302 | 2302 | raise util.Abort( |
|
2303 | 2303 | _('A patch named %s already exists in the series file') % name) |
|
2304 | 2304 | |
|
2305 | if ui.verbose: | |
|
2306 | ui.write('renaming %s to %s\n' % (patch, name)) | |
|
2305 | ui.note(_('renaming %s to %s\n') % (patch, name)) | |
|
2307 | 2306 | i = q.find_series(patch) |
|
2308 | 2307 | guards = q.guard_re.findall(q.full_series[i]) |
|
2309 | 2308 | q.full_series[i] = name + ''.join([' #' + g for g in guards]) |
@@ -393,13 +393,13 b' def hasnode(repo, node):' | |||
|
393 | 393 | def browserevs(ui, repo, nodes, opts): |
|
394 | 394 | '''interactively transplant changesets''' |
|
395 | 395 | def browsehelp(ui): |
|
396 | ui.write('y: transplant this changeset\n' | |
|
397 | 'n: skip this changeset\n' | |
|
398 | 'm: merge at this changeset\n' | |
|
399 | 'p: show patch\n' | |
|
400 | 'c: commit selected changesets\n' | |
|
401 | 'q: cancel transplant\n' | |
|
402 | '?: show this help\n') | |
|
396 | ui.write(_('y: transplant this changeset\n' | |
|
397 | 'n: skip this changeset\n' | |
|
398 | 'm: merge at this changeset\n' | |
|
399 | 'p: show patch\n' | |
|
400 | 'c: commit selected changesets\n' | |
|
401 | 'q: cancel transplant\n' | |
|
402 | '?: show this help\n')) | |
|
403 | 403 | |
|
404 | 404 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
405 | 405 | transplants = [] |
@@ -418,7 +418,7 b' def browserevs(ui, repo, nodes, opts):' | |||
|
418 | 418 | ui.write(chunk) |
|
419 | 419 | action = None |
|
420 | 420 | elif action not in ('y', 'n', 'm', 'c', 'q'): |
|
421 | ui.write('no such option\n') | |
|
421 | ui.write(_('no such option\n')) | |
|
422 | 422 | action = None |
|
423 | 423 | if action == 'y': |
|
424 | 424 | transplants.append(node) |
@@ -1890,7 +1890,7 b' class localrepository(repo.repository):' | |||
|
1890 | 1890 | lookup_filenode_link_func(fname)) |
|
1891 | 1891 | for chnk in group: |
|
1892 | 1892 | self.ui.progress( |
|
1893 | 'bundle files', cnt, item=fname, unit='chunks') | |
|
1893 | _('bundle files'), cnt, item=fname, unit='chunks') | |
|
1894 | 1894 | cnt += 1 |
|
1895 | 1895 | yield chnk |
|
1896 | 1896 | if fname in msng_filenode_set: |
@@ -1974,10 +1974,10 b' class localrepository(repo.repository):' | |||
|
1974 | 1974 | lookup = lookuprevlink_func(filerevlog) |
|
1975 | 1975 | for chnk in filerevlog.group(nodeiter, lookup): |
|
1976 | 1976 | self.ui.progress( |
|
1977 | 'bundle files', cnt, item=fname, unit='chunks') | |
|
1977 | _('bundle files'), cnt, item=fname, unit='chunks') | |
|
1978 | 1978 | cnt += 1 |
|
1979 | 1979 | yield chnk |
|
1980 | self.ui.progress('bundle files', None, unit='chunks') | |
|
1980 | self.ui.progress(_('bundle files'), None, unit='chunks') | |
|
1981 | 1981 | |
|
1982 | 1982 | yield changegroup.closechunk() |
|
1983 | 1983 |
@@ -336,7 +336,7 b' class svnsubrepo(object):' | |||
|
336 | 336 | self._ui.warn(_('not removing repo %s because ' |
|
337 | 337 | 'it has changes.\n' % self._path)) |
|
338 | 338 | return |
|
339 | self._ui.note('removing subrepo %s\n' % self._path) | |
|
339 | self._ui.note(_('removing subrepo %s\n') % self._path) | |
|
340 | 340 | shutil.rmtree(self._ctx.repo.join(self._path)) |
|
341 | 341 | |
|
342 | 342 | def get(self, state): |
General Comments 0
You need to be logged in to leave comments.
Login now