Mercurial > hg
comparison hgext/mq.py @ 10962:8d5f5122a732
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 19 Apr 2010 17:00:02 -0500 |
parents | 29c39fe2491b ede19417c3c4 |
children | 49a07f441496 |
comparison
equal
deleted
inserted
replaced
10961:ce6d56b95f2e | 10962:8d5f5122a732 |
---|---|
1418 if pfx: | 1418 if pfx: |
1419 self.ui.write(pfx) | 1419 self.ui.write(pfx) |
1420 if summary: | 1420 if summary: |
1421 ph = patchheader(self.join(patchname), self.plainmode) | 1421 ph = patchheader(self.join(patchname), self.plainmode) |
1422 msg = ph.message and ph.message[0] or '' | 1422 msg = ph.message and ph.message[0] or '' |
1423 if self.ui.interactive(): | 1423 if not self.ui.plain(): |
1424 width = util.termwidth() - len(pfx) - len(patchname) - 2 | 1424 width = util.termwidth() - len(pfx) - len(patchname) - 2 |
1425 if width > 0: | 1425 if width > 0: |
1426 msg = util.ellipsis(msg, width) | 1426 msg = util.ellipsis(msg, width) |
1427 else: | 1427 else: |
1428 msg = '' | 1428 msg = '' |
2735 ('U', 'currentuser', None, _('add "From: <current user>" to patch')), | 2735 ('U', 'currentuser', None, _('add "From: <current user>" to patch')), |
2736 ('u', 'user', '', _('add "From: <given user>" to patch')), | 2736 ('u', 'user', '', _('add "From: <given user>" to patch')), |
2737 ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), | 2737 ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), |
2738 ('d', 'date', '', _('add "Date: <given date>" to patch')) | 2738 ('d', 'date', '', _('add "Date: <given date>" to patch')) |
2739 ] + commands.walkopts + commands.commitopts, | 2739 ] + commands.walkopts + commands.commitopts, |
2740 _('hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]...')), | 2740 _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...')), |
2741 "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), | 2741 "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), |
2742 "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), | 2742 "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), |
2743 "^qpop": | 2743 "^qpop": |
2744 (pop, | 2744 (pop, |
2745 [('a', 'all', None, _('pop all patches')), | 2745 [('a', 'all', None, _('pop all patches')), |