Fossil SCM
Improvements to the tracing output in the find_filename_changes() routine.
Commit
40086b74bac897695d53f24cf9efe18a2a2f7162cfd94163eb1f4e32fb740e4a
Parent
85a7d82e94f487e…
1 file changed
+10
-3
+10
-3
| --- src/path.c | ||
| +++ src/path.c | ||
| @@ -468,10 +468,18 @@ | ||
| 468 | 468 | if( !p->fromIsParent && (p->u.pTo==0 || p->u.pTo->fromIsParent) ){ |
| 469 | 469 | /* Skip nodes where the parent is not on the path */ |
| 470 | 470 | continue; |
| 471 | 471 | } |
| 472 | 472 | db_bind_int(&q1, ":mid", p->rid); |
| 473 | + if( zDebug ){ | |
| 474 | + fossil_print("%s check-in %.16z %z rid %d\n", | |
| 475 | + zDebug, | |
| 476 | + db_text(0, "SELECT uuid FROM blob WHERE rid=%d", p->rid), | |
| 477 | + db_text(0, "SELECT date(mtime) FROM event WHERE objid=%d", p->rid), | |
| 478 | + p->rid | |
| 479 | + ); | |
| 480 | + } | |
| 473 | 481 | while( db_step(&q1)==SQLITE_ROW ){ |
| 474 | 482 | fnid = db_column_int(&q1, 1); |
| 475 | 483 | pfnid = db_column_int(&q1, 0); |
| 476 | 484 | if( pfnid==0 ){ |
| 477 | 485 | pfnid = fnid; |
| @@ -481,13 +489,12 @@ | ||
| 481 | 489 | int t = fnid; |
| 482 | 490 | fnid = pfnid; |
| 483 | 491 | pfnid = t; |
| 484 | 492 | } |
| 485 | 493 | if( zDebug ){ |
| 486 | - fossil_print("%s at %d%s %.10z: %d[%z] -> %d[%z]\n", | |
| 487 | - zDebug, p->rid, p->fromIsParent ? ">" : "<", | |
| 488 | - db_text(0, "SELECT uuid FROM blob WHERE rid=%d", p->rid), | |
| 494 | + fossil_print("%s %d[%z] -> %d[%z]\n", | |
| 495 | + zDebug, | |
| 489 | 496 | pfnid, |
| 490 | 497 | db_text(0, "SELECT name FROM filename WHERE fnid=%d", pfnid), |
| 491 | 498 | fnid, |
| 492 | 499 | db_text(0, "SELECT name FROM filename WHERE fnid=%d", fnid)); |
| 493 | 500 | } |
| 494 | 501 |
| --- src/path.c | |
| +++ src/path.c | |
| @@ -468,10 +468,18 @@ | |
| 468 | if( !p->fromIsParent && (p->u.pTo==0 || p->u.pTo->fromIsParent) ){ |
| 469 | /* Skip nodes where the parent is not on the path */ |
| 470 | continue; |
| 471 | } |
| 472 | db_bind_int(&q1, ":mid", p->rid); |
| 473 | while( db_step(&q1)==SQLITE_ROW ){ |
| 474 | fnid = db_column_int(&q1, 1); |
| 475 | pfnid = db_column_int(&q1, 0); |
| 476 | if( pfnid==0 ){ |
| 477 | pfnid = fnid; |
| @@ -481,13 +489,12 @@ | |
| 481 | int t = fnid; |
| 482 | fnid = pfnid; |
| 483 | pfnid = t; |
| 484 | } |
| 485 | if( zDebug ){ |
| 486 | fossil_print("%s at %d%s %.10z: %d[%z] -> %d[%z]\n", |
| 487 | zDebug, p->rid, p->fromIsParent ? ">" : "<", |
| 488 | db_text(0, "SELECT uuid FROM blob WHERE rid=%d", p->rid), |
| 489 | pfnid, |
| 490 | db_text(0, "SELECT name FROM filename WHERE fnid=%d", pfnid), |
| 491 | fnid, |
| 492 | db_text(0, "SELECT name FROM filename WHERE fnid=%d", fnid)); |
| 493 | } |
| 494 |
| --- src/path.c | |
| +++ src/path.c | |
| @@ -468,10 +468,18 @@ | |
| 468 | if( !p->fromIsParent && (p->u.pTo==0 || p->u.pTo->fromIsParent) ){ |
| 469 | /* Skip nodes where the parent is not on the path */ |
| 470 | continue; |
| 471 | } |
| 472 | db_bind_int(&q1, ":mid", p->rid); |
| 473 | if( zDebug ){ |
| 474 | fossil_print("%s check-in %.16z %z rid %d\n", |
| 475 | zDebug, |
| 476 | db_text(0, "SELECT uuid FROM blob WHERE rid=%d", p->rid), |
| 477 | db_text(0, "SELECT date(mtime) FROM event WHERE objid=%d", p->rid), |
| 478 | p->rid |
| 479 | ); |
| 480 | } |
| 481 | while( db_step(&q1)==SQLITE_ROW ){ |
| 482 | fnid = db_column_int(&q1, 1); |
| 483 | pfnid = db_column_int(&q1, 0); |
| 484 | if( pfnid==0 ){ |
| 485 | pfnid = fnid; |
| @@ -481,13 +489,12 @@ | |
| 489 | int t = fnid; |
| 490 | fnid = pfnid; |
| 491 | pfnid = t; |
| 492 | } |
| 493 | if( zDebug ){ |
| 494 | fossil_print("%s %d[%z] -> %d[%z]\n", |
| 495 | zDebug, |
| 496 | pfnid, |
| 497 | db_text(0, "SELECT name FROM filename WHERE fnid=%d", pfnid), |
| 498 | fnid, |
| 499 | db_text(0, "SELECT name FROM filename WHERE fnid=%d", fnid)); |
| 500 | } |
| 501 |