Show More
@@ -512,6 +512,7 b' def histedit(ui, repo, *freeargs, **opts' | |||
|
512 | 512 | os.unlink(os.path.join(repo.path, 'histedit-state')) |
|
513 | 513 | return |
|
514 | 514 | else: |
|
515 | cmdutil.checkunfinished(repo) | |
|
515 | 516 | cmdutil.bailifchanged(repo) |
|
516 | 517 | |
|
517 | 518 | topmost, empty = repo.dirstate.parents() |
@@ -872,3 +873,6 b' def summaryhook(ui, repo):' | |||
|
872 | 873 | |
|
873 | 874 | def extsetup(ui): |
|
874 | 875 | cmdutil.summaryhooks.add('histedit', summaryhook) |
|
876 | cmdutil.unfinishedstates.append( | |
|
877 | ['histedit-state', False, _('histedit in progress'), | |
|
878 | _("use 'hg histedit --continue' or 'hg histedit --abort'")]) |
@@ -69,16 +69,12 b' Go at a random point and try to continue' | |||
|
69 | 69 | $ hg id -n |
|
70 | 70 | 3+ |
|
71 | 71 | $ hg up 0 |
|
72 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
|
73 | $ HGEDITOR='echo foobaz > ' hg histedit --continue | |
|
74 | abort: 055a42cdd887 is not an ancestor of working directory | |
|
75 | (update to 055a42cdd887 or descendant and run "hg histedit --continue" again) | |
|
72 | abort: histedit in progress | |
|
73 | (use 'hg histedit --continue' or 'hg histedit --abort') | |
|
76 | 74 | [255] |
|
77 | $ hg up 3 | |
|
78 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
79 | 75 | |
|
80 | commit, then edit the revision | |
|
81 | $ hg ci -m 'wat' | |
|
76 | commit, then edit the revision (temporarily disable histedit to allow commit) | |
|
77 | $ hg ci -m 'wat' --config 'extensions.histedit=!' | |
|
82 | 78 | created new head |
|
83 | 79 | $ echo a > e |
|
84 | 80 | $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle |
General Comments 0
You need to be logged in to leave comments.
Login now