Fossil SCM
Show the artifact numbers on the From and To of a file diff.
Commit
9a63d1f048c53352c63a7a1359a60e8194c7d101
Parent
73c38a3add8f0c3…
1 file changed
+7
-2
+7
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -949,16 +949,20 @@ | ||
| 949 | 949 | */ |
| 950 | 950 | void diff_page(void){ |
| 951 | 951 | int v1, v2; |
| 952 | 952 | int isPatch; |
| 953 | 953 | Blob c1, c2, diff, *pOut; |
| 954 | + char *zV1; | |
| 955 | + char *zV2; | |
| 954 | 956 | |
| 955 | 957 | login_check_credentials(); |
| 956 | 958 | if( !g.okRead ){ login_needed(); return; } |
| 957 | 959 | v1 = name_to_rid_www("v1"); |
| 958 | 960 | v2 = name_to_rid_www("v2"); |
| 959 | 961 | if( v1==0 || v2==0 ) fossil_redirect_home(); |
| 962 | + zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1); | |
| 963 | + zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2); | |
| 960 | 964 | isPatch = P("patch")!=0; |
| 961 | 965 | if( isPatch ){ |
| 962 | 966 | pOut = cgi_output_blob(); |
| 963 | 967 | cgi_set_content_type("text/plain"); |
| 964 | 968 | }else{ |
| @@ -972,15 +976,16 @@ | ||
| 972 | 976 | blob_reset(&c2); |
| 973 | 977 | if( !isPatch ){ |
| 974 | 978 | style_header("Diff"); |
| 975 | 979 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 976 | 980 | g.zTop, P("v1"), P("v2")); |
| 977 | - @ <h2>Differences From:</h2> | |
| 981 | + @ <h2>Differences From | |
| 982 | + @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> | |
| 978 | 983 | @ <blockquote><p> |
| 979 | 984 | object_description(v1, 1, 0); |
| 980 | 985 | @ </p></blockquote> |
| 981 | - @ <h2>To:</h2> | |
| 986 | + @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2> | |
| 982 | 987 | @ <blockquote><p> |
| 983 | 988 | object_description(v2, 1, 0); |
| 984 | 989 | @ </p></blockquote> |
| 985 | 990 | @ <hr /> |
| 986 | 991 | @ <blockquote><pre> |
| 987 | 992 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -949,16 +949,20 @@ | |
| 949 | */ |
| 950 | void diff_page(void){ |
| 951 | int v1, v2; |
| 952 | int isPatch; |
| 953 | Blob c1, c2, diff, *pOut; |
| 954 | |
| 955 | login_check_credentials(); |
| 956 | if( !g.okRead ){ login_needed(); return; } |
| 957 | v1 = name_to_rid_www("v1"); |
| 958 | v2 = name_to_rid_www("v2"); |
| 959 | if( v1==0 || v2==0 ) fossil_redirect_home(); |
| 960 | isPatch = P("patch")!=0; |
| 961 | if( isPatch ){ |
| 962 | pOut = cgi_output_blob(); |
| 963 | cgi_set_content_type("text/plain"); |
| 964 | }else{ |
| @@ -972,15 +976,16 @@ | |
| 972 | blob_reset(&c2); |
| 973 | if( !isPatch ){ |
| 974 | style_header("Diff"); |
| 975 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 976 | g.zTop, P("v1"), P("v2")); |
| 977 | @ <h2>Differences From:</h2> |
| 978 | @ <blockquote><p> |
| 979 | object_description(v1, 1, 0); |
| 980 | @ </p></blockquote> |
| 981 | @ <h2>To:</h2> |
| 982 | @ <blockquote><p> |
| 983 | object_description(v2, 1, 0); |
| 984 | @ </p></blockquote> |
| 985 | @ <hr /> |
| 986 | @ <blockquote><pre> |
| 987 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -949,16 +949,20 @@ | |
| 949 | */ |
| 950 | void diff_page(void){ |
| 951 | int v1, v2; |
| 952 | int isPatch; |
| 953 | Blob c1, c2, diff, *pOut; |
| 954 | char *zV1; |
| 955 | char *zV2; |
| 956 | |
| 957 | login_check_credentials(); |
| 958 | if( !g.okRead ){ login_needed(); return; } |
| 959 | v1 = name_to_rid_www("v1"); |
| 960 | v2 = name_to_rid_www("v2"); |
| 961 | if( v1==0 || v2==0 ) fossil_redirect_home(); |
| 962 | zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1); |
| 963 | zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2); |
| 964 | isPatch = P("patch")!=0; |
| 965 | if( isPatch ){ |
| 966 | pOut = cgi_output_blob(); |
| 967 | cgi_set_content_type("text/plain"); |
| 968 | }else{ |
| @@ -972,15 +976,16 @@ | |
| 976 | blob_reset(&c2); |
| 977 | if( !isPatch ){ |
| 978 | style_header("Diff"); |
| 979 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 980 | g.zTop, P("v1"), P("v2")); |
| 981 | @ <h2>Differences From |
| 982 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 983 | @ <blockquote><p> |
| 984 | object_description(v1, 1, 0); |
| 985 | @ </p></blockquote> |
| 986 | @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2> |
| 987 | @ <blockquote><p> |
| 988 | object_description(v2, 1, 0); |
| 989 | @ </p></blockquote> |
| 990 | @ <hr /> |
| 991 | @ <blockquote><pre> |
| 992 |