This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8463

commit: tell user what to do with .hg/last-message.txt
ClosedPublic

Authored by martinvonz on Apr 20 2020, 5:42 PM.

Details

Reviewers
durin42
marmoute
Group Reviewers
hg-reviewers
Commits
rHGc6d31e659a28: commit: tell user what to do with .hg/last-message.txt
Summary

I have always assumed that the message will be reused by the next `hg
commit`, but it seems it's just silently dropped on the next
commit. Let's try to be more helpful by telling the user that they
have to manually tell hg to reuse it.

The file will still be lost if the user runs some other operation in
between (like a non-in-memory rebase). That will be fixed once we've
switched all operations to be in-memory :)

I didn't include $(hg root)/ in the path in the message to the user
because that would have made the message too long. Hopefully the user
will figure that part out themselves.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 20 2020, 5:42 PM
marmoute requested changes to this revision.Apr 21 2020, 3:25 AM
marmoute added a subscriber: marmoute.

Manual copy pasting is not necessary, hg commit --logfile .hg/last-message.txt can be used to reuse that message and hg commit --logfile .hg/last-message.txt --edit can be used to re-use and edit the message.

I would recommand that instead.

This revision now requires changes to proceed.Apr 21 2020, 3:25 AM
martinvonz added a comment.Apr 21 2020, 9:52 AM
In D8463#126258, @marmoute wrote:

Manual copy pasting is not necessary, hg commit --logfile .hg/last-message.txt can be used to reuse that message and hg commit --logfile .hg/last-message.txt --edit can be used to re-use and edit the message.
I would recommand that instead.

I was worried that other operations in between could lose the message. Won't e.g. a (non-in-memory) rebase lose it?

marmoute added a comment.Apr 21 2020, 11:14 AM

I don't understand wer you are going with this mention of "other operation". But I don't think they loose it. It only get overwritten when a new one is written.

martinvonz added a comment.Apr 21 2020, 11:17 AM
In D8463#126262, @marmoute wrote:

I don't understand wer you are going with this mention of "other operation". But I don't think they loose it. It only get overwritten when a new one is written.

This is what I meant:

$ cat .hg/last-message.txt
blah
$ hg rebase --config rebase.experimental.inmemory=no -r a0a43ac0 -d b3b383f2
$ cat .hg/last-message.txt
cat: .hg/last-message.txt: No such file or directory
marmoute added a comment.Apr 21 2020, 11:19 AM

Okay. I am still a bit lost about what do you have in mind ? If the user do not act of the last-message.txt but move to something else, it seems reasonable that it get cleanup, right?

martinvonz added a comment.Apr 21 2020, 11:22 AM
In D8463#126264, @marmoute wrote:

Okay. I am still a bit lost about what do you have in mind ? If the user do not act of the last-message.txt but move to something else, it seems reasonable that it get cleanup, right?

Okay, I'm fine with that. That would still lose the message without warning in some cases, but it's still better than before.

