Whoever wrote D8463 just used a hard-coded path to
.hg/last-message.text instead of using the relative path that was
already available in the msgfn variable (and used just a few lines
up in related message). Let's fix that.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/localrepo.py (7 lines) | |||
| M | tests/test-histedit-edit.t (7 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 9b2fa18e0b28 | 802e2c25dab8 | Martin von Zweigbergk | Apr 22 2022, 7:47 PM |
| if editor: | if editor: | ||||
| cctx._text = editor(self, cctx, subs) | cctx._text = editor(self, cctx, subs) | ||||
| edited = text != cctx._text | edited = text != cctx._text | ||||
| # Save commit message in case this transaction gets rolled back | # Save commit message in case this transaction gets rolled back | ||||
| # (e.g. by a pretxncommit hook). Leave the content alone on | # (e.g. by a pretxncommit hook). Leave the content alone on | ||||
| # the assumption that the user will use the same editor again. | # the assumption that the user will use the same editor again. | ||||
| msgfn = self.savecommitmessage(cctx._text) | msg_path = self.savecommitmessage(cctx._text) | ||||
| # commit subs and write new state | # commit subs and write new state | ||||
| if subs: | if subs: | ||||
| uipathfn = scmutil.getuipathfn(self) | uipathfn = scmutil.getuipathfn(self) | ||||
| for s in sorted(commitsubs): | for s in sorted(commitsubs): | ||||
| sub = wctx.sub(s) | sub = wctx.sub(s) | ||||
| self.ui.status( | self.ui.status( | ||||
| _(b'committing subrepository %s\n') | _(b'committing subrepository %s\n') | ||||
| ret = self.commitctx(cctx, True) | ret = self.commitctx(cctx, True) | ||||
| # update bookmarks, dirstate and mergestate | # update bookmarks, dirstate and mergestate | ||||
| 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') % msg_path | ||||
| ) | ) | ||||
| self.ui.write( | self.ui.write( | ||||
| _( | _( | ||||
| b"note: use 'hg commit --logfile " | b"note: use 'hg commit --logfile " | ||||
| b".hg/last-message.txt --edit' to reuse it\n" | b"%s --edit' to reuse it\n" | ||||
| ) | ) | ||||
| % msg_path | |||||
| ) | ) | ||||
| 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( | ||||
| > # this failure occurs after editor invocation | > # this failure occurs after editor invocation | ||||
| > pretxncommit.unexpectedabort = false | > pretxncommit.unexpectedabort = false | ||||
| > EOF | > EOF | ||||
| $ hg status --rev '1fd3b2fe7754^1' --rev 1fd3b2fe7754 | $ hg status --rev '1fd3b2fe7754^1' --rev 1fd3b2fe7754 | ||||
| A f | A f | ||||
| $ rm -f .hg/last-message.txt | $ rm -f .hg/last-message.txt | ||||
| $ mkdir dir | |||||
| $ cd dir | |||||
| $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF | $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF | ||||
| > mess 1fd3b2fe7754 f | > mess 1fd3b2fe7754 f | ||||
| > EOF | > EOF | ||||
| ==== before editing | ==== before editing | ||||
| 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 | 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 | ||||
| [40] | [40] | ||||
| $ cd .. | |||||
| $ 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) | ||||