Skip to content
Snippets Groups Projects
Commit 11664641fbad authored by Matt Mackall's avatar Matt Mackall
Browse files

histedit: add checkunfinished support (issue3955)

The tests contain a couple corner cases where workarounds are now
required. Strictly speaking, these are behavior regressions, but of an
extremely obscure and marginal sort. Commits or updates in the middle
of a histedit would have almost always been fairly serious user error.
parent e5a5790a3185
No related branches found
No related tags found
No related merge requests found
......@@ -512,6 +512,7 @@
os.unlink(os.path.join(repo.path, 'histedit-state'))
return
else:
cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo)
topmost, empty = repo.dirstate.parents()
......@@ -872,3 +873,6 @@
def extsetup(ui):
cmdutil.summaryhooks.add('histedit', summaryhook)
cmdutil.unfinishedstates.append(
['histedit-state', False, _('histedit in progress'),
_("use 'hg histedit --continue' or 'hg histedit --abort'")])
......@@ -69,8 +69,6 @@
$ hg id -n
3+
$ hg up 0
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ HGEDITOR='echo foobaz > ' hg histedit --continue
abort: 055a42cdd887 is not an ancestor of working directory
(update to 055a42cdd887 or descendant and run "hg histedit --continue" again)
abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort')
[255]
......@@ -76,4 +74,2 @@
[255]
$ hg up 3
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
......@@ -79,6 +75,6 @@
commit, then edit the revision
$ hg ci -m 'wat'
commit, then edit the revision (temporarily disable histedit to allow commit)
$ hg ci -m 'wat' --config 'extensions.histedit=!'
created new head
$ echo a > e
$ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle
......
......@@ -214,7 +214,7 @@
> 5
> EOF
$ hg resolve --mark file
$ hg commit -m '+5.2'
$ hg commit -m '+5.2' --config 'extensions.histedit=!'
created new head
$ echo 6 >> file
$ HGEDITOR=cat hg histedit --continue
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment