Show More
@@ -304,7 +304,7 b' class queue:' | |||
|
304 | 304 | self.ui.warn(l + '\n') |
|
305 | 305 | |
|
306 | 306 | return (not f.close(), files, fuzz) |
|
307 | ||
|
307 | ||
|
308 | 308 | def apply(self, repo, series, list=False, update_status=True, |
|
309 | 309 | strict=False, patchdir=None, merge=None, wlock=None): |
|
310 | 310 | # TODO unify with commands.py |
@@ -1285,7 +1285,7 b' def new(ui, repo, patch, **opts):' | |||
|
1285 | 1285 | If neither is specified, the patch header is empty and the |
|
1286 | 1286 | commit message is 'New patch: PATCH'""" |
|
1287 | 1287 | q = repo.mq |
|
1288 | message=commands.logmessage(**opts) | |
|
1288 | message = commands.logmessage(**opts) | |
|
1289 | 1289 | q.new(repo, patch, msg=message, force=opts['force']) |
|
1290 | 1290 | q.save_dirty() |
|
1291 | 1291 | return 0 |
@@ -1293,7 +1293,7 b' def new(ui, repo, patch, **opts):' | |||
|
1293 | 1293 | def refresh(ui, repo, **opts): |
|
1294 | 1294 | """update the current patch""" |
|
1295 | 1295 | q = repo.mq |
|
1296 | message=commands.logmessage(**opts) | |
|
1296 | message = commands.logmessage(**opts) | |
|
1297 | 1297 | if opts['edit']: |
|
1298 | 1298 | if message: |
|
1299 | 1299 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
@@ -1330,7 +1330,7 b' def fold(ui, repo, *files, **opts):' | |||
|
1330 | 1330 | if not q.check_toppatch(repo): |
|
1331 | 1331 | raise util.Abort(_('No patches applied\n')) |
|
1332 | 1332 | |
|
1333 | message=commands.logmessage(**opts) | |
|
1333 | message = commands.logmessage(**opts) | |
|
1334 | 1334 | if opts['edit']: |
|
1335 | 1335 | if message: |
|
1336 | 1336 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
@@ -1507,7 +1507,7 b' def restore(ui, repo, rev, **opts):' | |||
|
1507 | 1507 | def save(ui, repo, **opts): |
|
1508 | 1508 | """save current queue state""" |
|
1509 | 1509 | q = repo.mq |
|
1510 | message=commands.logmessage(**opts) | |
|
1510 | message = commands.logmessage(**opts) | |
|
1511 | 1511 | ret = q.save(repo, msg=message) |
|
1512 | 1512 | if ret: |
|
1513 | 1513 | return ret |
General Comments 0
You need to be logged in to leave comments.
Login now