Fossil SCM
Continuing work on the "diff" command.
Commit
db608ee72f27666be6645c6151f9e791d512ea71
Parent
a51808c0a514480…
1 file changed
+5
-5
+5
-5
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -166,11 +166,11 @@ | ||
| 166 | 166 | load_vfile_from_rid(rid); |
| 167 | 167 | blob_appendf(&sql, |
| 168 | 168 | "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.rid" |
| 169 | 169 | " FROM vfile v1, vfile v2 " |
| 170 | 170 | " WHERE v1.pathname=v2.pathname AND v1.vid=%d AND v2.vid=%d" |
| 171 | - " AND (v2.deleted OR v2.chnged OR v2.rid==0)" | |
| 171 | + " AND (v2.deleted OR v2.chnged OR v1.rid!=v2.rid)" | |
| 172 | 172 | "UNION " |
| 173 | 173 | "SELECT pathname, 1, 0, 0, 0" |
| 174 | 174 | " FROM vfile v1" |
| 175 | 175 | " WHERE v1.vid=%d" |
| 176 | 176 | " AND NOT EXISTS(SELECT 1 FROM vfile v2" |
| @@ -267,27 +267,27 @@ | ||
| 267 | 267 | zFrom = find_option("from", "r", 1); |
| 268 | 268 | zTo = find_option("to", 0, 1); |
| 269 | 269 | |
| 270 | 270 | if( zTo==0 ){ |
| 271 | 271 | db_must_be_within_tree(); |
| 272 | - if( !isInternDiff ){ | |
| 272 | + verify_all_options(); | |
| 273 | + if( !isInternDiff && g.argc==3 ){ | |
| 273 | 274 | zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0); |
| 274 | 275 | } |
| 275 | - verify_all_options(); | |
| 276 | 276 | if( g.argc==3 ){ |
| 277 | 277 | diff_one_against_disk(zFrom, zDiffCmd); |
| 278 | 278 | }else{ |
| 279 | 279 | diff_all_against_disk(zFrom, zDiffCmd); |
| 280 | 280 | } |
| 281 | 281 | }else if( zFrom==0 ){ |
| 282 | 282 | fossil_fatal("must use --from if --to is present"); |
| 283 | 283 | }else{ |
| 284 | 284 | db_find_and_open_repository(1); |
| 285 | - if( !isInternDiff ){ | |
| 285 | + verify_all_options(); | |
| 286 | + if( !isInternDiff && g.argc==3 ){ | |
| 286 | 287 | zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0); |
| 287 | 288 | } |
| 288 | - verify_all_options(); | |
| 289 | 289 | fossil_fatal("--to not yet implemented"); |
| 290 | 290 | #if 0 |
| 291 | 291 | if( g.argc==3 ){ |
| 292 | 292 | diff_one_two_versions(zFrom, zTo, zDiffCmd); |
| 293 | 293 | }else{ |
| 294 | 294 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -166,11 +166,11 @@ | |
| 166 | load_vfile_from_rid(rid); |
| 167 | blob_appendf(&sql, |
| 168 | "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.rid" |
| 169 | " FROM vfile v1, vfile v2 " |
| 170 | " WHERE v1.pathname=v2.pathname AND v1.vid=%d AND v2.vid=%d" |
| 171 | " AND (v2.deleted OR v2.chnged OR v2.rid==0)" |
| 172 | "UNION " |
| 173 | "SELECT pathname, 1, 0, 0, 0" |
| 174 | " FROM vfile v1" |
| 175 | " WHERE v1.vid=%d" |
| 176 | " AND NOT EXISTS(SELECT 1 FROM vfile v2" |
| @@ -267,27 +267,27 @@ | |
| 267 | zFrom = find_option("from", "r", 1); |
| 268 | zTo = find_option("to", 0, 1); |
| 269 | |
| 270 | if( zTo==0 ){ |
| 271 | db_must_be_within_tree(); |
| 272 | if( !isInternDiff ){ |
| 273 | zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0); |
| 274 | } |
| 275 | verify_all_options(); |
| 276 | if( g.argc==3 ){ |
| 277 | diff_one_against_disk(zFrom, zDiffCmd); |
| 278 | }else{ |
| 279 | diff_all_against_disk(zFrom, zDiffCmd); |
| 280 | } |
| 281 | }else if( zFrom==0 ){ |
| 282 | fossil_fatal("must use --from if --to is present"); |
| 283 | }else{ |
| 284 | db_find_and_open_repository(1); |
| 285 | if( !isInternDiff ){ |
| 286 | zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0); |
| 287 | } |
| 288 | verify_all_options(); |
| 289 | fossil_fatal("--to not yet implemented"); |
| 290 | #if 0 |
| 291 | if( g.argc==3 ){ |
| 292 | diff_one_two_versions(zFrom, zTo, zDiffCmd); |
| 293 | }else{ |
| 294 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -166,11 +166,11 @@ | |
| 166 | load_vfile_from_rid(rid); |
| 167 | blob_appendf(&sql, |
| 168 | "SELECT v2.pathname, v2.deleted, v2.chnged, v2.rid==0, v1.rid" |
| 169 | " FROM vfile v1, vfile v2 " |
| 170 | " WHERE v1.pathname=v2.pathname AND v1.vid=%d AND v2.vid=%d" |
| 171 | " AND (v2.deleted OR v2.chnged OR v1.rid!=v2.rid)" |
| 172 | "UNION " |
| 173 | "SELECT pathname, 1, 0, 0, 0" |
| 174 | " FROM vfile v1" |
| 175 | " WHERE v1.vid=%d" |
| 176 | " AND NOT EXISTS(SELECT 1 FROM vfile v2" |
| @@ -267,27 +267,27 @@ | |
| 267 | zFrom = find_option("from", "r", 1); |
| 268 | zTo = find_option("to", 0, 1); |
| 269 | |
| 270 | if( zTo==0 ){ |
| 271 | db_must_be_within_tree(); |
| 272 | verify_all_options(); |
| 273 | if( !isInternDiff && g.argc==3 ){ |
| 274 | zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0); |
| 275 | } |
| 276 | if( g.argc==3 ){ |
| 277 | diff_one_against_disk(zFrom, zDiffCmd); |
| 278 | }else{ |
| 279 | diff_all_against_disk(zFrom, zDiffCmd); |
| 280 | } |
| 281 | }else if( zFrom==0 ){ |
| 282 | fossil_fatal("must use --from if --to is present"); |
| 283 | }else{ |
| 284 | db_find_and_open_repository(1); |
| 285 | verify_all_options(); |
| 286 | if( !isInternDiff && g.argc==3 ){ |
| 287 | zDiffCmd = db_get(isGDiff ? "gdiff-command" : "diff-command", 0); |
| 288 | } |
| 289 | fossil_fatal("--to not yet implemented"); |
| 290 | #if 0 |
| 291 | if( g.argc==3 ){ |
| 292 | diff_one_two_versions(zFrom, zTo, zDiffCmd); |
| 293 | }else{ |
| 294 |