##// END OF EJS Templates
hgweb: add diffs to the json changeset template...
Jordi Gutiérrez Hermoso -
r44117:d155bf11 default
parent child Browse files
Show More
@@ -66,6 +66,7 b" changeset = '\\{"
66 66 "user": {author|utf8|json},
67 67 "parents": [{join(parent%changesetparent, ", ")}],
68 68 "files": [{join(files, ", ")}],
69 "diff": [{join(diff, ", ")}],
69 70 "phase": {phase|json}
70 71 }'
71 72 changesetbranch = '{name|utf8|json}'
@@ -782,6 +782,7 b' changeset/ renders the tip changeset'
782 782 0
783 783 ],
784 784 "desc": "merge test-branch into default",
785 "diff": [],
785 786 "files": [
786 787 {
787 788 "file": "foo-new",
@@ -813,6 +814,58 b' changeset/{revision} shows tags'
813 814 0
814 815 ],
815 816 "desc": "move foo",
817 "diff": [
818 {
819 "blockno": 1,
820 "lines": [
821 {
822 "l": "--- a/foo\tThu Jan 01 00:00:00 1970 +0000\n",
823 "n": 1,
824 "t": "-"
825 },
826 {
827 "l": "+++ /dev/null\tThu Jan 01 00:00:00 1970 +0000\n",
828 "n": 2,
829 "t": "+"
830 },
831 {
832 "l": "@@ -1,1 +0,0 @@\n",
833 "n": 3,
834 "t": "@"
835 },
836 {
837 "l": "-bar\n",
838 "n": 4,
839 "t": "-"
840 }
841 ]
842 },
843 {
844 "blockno": 2,
845 "lines": [
846 {
847 "l": "--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n",
848 "n": 1,
849 "t": "-"
850 },
851 {
852 "l": "+++ b/foo-new\tThu Jan 01 00:00:00 1970 +0000\n",
853 "n": 2,
854 "t": "+"
855 },
856 {
857 "l": "@@ -0,0 +1,1 @@\n",
858 "n": 3,
859 "t": "@"
860 },
861 {
862 "l": "+bar\n",
863 "n": 4,
864 "t": "+"
865 }
866 ]
867 }
868 ],
816 869 "files": [
817 870 {
818 871 "file": "foo",
@@ -849,6 +902,38 b' changeset/{revision} shows bookmarks'
849 902 0
850 903 ],
851 904 "desc": "modify da/foo",
905 "diff": [
906 {
907 "blockno": 1,
908 "lines": [
909 {
910 "l": "--- a/da/foo\tThu Jan 01 00:00:00 1970 +0000\n",
911 "n": 1,
912 "t": "-"
913 },
914 {
915 "l": "+++ b/da/foo\tThu Jan 01 00:00:00 1970 +0000\n",
916 "n": 2,
917 "t": "+"
918 },
919 {
920 "l": "@@ -1,1 +1,1 @@\n",
921 "n": 3,
922 "t": "@"
923 },
924 {
925 "l": "-foo\n",
926 "n": 4,
927 "t": "-"
928 },
929 {
930 "l": "+bar\n",
931 "n": 5,
932 "t": "+"
933 }
934 ]
935 }
936 ],
852 937 "files": [
853 938 {
854 939 "file": "da/foo",
@@ -877,6 +962,38 b' changeset/{revision} shows branches'
877 962 0
878 963 ],
879 964 "desc": "create test branch",
965 "diff": [
966 {
967 "blockno": 1,
968 "lines": [
969 {
970 "l": "--- a/foo\tThu Jan 01 00:00:00 1970 +0000\n",
971 "n": 1,
972 "t": "-"
973 },
974 {
975 "l": "+++ b/foo\tThu Jan 01 00:00:00 1970 +0000\n",
976 "n": 2,
977 "t": "+"
978 },
979 {
980 "l": "@@ -1,1 +1,1 @@\n",
981 "n": 3,
982 "t": "@"
983 },
984 {
985 "l": "-foo\n",
986 "n": 4,
987 "t": "-"
988 },
989 {
990 "l": "+branch\n",
991 "n": 5,
992 "t": "+"
993 }
994 ]
995 }
996 ],
880 997 "files": [
881 998 {
882 999 "file": "foo",
General Comments 0
You need to be logged in to leave comments. Login now