qrefresh: use "editor" argument of "commit()" instead of explicit "ui.edit()"

Before this patch, "hg qrefresh" and "hg qfold" invoke "ui.edit()"
explicitly to get commit message edited manually.

This requires explicit "localrepository.savecommitmessage()"
invocation to save edited commit message into ".hg/last-message.txt",
because unexpected exception raising may abort command execution
before saving it in "localrepository.commit()".

This patch uses "editor" argument of "localrepository.commit()"
instead of explicit "ui.edit()" invocation for "hg qnew" and "hg qfold"

"localrepository.commit()" will invoke "desceditor()" function newly
added by this patch, and save edited commit message into
".hg/last-message.txt" automatically.

This patch passes not "editor" but "desceditor" to "commit()", because
"hg qnew" and "hg qfold" require editor function to return edited
message (and invoke "patchheader.setmessage()" with it) if not empty,
or default message otherwise.

This patch also avoids "not q.applied" check at "hg qrefresh --edit",
because it is also checked in "queue.refresh()", and it is not needed
to get commit message from patch header before "queue.refresh()".

tests/test-mq-qfold.t

@@ -1,180 +1,231 b''
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
   $ echo "[mq]" >> $HGRCPATH
   $ echo "git=keep" >> $HGRCPATH
   $ echo "[diff]" >> $HGRCPATH
   $ echo "nodates=1" >> $HGRCPATH
 
 init:
 
   $ hg init repo
   $ cd repo
   $ echo a > a
   $ hg ci -Am adda
   adding a
   $ echo a >> a
   $ hg qnew -f p1
   $ echo b >> a
   $ hg qnew -f p2
   $ echo c >> a
   $ hg qnew -f p3
 
 Fold in the middle of the queue:
 
   $ hg qpop p1
   popping p3
   popping p2
   now at: p1
 
   $ hg qdiff
   diff -r 07f494440405 a
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    a
   +a
 
   $ hg qfold p2
   $ grep git .hg/patches/p1 && echo 'git patch found!'
   [1]
 
   $ hg qser
   p1
   p3
 
   $ hg qdiff
   diff -r 07f494440405 a
   --- a/a
   +++ b/a
   @@ -1,1 +1,3 @@
    a
   +a
   +b
 
 Fold with local changes:
 
   $ echo d >> a
   $ hg qfold p3
   abort: local changes found, refresh first
   [255]
 
   $ hg diff -c .
   diff -r 07f494440405 -r ???????????? a (glob)
   --- a/a
   +++ b/a
   @@ -1,1 +1,3 @@
    a
   +a
   +b
 
   $ hg revert -a --no-backup
   reverting a
 
 Fold git patch into a regular patch, expect git patch:
 
   $ echo a >> a
   $ hg qnew -f regular
   $ hg cp a aa
   $ hg qnew --git -f git
 
   $ hg qpop
   popping git
   now at: regular
 
   $ hg qfold git
 
   $ cat .hg/patches/regular
   # HG changeset patch
   # Parent ???????????????????????????????????????? (glob)
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,3 +1,4 @@
    a
    a
    b
   +a
   diff --git a/a b/aa
   copy from a
   copy to aa
   --- a/a
   +++ b/aa
   @@ -1,3 +1,4 @@
    a
    a
    b
   +a
 
   $ hg qpop
   popping regular
   now at: p1
 
   $ hg qdel regular
 
 Fold regular patch into a git patch, expect git patch:
 
   $ hg cp a aa
   $ hg qnew --git -f git
   $ echo b >> aa
   $ hg qnew -f regular
 
   $ hg qpop
   popping regular
   now at: git
 
   $ hg qfold regular
 
   $ cat .hg/patches/git
   # HG changeset patch
   # Parent ???????????????????????????????????????? (glob)
   
   diff --git a/a b/aa
   copy from a
   copy to aa
   --- a/a
   +++ b/aa
   @@ -1,3 +1,4 @@
    a
    a
    b
   +b
 
 Test saving last-message.txt:
 
   $ hg qrefresh -m "original message"
 
   $ cat > $TESTTMP/commitfailure.py <<EOF
   > from mercurial import util
   > def reposetup(ui, repo):
   >     class commitfailure(repo.__class__):
   >         def commit(self, *args, **kwargs):
   >             raise util.Abort('emulating unexpected abort')
   >     repo.__class__ = commitfailure
   > EOF
 
-  $ cat > .hg/hgrc <<EOF
+  $ cat >> .hg/hgrc <<EOF
   > [extensions]
+  > # this failure occurs before editor invocation
   > commitfailure = $TESTTMP/commitfailure.py
   > EOF
 
   $ cat > $TESTTMP/editor.sh << EOF
   > echo "==== before editing"
   > cat \$1
   > echo "===="
   > (echo; echo "test saving last-message.txt") >> \$1
   > EOF
 
+  $ hg qapplied
+  p1
+  git
+  $ hg tip --template "{files}\n"
+  aa
+
+(test that editor is not invoked before transaction starting)
+
   $ rm -f .hg/last-message.txt
   $ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e p3
-  ==== before editing
-  original message====
   refresh interrupted while patch was popped! (revert --all, qpush to recover)
   abort: emulating unexpected abort
   [255]
   $ cat .hg/last-message.txt
