Fossil SCM
Remove stale code accidently left in an earlier commit.
Commit
61c8d418723b59bbac937752a930177d88768bc7
Parent
03a64a6fef71f2b…
1 file changed
-43
-43
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -755,53 +755,10 @@ | ||
| 755 | 755 | const char *zBinGlob = find_option("binary", 0, 1); |
| 756 | 756 | if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0); |
| 757 | 757 | return zBinGlob; |
| 758 | 758 | } |
| 759 | 759 | |
| 760 | -/* | |
| 761 | -** The input is a list of file and/or directory names either in the current | |
| 762 | -** checkout, or in the undo buffer if useUndo is true, or in check-outs | |
| 763 | -** zFrom and/or zTo if they are not null. Return a new list that consists | |
| 764 | -** of only filenames. Any directories on the input list are expected into | |
| 765 | -** multiple files in the output list. The output list uses space obtained | |
| 766 | -** from malloc() and is NULL terminated. | |
| 767 | -*/ | |
| 768 | -static char **diff_expand_dirs( | |
| 769 | - int argc, /* Number of entries in argv[] */ | |
| 770 | - const char **argv, /* List of files and/or directories to be diffed */ | |
| 771 | - const char *zFrom, /* Source check-in name, or NULL */ | |
| 772 | - const char *zTo, /* Target check-in name, or NULL */ | |
| 773 | - int useUndo /* True if diffing against the undo buffer */ | |
| 774 | -){ | |
| 775 | - Stmt q; | |
| 776 | - int i; | |
| 777 | - db_multi_exec( | |
| 778 | - "CREATE TEMP TABLE dfiles(" | |
| 779 | - " name TEXT PRIMARY KEY," | |
| 780 | - " path TEXT" | |
| 781 | - ") WITHOUT ROWID;" | |
| 782 | - "CREATE TEMP TABLE allowed(" | |
| 783 | - " fn TEXT PRIMARY KEY" | |
| 784 | - ") WITHOUT ROWID;" | |
| 785 | - ); | |
| 786 | - if( useUndo ){ | |
| 787 | - db_multi_exec( | |
| 788 | - "INSERT OR IGNORE INTO allowed(fn)" | |
| 789 | - " SELECT pathname FROM undo INTERSECT SELECT pathname FROM vfile;" | |
| 790 | - ); | |
| 791 | - }else if( zTo ){ | |
| 792 | - } | |
| 793 | - db_prepare(&q, "INSERT OR IGNORE INTO dfiles(names) VALUES(:txt)"); | |
| 794 | - for(i=0; i<argc; i++){ | |
| 795 | - db_bind_text(&q, ":txt", argv[i]); | |
| 796 | - db_step(&q); | |
| 797 | - db_reset(&q); | |
| 798 | - } | |
| 799 | - db_finalize(&q); | |
| 800 | - | |
| 801 | -} | |
| 802 | - | |
| 803 | 760 | /* |
| 804 | 761 | ** COMMAND: diff |
| 805 | 762 | ** COMMAND: gdiff |
| 806 | 763 | ** |
| 807 | 764 | ** Usage: %fossil diff|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...? |
| 808 | 765 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -755,53 +755,10 @@ | |
| 755 | const char *zBinGlob = find_option("binary", 0, 1); |
| 756 | if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0); |
| 757 | return zBinGlob; |
| 758 | } |
| 759 | |
| 760 | /* |
| 761 | ** The input is a list of file and/or directory names either in the current |
| 762 | ** checkout, or in the undo buffer if useUndo is true, or in check-outs |
| 763 | ** zFrom and/or zTo if they are not null. Return a new list that consists |
| 764 | ** of only filenames. Any directories on the input list are expected into |
| 765 | ** multiple files in the output list. The output list uses space obtained |
| 766 | ** from malloc() and is NULL terminated. |
| 767 | */ |
| 768 | static char **diff_expand_dirs( |
| 769 | int argc, /* Number of entries in argv[] */ |
| 770 | const char **argv, /* List of files and/or directories to be diffed */ |
| 771 | const char *zFrom, /* Source check-in name, or NULL */ |
| 772 | const char *zTo, /* Target check-in name, or NULL */ |
| 773 | int useUndo /* True if diffing against the undo buffer */ |
| 774 | ){ |
| 775 | Stmt q; |
| 776 | int i; |
| 777 | db_multi_exec( |
| 778 | "CREATE TEMP TABLE dfiles(" |
| 779 | " name TEXT PRIMARY KEY," |
| 780 | " path TEXT" |
| 781 | ") WITHOUT ROWID;" |
| 782 | "CREATE TEMP TABLE allowed(" |
| 783 | " fn TEXT PRIMARY KEY" |
| 784 | ") WITHOUT ROWID;" |
| 785 | ); |
| 786 | if( useUndo ){ |
| 787 | db_multi_exec( |
| 788 | "INSERT OR IGNORE INTO allowed(fn)" |
| 789 | " SELECT pathname FROM undo INTERSECT SELECT pathname FROM vfile;" |
| 790 | ); |
| 791 | }else if( zTo ){ |
| 792 | } |
| 793 | db_prepare(&q, "INSERT OR IGNORE INTO dfiles(names) VALUES(:txt)"); |
| 794 | for(i=0; i<argc; i++){ |
| 795 | db_bind_text(&q, ":txt", argv[i]); |
| 796 | db_step(&q); |
| 797 | db_reset(&q); |
| 798 | } |
| 799 | db_finalize(&q); |
| 800 | |
| 801 | } |
| 802 | |
| 803 | /* |
| 804 | ** COMMAND: diff |
| 805 | ** COMMAND: gdiff |
| 806 | ** |
| 807 | ** Usage: %fossil diff|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...? |
| 808 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -755,53 +755,10 @@ | |
| 755 | const char *zBinGlob = find_option("binary", 0, 1); |
| 756 | if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0); |
| 757 | return zBinGlob; |
| 758 | } |
| 759 | |
| 760 | /* |
| 761 | ** COMMAND: diff |
| 762 | ** COMMAND: gdiff |
| 763 | ** |
| 764 | ** Usage: %fossil diff|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...? |
| 765 |