##// END OF EJS Templates
templates: fix `revset('parents()') % ...` in amend message template...
Martin von Zweigbergk -
r47962:b338d831 default
parent child Browse files
Show More
@@ -1392,6 +1392,9 b' class committablectx(basectx):'
1392 def __bytes__(self):
1392 def __bytes__(self):
1393 return bytes(self._parents[0]) + b"+"
1393 return bytes(self._parents[0]) + b"+"
1394
1394
1395 def hex(self):
1396 self._repo.nodeconstants.wdirhex
1397
1395 __str__ = encoding.strmethod(__bytes__)
1398 __str__ = encoding.strmethod(__bytes__)
1396
1399
1397 def __nonzero__(self):
1400 def __nonzero__(self):
@@ -957,6 +957,7 b' Test that "diff()" in committemplate wor'
957 $ cat >> .hg/hgrc <<EOF
957 $ cat >> .hg/hgrc <<EOF
958 > [committemplate]
958 > [committemplate]
959 > changeset.commit.amend = {desc}\n
959 > changeset.commit.amend = {desc}\n
960 > HG: {revset('parents()') % 'parent: {desc|firstline}\n'}
960 > HG: M: {file_mods}
961 > HG: M: {file_mods}
961 > HG: A: {file_adds}
962 > HG: A: {file_adds}
962 > HG: R: {file_dels}
963 > HG: R: {file_dels}
@@ -971,6 +972,8 b' Test that "diff()" in committemplate wor'
971 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo"
972 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo"
972 expecting diff of foo
973 expecting diff of foo
973
974
975 HG: parent: editor should be suppressed
976
974 HG: M:
977 HG: M:
975 HG: A: foo
978 HG: A: foo
976 HG: R:
979 HG: R:
@@ -985,6 +988,8 b' Test that "diff()" in committemplate wor'
985 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y"
988 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of foo and y"
986 expecting diff of foo and y
989 expecting diff of foo and y
987
990
991 HG: parent: expecting diff of foo
992
988 HG: M:
993 HG: M:
989 HG: A: foo y
994 HG: A: foo y
990 HG: R:
995 HG: R:
@@ -1003,6 +1008,8 b' Test that "diff()" in committemplate wor'
1003 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y"
1008 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y"
1004 expecting diff of a, foo and y
1009 expecting diff of a, foo and y
1005
1010
1011 HG: parent: expecting diff of foo and y
1012
1006 HG: M:
1013 HG: M:
1007 HG: A: foo y
1014 HG: A: foo y
1008 HG: R: a
1015 HG: R: a
@@ -1027,6 +1034,8 b' Test that "diff()" in committemplate wor'
1027 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y"
1034 $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y"
1028 expecting diff of a, foo, x and y
1035 expecting diff of a, foo, x and y
1029
1036
1037 HG: parent: expecting diff of a, foo and y
1038
1030 HG: M:
1039 HG: M:
1031 HG: A: foo y
1040 HG: A: foo y
1032 HG: R: a x
1041 HG: R: a x
@@ -1058,6 +1067,8 b' Test that "diff()" in committemplate wor'
1058 $ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc
1067 $ HGEDITOR=cat hg commit --amend -e -m "cc should be excluded" -X cc
1059 cc should be excluded
1068 cc should be excluded
1060
1069
1070 HG: parent: expecting diff of a, foo, x and y
1071
1061 HG: M:
1072 HG: M:
1062 HG: A: foo y
1073 HG: A: foo y
1063 HG: R: a x
1074 HG: R: a x
General Comments 0
You need to be logged in to leave comments. Login now