This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10707

templates: fix `revset('parents()') % ...` in amend message template
ClosedPublic

Authored by martinvonz on May 11 2021, 3:26 PM.

Details

Reviewers
joerg.sonnenberger
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb338d831d18c: templates: fix `revset('parents()') % ...` in amend message template
Summary

I don't understand why, but putting revset('parents()') % {desc} in
the commit message template for amend resulted in a crash because
memctx.hex() did hex(self.node()) and its node was None. This
patch fixes that.

Martin von Zweigbergk <martinvonz@google.com>

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.May 11 2021, 3:26 PM
joerg.sonnenberger requested changes to this revision.May 11 2021, 3:41 PM
joerg.sonnenberger added a subscriber: joerg.sonnenberger.
joerg.sonnenberger added inline comments.
mercurial/context.py
1396

Use the hex constant please.

This revision now requires changes to proceed.May 11 2021, 3:41 PM
martinvonz updated this revision to Diff 27908.May 11 2021, 3:42 PM
martinvonz marked an inline comment as done.May 11 2021, 3:43 PM
pulkit accepted this revision.May 15 2021, 3:24 PM
This revision is now accepted and ready to land.May 15 2021, 3:24 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (3 lines)
Mtests/test-commit-amend.t (11 lines)

Diff 27928

mercurial/context.py

if branch is not None: if branch is not None:
self._extra[b'branch'] = encoding.fromlocal(branch) self._extra[b'branch'] = encoding.fromlocal(branch)
if not self._extra.get(b'branch'): if not self._extra.get(b'branch'):
self._extra[b'branch'] = b'default' self._extra[b'branch'] = b'default'
def __bytes__(self): def __bytes__(self):
return bytes(self._parents[0]) + b"+" return bytes(self._parents[0]) + b"+"
def hex(self):
self._repo.nodeconstants.wdirhex
joerg.sonnenbergerUnsubmitted
Done

Use the hex constant please.

joerg.sonnenberger: Use the hex constant please.
__str__ = encoding.strmethod(__bytes__) __str__ = encoding.strmethod(__bytes__)
def __nonzero__(self): def __nonzero__(self):
return True return True
__bool__ = __nonzero__ __bool__ = __nonzero__
@propertycache @propertycache

tests/test-commit-amend.t

$ hg commit --amend --no-edit $ hg commit --amend --no-edit
Test that "diff()" in committemplate works correctly for amending Test that "diff()" in committemplate works correctly for amending
----------------------------------------------------------------- -----------------------------------------------------------------
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [committemplate] > [committemplate]
> changeset.commit.amend = {desc}\n > changeset.commit.amend = {desc}\n
> HG: {revset('parents()') % 'parent: {desc|firstline}\n'}
> HG: M: {file_mods} > HG: M: {file_mods}
> HG: A: {file_adds} > HG: A: {file_adds}
> HG: R: {file_dels} > HG: R: {file_dels}
> {splitlines(diff()) % 'HG: {line}\n'} > {splitlines(diff()) % 'HG: {line}\n'}
> EOF > EOF
$ hg parents --template "M: {file_mods}\nA: {file_adds}\nR: {file_dels}\n" $ hg parents --template "M: {file_mods}\nA: {file_adds}\nR: {file_dels}\n"
M: M:
A: foo A: foo
R: R:
$ hg status -amr $ hg status -amr
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo" $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo"
expecting diff of foo expecting diff of foo
HG: parent: editor should be suppressed
HG: M: HG: M:
HG: A: foo HG: A: foo
HG: R: HG: R:
HG: diff -r 0eeafd043f63 foo HG: diff -r 0eeafd043f63 foo
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +foo HG: +foo
$ echo y > y $ echo y > y
$ hg add y $ hg add y
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y" $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y"
expecting diff of foo and y expecting diff of foo and y
HG: parent: expecting diff of foo
HG: M: HG: M:
HG: A: foo y HG: A: foo y
HG: R: HG: R:
HG: diff -r 0eeafd043f63 foo HG: diff -r 0eeafd043f63 foo
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +foo HG: +foo
HG: diff -r 0eeafd043f63 y HG: diff -r 0eeafd043f63 y
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +y HG: +y
$ hg rm a $ hg rm a
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y" $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y"
expecting diff of a, foo and y expecting diff of a, foo and y
HG: parent: expecting diff of foo and y
HG: M: HG: M:
HG: A: foo y HG: A: foo y
HG: R: a HG: R: a
HG: diff -r 0eeafd043f63 a HG: diff -r 0eeafd043f63 a
HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: --- a/a Thu Jan 01 00:00:00 1970 +0000
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: @@ -1,2 +0,0 @@ HG: @@ -1,2 +0,0 @@
HG: -a HG: -a
HG: -a HG: -a
HG: diff -r 0eeafd043f63 foo HG: diff -r 0eeafd043f63 foo
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +foo HG: +foo
HG: diff -r 0eeafd043f63 y HG: diff -r 0eeafd043f63 y
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +y HG: +y
$ hg rm x $ hg rm x
$ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y" $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y"
expecting diff of a, foo, x and y expecting diff of a, foo, x and y
HG: parent: expecting diff of a, foo and y
HG: M: HG: M:
HG: A: foo y HG: A: foo y
HG: R: a x HG: R: a x
HG: diff -r 0eeafd043f63 a HG: diff -r 0eeafd043f63 a
HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: --- a/a Thu Jan 01 00:00:00 1970 +0000
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: @@ -1,2 +0,0 @@ HG: @@ -1,2 +0,0 @@
HG: -a HG: -a
HG: +y HG: +y
$ echo cccc >> cc $ echo cccc >> cc
$ hg status -amr $ hg status -amr
M cc M cc
$ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc $ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc
cc should be excluded cc should be excluded
HG: parent: expecting diff of a, foo, x and y
HG: M: HG: M:
HG: A: foo y HG: A: foo y
HG: R: a x HG: R: a x
HG: diff -r 0eeafd043f63 a HG: diff -r 0eeafd043f63 a
HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 HG: --- a/a Thu Jan 01 00:00:00 1970 +0000
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: @@ -1,2 +0,0 @@ HG: @@ -1,2 +0,0 @@
HG: -a HG: -a