Show More
@@ -1649,6 +1649,10 b' class memctx(committablectx):' | |||||
1649 | for f in self._status.added: |
|
1649 | for f in self._status.added: | |
1650 | man[f] = revlog.hash(self[f].data(), nullid, nullid) |
|
1650 | man[f] = revlog.hash(self[f].data(), nullid, nullid) | |
1651 |
|
1651 | |||
|
1652 | for f in self._status.removed: | |||
|
1653 | if f in man: | |||
|
1654 | del man[f] | |||
|
1655 | ||||
1652 | return man |
|
1656 | return man | |
1653 |
|
1657 | |||
1654 | @propertycache |
|
1658 | @propertycache |
@@ -905,6 +905,58 b' Test that "diff()" in committemplate wor' | |||||
905 | HG: @@ -0,0 +1,1 @@ |
|
905 | HG: @@ -0,0 +1,1 @@ | |
906 | HG: +y |
|
906 | HG: +y | |
907 |
|
907 | |||
|
908 | $ hg rm a | |||
|
909 | $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo and y" | |||
|
910 | expecting diff of a, foo and y | |||
|
911 | ||||
|
912 | HG: M: | |||
|
913 | HG: A: foo y | |||
|
914 | HG: R: a | |||
|
915 | HG: diff -r 6de0c1bde1c8 a | |||
|
916 | HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 | |||
|
917 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
918 | HG: @@ -1,2 +0,0 @@ | |||
|
919 | HG: -a | |||
|
920 | HG: -a | |||
|
921 | HG: diff -r 6de0c1bde1c8 foo | |||
|
922 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
923 | HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | |||
|
924 | HG: @@ -0,0 +1,1 @@ | |||
|
925 | HG: +foo | |||
|
926 | HG: diff -r 6de0c1bde1c8 y | |||
|
927 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
928 | HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 | |||
|
929 | HG: @@ -0,0 +1,1 @@ | |||
|
930 | HG: +y | |||
|
931 | ||||
|
932 | $ hg rm x | |||
|
933 | $ HGEDITOR=cat hg commit --amend -e -m "expecting diff of a, foo, x and y" | |||
|
934 | expecting diff of a, foo, x and y | |||
|
935 | ||||
|
936 | HG: M: | |||
|
937 | HG: A: foo y | |||
|
938 | HG: R: a x | |||
|
939 | HG: diff -r 6de0c1bde1c8 a | |||
|
940 | HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 | |||
|
941 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
942 | HG: @@ -1,2 +0,0 @@ | |||
|
943 | HG: -a | |||
|
944 | HG: -a | |||
|
945 | HG: diff -r 6de0c1bde1c8 foo | |||
|
946 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
947 | HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 | |||
|
948 | HG: @@ -0,0 +1,1 @@ | |||
|
949 | HG: +foo | |||
|
950 | HG: diff -r 6de0c1bde1c8 x | |||
|
951 | HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 | |||
|
952 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
953 | HG: @@ -1,1 +0,0 @@ | |||
|
954 | HG: -x | |||
|
955 | HG: diff -r 6de0c1bde1c8 y | |||
|
956 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
957 | HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 | |||
|
958 | HG: @@ -0,0 +1,1 @@ | |||
|
959 | HG: +y | |||
908 |
|
960 | |||
909 | Check for issue4405 |
|
961 | Check for issue4405 | |
910 | ------------------- |
|
962 | ------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now