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