comparison hgext/mq.py @ 3073:1a792e4a1f3a

merge with brendan
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 09 Sep 2006 12:51:05 +0200
parents e20e7e2623b0 bc3fe3b5b785
children bed7cb835d8d
comparison
equal deleted inserted replaced
3072:e20e7e2623b0 3073:1a792e4a1f3a
1477 q = repo.mq 1477 q = repo.mq
1478 1478
1479 if not files: 1479 if not files:
1480 raise util.Abort(_('qfold requires at least one patch name')) 1480 raise util.Abort(_('qfold requires at least one patch name'))
1481 if not q.check_toppatch(repo): 1481 if not q.check_toppatch(repo):
1482 raise util.Abort(_('No patches applied\n')) 1482 raise util.Abort(_('No patches applied'))
1483 1483
1484 message = commands.logmessage(opts) 1484 message = commands.logmessage(opts)
1485 if opts['edit']: 1485 if opts['edit']:
1486 if message: 1486 if message:
1487 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) 1487 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))