Fossil SCM
In File History show the file path in page's title.
Commit
888eaf4fadad2800048c939c1db4bdae901de5741568f235ace9f007762f0bc8
Parent
65a60dba2994670…
1 file changed
+9
-6
+9
-6
| --- src/finfo.c | ||
| +++ src/finfo.c | ||
| @@ -199,11 +199,11 @@ | ||
| 199 | 199 | TAG_BRANCH, zFilename, filename_collation(), |
| 200 | 200 | iLimit, iOffset |
| 201 | 201 | ); |
| 202 | 202 | blob_zero(&line); |
| 203 | 203 | if( iBrief ){ |
| 204 | - fossil_print("History of %s\n", blob_str(&fname)); | |
| 204 | + fossil_print("History for %s\n", blob_str(&fname)); | |
| 205 | 205 | } |
| 206 | 206 | while( db_step(&q)==SQLITE_ROW ){ |
| 207 | 207 | const char *zFileUuid = db_column_text(&q, 0); |
| 208 | 208 | const char *zCiUuid = db_column_text(&q,1); |
| 209 | 209 | const char *zDate = db_column_text(&q, 2); |
| @@ -296,11 +296,11 @@ | ||
| 296 | 296 | ** timezone offset from UTC as "-HH:MM" (westward) or "+HH:MM" |
| 297 | 297 | ** (eastward). Either no timezone suffix or "Z" means UTC. |
| 298 | 298 | */ |
| 299 | 299 | void finfo_page(void){ |
| 300 | 300 | Stmt q; |
| 301 | - const char *zFilename; | |
| 301 | + const char *zFilename = PD("name",""); | |
| 302 | 302 | char zPrevDate[20]; |
| 303 | 303 | const char *zA; |
| 304 | 304 | const char *zB; |
| 305 | 305 | int n; |
| 306 | 306 | int baseCheckin; |
| @@ -321,11 +321,16 @@ | ||
| 321 | 321 | const char *zMark; /* Mark this version of the file */ |
| 322 | 322 | int selRid = 0; /* RID of the marked file version */ |
| 323 | 323 | |
| 324 | 324 | login_check_credentials(); |
| 325 | 325 | if( !g.perm.Read ){ login_needed(g.anon.Read); return; } |
| 326 | - style_header("File History"); | |
| 326 | + fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename); | |
| 327 | + if( fnid==0 ){ | |
| 328 | + style_header("History unavailable"); | |
| 329 | + }else{ | |
| 330 | + style_header("History for %s", zFilename); | |
| 331 | + } | |
| 327 | 332 | login_anonymous_available(); |
| 328 | 333 | tmFlags = timeline_ss_submenu(); |
| 329 | 334 | if( tmFlags & TIMELINE_COLUMNAR ){ |
| 330 | 335 | zStyle = "Columnar"; |
| 331 | 336 | }else if( tmFlags & TIMELINE_COMPACT ){ |
| @@ -340,13 +345,11 @@ | ||
| 340 | 345 | url_initialize(&url, "finfo"); |
| 341 | 346 | if( brBg ) url_add_parameter(&url, "brbg", 0); |
| 342 | 347 | if( uBg ) url_add_parameter(&url, "ubg", 0); |
| 343 | 348 | baseCheckin = name_to_rid_www("ci"); |
| 344 | 349 | zPrevDate[0] = 0; |
| 345 | - zFilename = PD("name",""); | |
| 346 | 350 | cookie_render(); |
| 347 | - fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename); | |
| 348 | 351 | if( fnid==0 ){ |
| 349 | 352 | @ No such file: %h(zFilename) |
| 350 | 353 | style_footer(); |
| 351 | 354 | return; |
| 352 | 355 | } |
| @@ -449,11 +452,11 @@ | ||
| 449 | 452 | zLink = href("%R/info/%!S", zUuid); |
| 450 | 453 | blob_appendf(&title, " and check-in %z%S</a>", zLink, zUuid); |
| 451 | 454 | fossil_free(zUuid); |
| 452 | 455 | } |
| 453 | 456 | }else{ |
| 454 | - blob_appendf(&title, "History of "); | |
| 457 | + blob_appendf(&title, "History for "); | |
| 455 | 458 | hyperlinked_path(zFilename, &title, 0, "tree", ""); |
| 456 | 459 | if( fShowId ) blob_appendf(&title, " (%d)", fnid); |
| 457 | 460 | } |
| 458 | 461 | if( uBg ){ |
| 459 | 462 | blob_append(&title, " (color-coded by user)", -1); |
| 460 | 463 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -199,11 +199,11 @@ | |
| 199 | TAG_BRANCH, zFilename, filename_collation(), |
| 200 | iLimit, iOffset |
| 201 | ); |
| 202 | blob_zero(&line); |
| 203 | if( iBrief ){ |
| 204 | fossil_print("History of %s\n", blob_str(&fname)); |
| 205 | } |
| 206 | while( db_step(&q)==SQLITE_ROW ){ |
| 207 | const char *zFileUuid = db_column_text(&q, 0); |
| 208 | const char *zCiUuid = db_column_text(&q,1); |
| 209 | const char *zDate = db_column_text(&q, 2); |
| @@ -296,11 +296,11 @@ | |
| 296 | ** timezone offset from UTC as "-HH:MM" (westward) or "+HH:MM" |
| 297 | ** (eastward). Either no timezone suffix or "Z" means UTC. |
| 298 | */ |
| 299 | void finfo_page(void){ |
| 300 | Stmt q; |
| 301 | const char *zFilename; |
| 302 | char zPrevDate[20]; |
| 303 | const char *zA; |
| 304 | const char *zB; |
| 305 | int n; |
| 306 | int baseCheckin; |
| @@ -321,11 +321,16 @@ | |
| 321 | const char *zMark; /* Mark this version of the file */ |
| 322 | int selRid = 0; /* RID of the marked file version */ |
| 323 | |
| 324 | login_check_credentials(); |
| 325 | if( !g.perm.Read ){ login_needed(g.anon.Read); return; } |
| 326 | style_header("File History"); |
| 327 | login_anonymous_available(); |
| 328 | tmFlags = timeline_ss_submenu(); |
| 329 | if( tmFlags & TIMELINE_COLUMNAR ){ |
| 330 | zStyle = "Columnar"; |
| 331 | }else if( tmFlags & TIMELINE_COMPACT ){ |
| @@ -340,13 +345,11 @@ | |
| 340 | url_initialize(&url, "finfo"); |
| 341 | if( brBg ) url_add_parameter(&url, "brbg", 0); |
| 342 | if( uBg ) url_add_parameter(&url, "ubg", 0); |
| 343 | baseCheckin = name_to_rid_www("ci"); |
| 344 | zPrevDate[0] = 0; |
| 345 | zFilename = PD("name",""); |
| 346 | cookie_render(); |
| 347 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename); |
| 348 | if( fnid==0 ){ |
| 349 | @ No such file: %h(zFilename) |
| 350 | style_footer(); |
| 351 | return; |
| 352 | } |
| @@ -449,11 +452,11 @@ | |
| 449 | zLink = href("%R/info/%!S", zUuid); |
| 450 | blob_appendf(&title, " and check-in %z%S</a>", zLink, zUuid); |
| 451 | fossil_free(zUuid); |
| 452 | } |
| 453 | }else{ |
| 454 | blob_appendf(&title, "History of "); |
| 455 | hyperlinked_path(zFilename, &title, 0, "tree", ""); |
| 456 | if( fShowId ) blob_appendf(&title, " (%d)", fnid); |
| 457 | } |
| 458 | if( uBg ){ |
| 459 | blob_append(&title, " (color-coded by user)", -1); |
| 460 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -199,11 +199,11 @@ | |
| 199 | TAG_BRANCH, zFilename, filename_collation(), |
| 200 | iLimit, iOffset |
| 201 | ); |
| 202 | blob_zero(&line); |
| 203 | if( iBrief ){ |
| 204 | fossil_print("History for %s\n", blob_str(&fname)); |
| 205 | } |
| 206 | while( db_step(&q)==SQLITE_ROW ){ |
| 207 | const char *zFileUuid = db_column_text(&q, 0); |
| 208 | const char *zCiUuid = db_column_text(&q,1); |
| 209 | const char *zDate = db_column_text(&q, 2); |
| @@ -296,11 +296,11 @@ | |
| 296 | ** timezone offset from UTC as "-HH:MM" (westward) or "+HH:MM" |
| 297 | ** (eastward). Either no timezone suffix or "Z" means UTC. |
| 298 | */ |
| 299 | void finfo_page(void){ |
| 300 | Stmt q; |
| 301 | const char *zFilename = PD("name",""); |
| 302 | char zPrevDate[20]; |
| 303 | const char *zA; |
| 304 | const char *zB; |
| 305 | int n; |
| 306 | int baseCheckin; |
| @@ -321,11 +321,16 @@ | |
| 321 | const char *zMark; /* Mark this version of the file */ |
| 322 | int selRid = 0; /* RID of the marked file version */ |
| 323 | |
| 324 | login_check_credentials(); |
| 325 | if( !g.perm.Read ){ login_needed(g.anon.Read); return; } |
| 326 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename); |
| 327 | if( fnid==0 ){ |
| 328 | style_header("History unavailable"); |
| 329 | }else{ |
| 330 | style_header("History for %s", zFilename); |
| 331 | } |
| 332 | login_anonymous_available(); |
| 333 | tmFlags = timeline_ss_submenu(); |
| 334 | if( tmFlags & TIMELINE_COLUMNAR ){ |
| 335 | zStyle = "Columnar"; |
| 336 | }else if( tmFlags & TIMELINE_COMPACT ){ |
| @@ -340,13 +345,11 @@ | |
| 345 | url_initialize(&url, "finfo"); |
| 346 | if( brBg ) url_add_parameter(&url, "brbg", 0); |
| 347 | if( uBg ) url_add_parameter(&url, "ubg", 0); |
| 348 | baseCheckin = name_to_rid_www("ci"); |
| 349 | zPrevDate[0] = 0; |
| 350 | cookie_render(); |
| 351 | if( fnid==0 ){ |
| 352 | @ No such file: %h(zFilename) |
| 353 | style_footer(); |
| 354 | return; |
| 355 | } |
| @@ -449,11 +452,11 @@ | |
| 452 | zLink = href("%R/info/%!S", zUuid); |
| 453 | blob_appendf(&title, " and check-in %z%S</a>", zLink, zUuid); |
| 454 | fossil_free(zUuid); |
| 455 | } |
| 456 | }else{ |
| 457 | blob_appendf(&title, "History for "); |
| 458 | hyperlinked_path(zFilename, &title, 0, "tree", ""); |
| 459 | if( fShowId ) blob_appendf(&title, " (%d)", fnid); |
| 460 | } |
| 461 | if( uBg ){ |
| 462 | blob_append(&title, " (color-coded by user)", -1); |
| 463 |