+  cat: .hg/last-message.txt: No such file or directory
+  [1]
+
+(reset applied patches and directory status)
+
+  $ cat >> .hg/hgrc <<EOF
+  > [extensions]
+  > # this failure occurs after editor invocation
+  > commitfailure = !
+  > EOF
+
+  $ hg qapplied
+  p1
+  $ hg status -A aa
+  ? aa
+  $ rm aa
+  $ hg status -m
+  M a
+  $ hg revert --no-backup -q a
+  $ hg qpush -q git
+  now at: git
+
+(test that editor is invoked and commit message is saved into
+"last-message.txt")
+
+  $ cat >> .hg/hgrc <<EOF
+  > [hooks]
+  > # this failure occurs after editor invocation
+  > pretxncommit.unexpectedabort = false
+  > EOF
+
+  $ rm -f .hg/last-message.txt
+  $ HGEDITOR="sh $TESTTMP/editor.sh" hg qfold -e p3
+  ==== before editing
   original message
+  ====
+  transaction abort!
+  rollback completed
+  note: commit message saved in .hg/last-message.txt
+  refresh interrupted while patch was popped! (revert --all, qpush to recover)
+  abort: pretxncommit.unexpectedabort hook exited with status 1
+  [255]
+  $ cat .hg/last-message.txt
+  original message
+  
   test saving last-message.txt
 
   $ cd ..
 

tests/test-mq-qrefresh-replace-log-message.t

@@ -1,61 +1,144 b''
 Environment setup for MQ
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
   $ hg init
   $ hg qinit
 
 Should fail if no patches applied
 
   $ hg qrefresh
   no patches applied
   [1]
   $ hg qrefresh -e
   no patches applied
   [1]
   $ hg qnew -m "First commit message" first-patch
   $ echo aaaa > file
   $ hg add file
   $ hg qrefresh
 
 Should display 'First commit message'
 
   $ hg log -l1 --template "{desc}\n"
   First commit message
 
 Testing changing message with -m
 
   $ echo bbbb > file
   $ hg qrefresh -m "Second commit message"
 
 Should display 'Second commit message'
 
   $ hg log -l1 --template "{desc}\n"
   Second commit message
 
 Testing changing message with -l
 
   $ echo "Third commit message" > logfile
   $ echo " This is the 3rd log message" >> logfile
   $ echo bbbb > file
   $ hg qrefresh -l logfile
 
 Should display 'Third commit message\\\n This is the 3rd log message'
 
   $ hg log -l1 --template "{desc}\n"
   Third commit message
    This is the 3rd log message
 
 Testing changing message with -l-
 
   $ hg qnew -m "First commit message" second-patch
   $ echo aaaa > file2
   $ hg add file2
   $ echo bbbb > file2
   $ (echo "Fifth commit message"; echo " This is the 5th log message") | hg qrefresh -l-
 
 Should display 'Fifth commit message\\\n This is the 5th log message'
 
   $ hg log -l1 --template "{desc}\n"
   Fifth commit message
    This is the 5th log message
+
+Test saving last-message.txt:
+
+  $ cat > $TESTTMP/editor.sh << EOF
+  > echo "==== before editing"
+  > cat \$1
+  > echo "===="
+  > (echo; echo "test saving last-message.txt") >> \$1
+  > EOF
+
+  $ cat > $TESTTMP/commitfailure.py <<EOF
+  > from mercurial import util
+  > def reposetup(ui, repo):
+  >     class commitfailure(repo.__class__):
+  >         def commit(self, *args, **kwargs):
+  >             raise util.Abort('emulating unexpected abort')
+  >     repo.__class__ = commitfailure
+  > EOF
+
+  $ cat >> .hg/hgrc <<EOF
+  > [extensions]
+  > # this failure occurs before editor invocation
+  > commitfailure = $TESTTMP/commitfailure.py
+  > EOF
+
+  $ hg qapplied
+  first-patch
+  second-patch
+  $ hg tip --template "{files}\n"
+  file2
+
+(test that editor is not invoked before transaction starting)
+
+  $ rm -f .hg/last-message.txt
+  $ HGEDITOR="sh $TESTTMP/editor.sh" hg qrefresh -e
+  refresh interrupted while patch was popped! (revert --all, qpush to recover)
+  abort: emulating unexpected abort
+  [255]
+  $ cat .hg/last-message.txt
+  cat: .hg/last-message.txt: No such file or directory
+  [1]
+
+(reset applied patches and directory status)
+
+  $ cat >> .hg/hgrc <<EOF
+  > [extensions]
+  > commitfailure = !
+  > EOF
+
+  $ hg qapplied
+  first-patch
+  $ hg status -A file2
+  ? file2
+  $ rm file2
+  $ hg qpush -q second-patch
+  now at: second-patch
+
+(test that editor is invoked and commit message is saved into
+"last-message.txt")
+
+  $ cat >> .hg/hgrc <<EOF
+  > [hooks]
+  > # this failure occurs after editor invocation
+  > pretxncommit.unexpectedabort = false
+  > EOF
+
+  $ rm -f .hg/last-message.txt
+  $ HGEDITOR="sh $TESTTMP/editor.sh" hg qrefresh -e
+  ==== before editing
+  Fifth commit message
+   This is the 5th log message
+  ====
+  transaction abort!
+  rollback completed
+  note: commit message saved in .hg/last-message.txt
+  refresh interrupted while patch was popped! (revert --all, qpush to recover)
+  abort: pretxncommit.unexpectedabort hook exited with status 1
+  [255]
+  $ cat .hg/last-message.txt
+  Fifth commit message
+   This is the 5th log message
+  
+  test saving last-message.txt