martinvonz edited the summary of this revision. (Show Details)Apr 21 2020, 11:53 AM
martinvonz updated this revision to Diff 21165.
marmoute accepted this revision.Apr 22 2020, 12:24 PM
martinvonz added a commit: rHGc6d31e659a28: commit: tell user what to do with .hg/last-message.txt.Apr 23 2020, 2:01 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc6d31e659a28: commit: tell user what to do with .hg/last-message.txt (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21183

mercurial/localrepo.py

bookmarks.update(self, [p1, p2], ret) bookmarks.update(self, [p1, p2], ret)
cctx.markcommitted(ret) cctx.markcommitted(ret)
ms.reset() ms.reset()
except: # re-raises except: # re-raises
if edited: if edited:
self.ui.write( self.ui.write(
_(b'note: commit message saved in %s\n') % msgfn _(b'note: commit message saved in %s\n') % msgfn
) )
self.ui.write(
_(
b"note: use 'hg commit --logfile "
b".hg/last-message.txt --edit' to reuse it\n"
)
)
raise raise
def commithook(unused_success): def commithook(unused_success):
# hack for command that use a temporary commit (eg: histedit) # hack for command that use a temporary commit (eg: histedit)
# temporary commit got stripped before hook release # temporary commit got stripped before hook release
if self.changelog.hasnode(ret): if self.changelog.hasnode(ret):
self.hook( self.hook(
b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2 b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2

tests/test-histedit-edit.t

HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'default' HG: branch 'default'
HG: added f HG: added f
==== ====
transaction abort! transaction abort!
rollback completed rollback completed
note: commit message saved in .hg/last-message.txt note: commit message saved in .hg/last-message.txt
note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
$ cat .hg/last-message.txt $ cat .hg/last-message.txt
f f
check saving last-message.txt check saving last-message.txt
(test also that editor is invoked if histedit is continued for "message" (test also that editor is invoked if histedit is continued for "message"
action) action)
$ HGEDITOR=cat hg histedit --continue $ HGEDITOR=cat hg histedit --continue
f f
HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit. HG: Leave message empty to abort commit.
HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'default' HG: branch 'default'
HG: added f HG: added f
transaction abort! transaction abort!
rollback completed rollback completed
note: commit message saved in .hg/last-message.txt note: commit message saved in .hg/last-message.txt
note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [hooks] > [hooks]
> pretxncommit.unexpectedabort = > pretxncommit.unexpectedabort =
> EOF > EOF
$ hg histedit --abort -q $ hg histedit --abort -q

tests/test-mq-qfold.t

HG: Leave message empty to use default message. HG: Leave message empty to use default message.
HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'default' HG: branch 'default'
HG: added aa HG: added aa
HG: changed a HG: changed a
==== ====
note: commit message saved in .hg/last-message.txt note: commit message saved in .hg/last-message.txt
note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
transaction abort! transaction abort!
rollback completed rollback completed
qrefresh interrupted while patch was popped! (revert --all, qpush to recover) qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
$ cat .hg/last-message.txt $ cat .hg/last-message.txt
original message original message

tests/test-mq-qnew.t

HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'default' HG: branch 'default'
HG: no files changed HG: no files changed
==== ====
transaction abort! transaction abort!
rollback completed rollback completed
note: commit message saved in .hg/last-message.txt note: commit message saved in .hg/last-message.txt
note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
$ cat .hg/last-message.txt $ cat .hg/last-message.txt
test saving last-message.txt test saving last-message.txt
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [hooks] > [hooks]
> pretxncommit.unexpectedabort = > pretxncommit.unexpectedabort =
> EOF > EOF

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

HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to use default message. HG: Leave message empty to use default message.
HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'default' HG: branch 'default'
HG: added file2 HG: added file2
==== ====
note: commit message saved in .hg/last-message.txt note: commit message saved in .hg/last-message.txt
note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
transaction abort! transaction abort!
rollback completed rollback completed
qrefresh interrupted while patch was popped! (revert --all, qpush to recover) qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
$ cat .hg/last-message.txt $ cat .hg/last-message.txt
Fifth commit message Fifth commit message
This is the 5th log message This is the 5th log message
==== ====
$ HGEDITOR="sh \"$TESTTMP/checkvisibility.sh\"" hg qrefresh -e $ HGEDITOR="sh \"$TESTTMP/checkvisibility.sh\"" hg qrefresh -e
==== ====
0:25e397dabed2 0:25e397dabed2
A file2 A file2
==== ====
note: commit message saved in .hg/last-message.txt note: commit message saved in .hg/last-message.txt
note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
transaction abort! transaction abort!
rollback completed rollback completed
qrefresh interrupted while patch was popped! (revert --all, qpush to recover) qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
(rebuilding at failure of qrefresh bases on rev #0, and it causes (rebuilding at failure of qrefresh bases on rev #0, and it causes
dropping status of "file2") dropping status of "file2")

tests/test-rollback.t

$ cat > editor.sh << '__EOF__' $ cat > editor.sh << '__EOF__'
> echo "another precious commit message" > "$1" > echo "another precious commit message" > "$1"
> __EOF__ > __EOF__
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg --config hooks.pretxncommit=false commit 2>&1 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg --config hooks.pretxncommit=false commit 2>&1
transaction abort! transaction abort!
rollback completed rollback completed
note: commit message saved in .hg/last-message.txt note: commit message saved in .hg/last-message.txt
note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
abort: pretxncommit hook exited with status * (glob) abort: pretxncommit hook exited with status * (glob)
[255] [255]
$ cat .hg/last-message.txt $ cat .hg/last-message.txt
another precious commit message another precious commit message
test rollback on served repository test rollback on served repository
#if serve #if serve

tests/test-tag.t

HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'tag-and-branch-same-name' HG: branch 'tag-and-branch-same-name'
HG: changed .hgtags HG: changed .hgtags
==== ====
transaction abort! transaction abort!
rollback completed rollback completed
note: commit message saved in .hg/last-message.txt note: commit message saved in .hg/last-message.txt
note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it
abort: pretxncommit.unexpectedabort hook exited with status 1 abort: pretxncommit.unexpectedabort hook exited with status 1
[255] [255]
$ cat .hg/last-message.txt $ cat .hg/last-message.txt
custom tag message custom tag message
second line second line
$ cat >> .hg/hgrc << '__EOF__' $ cat >> .hg/hgrc << '__EOF__'
> [hooks] > [hooks]