##// END OF EJS Templates
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Brendan Cully -
r2804:4b20daa2 default
parent child Browse files
Show More
@@ -1283,7 +1283,7 b' def new(ui, repo, patch, **opts):'
1283 If neither is specified, the patch header is empty and the
1283 If neither is specified, the patch header is empty and the
1284 commit message is 'New patch: PATCH'"""
1284 commit message is 'New patch: PATCH'"""
1285 q = repo.mq
1285 q = repo.mq
1286 message = commands.logmessage(**opts)
1286 message = commands.logmessage(opts)
1287 q.new(repo, patch, msg=message, force=opts['force'])
1287 q.new(repo, patch, msg=message, force=opts['force'])
1288 q.save_dirty()
1288 q.save_dirty()
1289 return 0
1289 return 0
@@ -1291,7 +1291,7 b' def new(ui, repo, patch, **opts):'
1291 def refresh(ui, repo, **opts):
1291 def refresh(ui, repo, **opts):
1292 """update the current patch"""
1292 """update the current patch"""
1293 q = repo.mq
1293 q = repo.mq
1294 message = commands.logmessage(**opts)
1294 message = commands.logmessage(opts)
1295 if opts['edit']:
1295 if opts['edit']:
1296 if message:
1296 if message:
1297 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
1297 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
@@ -1328,7 +1328,7 b' def fold(ui, repo, *files, **opts):'
1328 if not q.check_toppatch(repo):
1328 if not q.check_toppatch(repo):
1329 raise util.Abort(_('No patches applied\n'))
1329 raise util.Abort(_('No patches applied\n'))
1330
1330
1331 message = commands.logmessage(**opts)
1331 message = commands.logmessage(opts)
1332 if opts['edit']:
1332 if opts['edit']:
1333 if message:
1333 if message:
1334 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
1334 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
@@ -1505,7 +1505,7 b' def restore(ui, repo, rev, **opts):'
1505 def save(ui, repo, **opts):
1505 def save(ui, repo, **opts):
1506 """save current queue state"""
1506 """save current queue state"""
1507 q = repo.mq
1507 q = repo.mq
1508 message = commands.logmessage(**opts)
1508 message = commands.logmessage(opts)
1509 ret = q.save(repo, msg=message)
1509 ret = q.save(repo, msg=message)
1510 if ret:
1510 if ret:
1511 return ret
1511 return ret
General Comments 0
You need to be logged in to leave comments. Login now