Mercurial > hg
comparison hgext/histedit.py @ 21175:dae36d3e1c60 stable
histedit, i18n: replace '+' with concatenation to make hggettext happy
| author | Wagner Bruna <wbruna@softwareexpress.com.br> |
|---|---|
| date | Tue, 22 Apr 2014 10:14:16 -0300 |
| parents | 76f68595ff8e |
| children | 213fd1a99cd9 |
comparison
equal
deleted
inserted
replaced
| 21174:7991df9d2f20 | 21175:dae36d3e1c60 |
|---|---|
| 568 remote = None | 568 remote = None |
| 569 root = findoutgoing(ui, repo, remote, force, opts) | 569 root = findoutgoing(ui, repo, remote, force, opts) |
| 570 else: | 570 else: |
| 571 rootrevs = list(repo.set('roots(%lr)', revs)) | 571 rootrevs = list(repo.set('roots(%lr)', revs)) |
| 572 if len(rootrevs) != 1: | 572 if len(rootrevs) != 1: |
| 573 raise util.Abort(_('The specified revisions must have ' + | 573 raise util.Abort(_('The specified revisions must have ' |
| 574 'exactly one common root')) | 574 'exactly one common root')) |
| 575 root = rootrevs[0].node() | 575 root = rootrevs[0].node() |
| 576 | 576 |
| 577 keep = opts.get('keep', False) | 577 keep = opts.get('keep', False) |
| 578 revs = between(repo, root, topmost, keep) | 578 revs = between(repo, root, topmost, keep) |