Fossil SCM
Add the --details option to the test-find-pivot command.
Commit
9e48dad49bd1aa10814191a4691b87ce3a2cb2f5787ff744e01046db8d3a42c1
Parent
810dd031ec3ee1d…
1 file changed
+19
+19
| --- src/pivot.c | ||
| +++ src/pivot.c | ||
| @@ -163,10 +163,11 @@ | ||
| 163 | 163 | ** --ignore-merges Ignore merges for discovering name pivots |
| 164 | 164 | */ |
| 165 | 165 | void test_find_pivot(void){ |
| 166 | 166 | int i, rid; |
| 167 | 167 | int ignoreMerges = find_option("ignore-merges",0,0)!=0; |
| 168 | + int showDetails = find_option("details",0,0)!=0; | |
| 168 | 169 | if( g.argc<4 ){ |
| 169 | 170 | usage("?options? PRIMARY SECONDARY ..."); |
| 170 | 171 | } |
| 171 | 172 | db_must_be_within_tree(); |
| 172 | 173 | pivot_set_primary(name_to_rid(g.argv[2])); |
| @@ -175,6 +176,24 @@ | ||
| 175 | 176 | } |
| 176 | 177 | rid = pivot_find(ignoreMerges); |
| 177 | 178 | printf("pivot=%s\n", |
| 178 | 179 | db_text("?","SELECT uuid FROM blob WHERE rid=%d",rid) |
| 179 | 180 | ); |
| 181 | + if( showDetails ){ | |
| 182 | + Stmt q; | |
| 183 | + db_prepare(&q, | |
| 184 | + "SELECT substr(uuid,1,12), aqueue.rid, datetime(aqueue.mtime)," | |
| 185 | + " aqueue.pending, aqueue.src\n" | |
| 186 | + " FROM aqueue JOIN blob ON aqueue.rid=blob.rid\n" | |
| 187 | + " ORDER BY aqueue.mtime DESC" | |
| 188 | + ); | |
| 189 | + while( db_step(&q)==SQLITE_ROW ){ | |
| 190 | + printf("\"%s\",%d,\"%s\",%d,%d\n", | |
| 191 | + db_column_text(&q, 0), | |
| 192 | + db_column_int(&q, 1), | |
| 193 | + db_column_text(&q, 2), | |
| 194 | + db_column_int(&q, 3), | |
| 195 | + db_column_int(&q, 4)); | |
| 196 | + } | |
| 197 | + db_finalize(&q); | |
| 198 | + } | |
| 180 | 199 | } |
| 181 | 200 |
| --- src/pivot.c | |
| +++ src/pivot.c | |
| @@ -163,10 +163,11 @@ | |
| 163 | ** --ignore-merges Ignore merges for discovering name pivots |
| 164 | */ |
| 165 | void test_find_pivot(void){ |
| 166 | int i, rid; |
| 167 | int ignoreMerges = find_option("ignore-merges",0,0)!=0; |
| 168 | if( g.argc<4 ){ |
| 169 | usage("?options? PRIMARY SECONDARY ..."); |
| 170 | } |
| 171 | db_must_be_within_tree(); |
| 172 | pivot_set_primary(name_to_rid(g.argv[2])); |
| @@ -175,6 +176,24 @@ | |
| 175 | } |
| 176 | rid = pivot_find(ignoreMerges); |
| 177 | printf("pivot=%s\n", |
| 178 | db_text("?","SELECT uuid FROM blob WHERE rid=%d",rid) |
| 179 | ); |
| 180 | } |
| 181 |
| --- src/pivot.c | |
| +++ src/pivot.c | |
| @@ -163,10 +163,11 @@ | |
| 163 | ** --ignore-merges Ignore merges for discovering name pivots |
| 164 | */ |
| 165 | void test_find_pivot(void){ |
| 166 | int i, rid; |
| 167 | int ignoreMerges = find_option("ignore-merges",0,0)!=0; |
| 168 | int showDetails = find_option("details",0,0)!=0; |
| 169 | if( g.argc<4 ){ |
| 170 | usage("?options? PRIMARY SECONDARY ..."); |
| 171 | } |
| 172 | db_must_be_within_tree(); |
| 173 | pivot_set_primary(name_to_rid(g.argv[2])); |
| @@ -175,6 +176,24 @@ | |
| 176 | } |
| 177 | rid = pivot_find(ignoreMerges); |
| 178 | printf("pivot=%s\n", |
| 179 | db_text("?","SELECT uuid FROM blob WHERE rid=%d",rid) |
| 180 | ); |
| 181 | if( showDetails ){ |
| 182 | Stmt q; |
| 183 | db_prepare(&q, |
| 184 | "SELECT substr(uuid,1,12), aqueue.rid, datetime(aqueue.mtime)," |
| 185 | " aqueue.pending, aqueue.src\n" |
| 186 | " FROM aqueue JOIN blob ON aqueue.rid=blob.rid\n" |
| 187 | " ORDER BY aqueue.mtime DESC" |
| 188 | ); |
| 189 | while( db_step(&q)==SQLITE_ROW ){ |
| 190 | printf("\"%s\",%d,\"%s\",%d,%d\n", |
| 191 | db_column_text(&q, 0), |
| 192 | db_column_int(&q, 1), |
| 193 | db_column_text(&q, 2), |
| 194 | db_column_int(&q, 3), |
| 195 | db_column_int(&q, 4)); |
| 196 | } |
| 197 | db_finalize(&q); |
| 198 | } |
| 199 | } |
| 200 |