Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch dead-end Excluding Merge-Ins
This is equivalent to a diff from 2f58d48cab to 1761fee055
2010-02-08
| ||
16:08 | Alternative fix for ticket [9ff56ae8a6]. check-in: 3cc4cd55d8 user: drh tags: trunk | |
14:20 | Added better error message when trying to remove a directory. Closed-Leaf check-in: 1761fee055 user: jeremy_c tags: dead-end | |
2010-02-06
| ||
20:20 | fixed [9ff56ae8a6] - "fossil sha" crash check-in: 4027ad4b7e user: ron tags: dead-end | |
17:25 | Windows only: remove duplicate code from sqlite3.c in db.c check-in: 2f58d48cab user: ron tags: trunk | |
12:14 | Fix double-free of zCopy in date_to_uuid(). Ticket [dc2b2503031] check-in: 01a769a9fa user: drh tags: trunk | |
Changes to src/add.c.
1 2 3 4 5 6 7 8 9 10 11 | /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public ** License version 2 as published by the Free Software Foundation. ** ** This program is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** General Public License for more details. | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public ** License version 2 as published by the Free Software Foundation. ** ** This program is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ** General Public License for more details. ** ** You should have received a copy of the GNU General Public ** License along with this library; if not, write to the ** Free Software Foundation, Inc., 59 Temple Place - Suite 330, ** Boston, MA 02111-1307, USA. ** ** Author contact information: ** drh@hwaci.com |
︙ | ︙ | |||
30 31 32 33 34 35 36 | #include <dirent.h> /* ** Set to true if files whose names begin with "." should be ** included when processing a recursive "add" command. */ static int includeDotFiles = 0; | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | #include <dirent.h> /* ** Set to true if files whose names begin with "." should be ** included when processing a recursive "add" command. */ static int includeDotFiles = 0; /* ** Add a single file */ static void add_one_file(const char *zName, int vid, Blob *pOmit){ Blob pathname; const char *zPath; file_tree_name(zName, &pathname, 1); zPath = blob_str(&pathname); if( strcmp(zPath, "manifest")==0 || strcmp(zPath, "_FOSSIL_")==0 || strcmp(zPath, "manifest.uuid")==0 || blob_compare(&pathname, pOmit)==0 ){ |
︙ | ︙ | |||
124 125 126 127 128 129 130 | } /* ** COMMAND: add ** ** Usage: %fossil add FILE... ** | | | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | } /* ** COMMAND: add ** ** Usage: %fossil add FILE... ** ** Make arrangements to add one or more files to the current checkout ** at the next commit. ** ** When adding files recursively, filenames that begin with "." are ** excluded by default. To include such files, add the "--dotfiles" ** option to the command-line. */ void add_cmd(void){ |
︙ | ︙ | |||
199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 | if( vid==0 ){ fossil_panic("no checkout to remove from"); } db_begin_transaction(); for(i=2; i<g.argc; i++){ char *zName; char *zPath; Blob pathname; zName = mprintf("%/", g.argv[i]); file_tree_name(zName, &pathname, 1); zPath = blob_str(&pathname); if( !db_exists( "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){ fossil_fatal("not in the repository: %s", zName); }else{ db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath); printf("DELETED %s\n", zPath); } blob_reset(&pathname); free(zName); } db_multi_exec("DELETE FROM vfile WHERE deleted AND rid=0"); db_end_transaction(0); } /* | > > > > > | | 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 | if( vid==0 ){ fossil_panic("no checkout to remove from"); } db_begin_transaction(); for(i=2; i<g.argc; i++){ char *zName; char *zPath; int isDir; Blob pathname; zName = mprintf("%/", g.argv[i]); isDir = file_isdir(zName); if( isDir==1 ){ fossil_fatal("cannot remove directories. Please remove individual files instead."); } file_tree_name(zName, &pathname, 1); zPath = blob_str(&pathname); if( !db_exists( "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){ fossil_fatal("not in the repository: %s", zName); }else{ db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath); printf("DELETED %s\n", zPath); } blob_reset(&pathname); free(zName); } db_multi_exec("DELETE FROM vfile WHERE deleted AND rid=0"); db_end_transaction(0); } /* ** Rename a single file. ** ** The original name of the file is zOrig. The new filename is zNew. */ static void mv_one_file(int vid, const char *zOrig, const char *zNew){ printf("RENAME %s %s\n", zOrig, zNew); db_multi_exec( "UPDATE vfile SET pathname='%s' WHERE pathname='%s' AND vid=%d", |
︙ | ︙ |
Changes to src/sha1.c.
︙ | ︙ | |||
609 610 611 612 613 614 615 616 617 618 619 620 621 | Blob cksum; for(i=2; i<g.argc; i++){ if( g.argv[i][0]=='-' && g.argv[i][1]==0 ){ blob_read_from_channel(&in, stdin, -1); sha1sum_blob(&in, &cksum); }else{ sha1sum_file(g.argv[i], &cksum); } printf("%s %s\n", blob_str(&cksum), g.argv[i]); blob_reset(&cksum); } } | > > > | 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 | Blob cksum; for(i=2; i<g.argc; i++){ if( g.argv[i][0]=='-' && g.argv[i][1]==0 ){ blob_read_from_channel(&in, stdin, -1); sha1sum_blob(&in, &cksum); }else{ if (access(g.argv[i], R_OK)) { fossil_fatal("cannot open %s", g.argv[i]); } sha1sum_file(g.argv[i], &cksum); } printf("%s %s\n", blob_str(&cksum), g.argv[i]); blob_reset(&cksum); } } |