comparison hgext/mq.py @ 5336:24de027551c1

Merge with crew-stable
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 24 Sep 2007 19:14:18 -0300
parents e14118f92730 448eb46d4d84
children bfbd9b954315
comparison
equal deleted inserted replaced
5328:8d00788ca578 5336:24de027551c1
1636 git-style patches (--git or [diff] git=1) to track copies and renames. 1636 git-style patches (--git or [diff] git=1) to track copies and renames.
1637 """ 1637 """
1638 q = repo.mq 1638 q = repo.mq
1639 message = cmdutil.logmessage(opts) 1639 message = cmdutil.logmessage(opts)
1640 if opts['edit']: 1640 if opts['edit']:
1641 if not q.applied:
1642 ui.write(_("No patches applied\n"))
1643 return 1
1641 if message: 1644 if message:
1642 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) 1645 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
1643 patch = q.applied[-1].name 1646 patch = q.applied[-1].name
1644 (message, comment, user, date, hasdiff) = q.readheaders(patch) 1647 (message, comment, user, date, hasdiff) = q.readheaders(patch)
1645 message = ui.edit('\n'.join(message), user or ui.username()) 1648 message = ui.edit('\n'.join(message), user or ui.username())