Show More
@@ -119,6 +119,7 b' def _qrecord(cmdsuggest, ui, repo, patch' | |||
|
119 | 119 | |
|
120 | 120 | overrides = {('experimental', 'crecord'): False} |
|
121 | 121 | with ui.configoverride(overrides, 'record'): |
|
122 | cmdutil.checkunfinished(repo) | |
|
122 | 123 | cmdutil.dorecord(ui, repo, committomq, cmdsuggest, False, |
|
123 | 124 | cmdutil.recordfilter, *pats, **opts) |
|
124 | 125 |
@@ -422,3 +422,43 b" After qrecord b.patch 'diff'" | |||
|
422 | 422 | $ hg diff --nodates |
|
423 | 423 | |
|
424 | 424 | $ cd .. |
|
425 | ||
|
426 | qrecord should throw an error when histedit in process | |
|
427 | ||
|
428 | $ hg init issue5981 | |
|
429 | $ cd issue5981 | |
|
430 | $ cat >> $HGRCPATH <<EOF | |
|
431 | > [extensions] | |
|
432 | > histedit= | |
|
433 | > mq= | |
|
434 | > EOF | |
|
435 | $ echo > a | |
|
436 | $ hg ci -Am 'foo bar' | |
|
437 | adding a | |
|
438 | $ hg log | |
|
439 | changeset: 0:ea55e2ae468f | |
|
440 | tag: tip | |
|
441 | user: test | |
|
442 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
443 | summary: foo bar | |
|
444 | ||
|
445 | $ hg histedit tip --commands - 2>&1 <<EOF | |
|
446 | > edit ea55e2ae468f foo bar | |
|
447 | > EOF | |
|
448 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
449 | adding a | |
|
450 | Editing (ea55e2ae468f), you may commit or record as needed now. | |
|
451 | (hg histedit --continue to resume) | |
|
452 | [1] | |
|
453 | $ echo 'foo bar' > a | |
|
454 | $ hg qrecord -d '0 0' -m aaa a.patch <<EOF | |
|
455 | > y | |
|
456 | > y | |
|
457 | > n | |
|
458 | > y | |
|
459 | > y | |
|
460 | > n | |
|
461 | > EOF | |
|
462 | abort: histedit in progress | |
|
463 | (use 'hg histedit --continue' or 'hg histedit --abort') | |
|
464 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now