##// END OF EJS Templates
phabricator: warn if unable to amend, instead of aborting after posting...
phabricator: warn if unable to amend, instead of aborting after posting There was a divergence in behavior here between obsolete and strip based amending. I first noticed the abort when testing outside of the test harness, but then had trouble recreating it here after reverting the code changes. It turns out, strip based amend was successfully amending the public commit after it was posted! It looks like the protection is in the `commit --amend` command, not in the underlying code that it calls. I considered doing a preflight check and aborting. But the locks are only acquired at the end, if amending, and this is too large a section of code to be wrapped in a maybe-it's-held-or-not context manager for my tastes. Additionally, some people do post-push reviews, and amending is the default behavior, so they shouldn't see a misleading error message. The lack of a 'Differential Revision' entry in the commit message breaks a {phabreview} test, so it had to be partially conditionalized.

File last commit:

r34060:4bf18894 default
r41198:0101a35d default
Show More
test-editor-filename.t
61 lines | 1.3 KiB | text/troff | Tads3Lexer
/ tests / test-editor-filename.t
Michael Bolin
editor: use an unambiguous path suffix for editor files...
r34030 Test temp file used with an editor has the expected suffix.
$ hg init
Create an editor that writes its arguments to stdout and set it to $HGEDITOR.
$ cat > editor.sh << EOF
> echo "\$@"
> exit 1
> EOF
$ hg add editor.sh
Yuya Nishihara
test-editor-filename: fix portability of fake editor command...
r34060 $ HGEDITOR="sh $TESTTMP/editor.sh"
Michael Bolin
editor: use an unambiguous path suffix for editor files...
r34030 $ export HGEDITOR
Verify that the path for a commit editor has the expected suffix.
$ hg commit
*.commit.hg.txt (glob)
Yuya Nishihara
test-editor-filename: fix portability of fake editor command...
r34060 abort: edit failed: sh exited with status 1
Michael Bolin
editor: use an unambiguous path suffix for editor files...
r34030 [255]
Verify that the path for a histedit editor has the expected suffix.
$ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
> histedit=
> EOF
$ hg commit --message 'At least one commit for histedit.'
$ hg histedit
*.histedit.hg.txt (glob)
Yuya Nishihara
test-editor-filename: fix portability of fake editor command...
r34060 abort: edit failed: sh exited with status 1
Michael Bolin
editor: use an unambiguous path suffix for editor files...
r34030 [255]
Michael Bolin
editor: file created for diff action should have .diff suffix...
r34056
Verify that when performing an action that has the side-effect of creating an
editor for a diff, the file ends in .diff.
$ echo 1 > one
$ echo 2 > two
$ hg add
adding one
adding two
$ hg commit --interactive --config ui.interactive=true --config ui.interface=text << EOF
> y
> e
> q
> EOF
diff --git a/one b/one
new file mode 100644
examine changes to 'one'? [Ynesfdaq?] y
@@ -0,0 +1,1 @@
+1
record change 1/2 to 'one'? [Ynesfdaq?] e
*.diff (glob)
editor exited with exit code 1
record change 1/2 to 'one'? [Ynesfdaq?] q
abort: user quit
[255]