Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch lang Excluding Merge-Ins
This is equivalent to a diff from 0183e1917f to 1dfb33e879
|
2010-09-22
| ||
| 14:32 | Updates to the submenu links for ticket views. check-in: f29a826666 user: drh tags: trunk | |
| 02:58 | start of "nop" no-operation command check-in: 46ea03734f user: bharder tags: nop | |
|
2010-09-19
| ||
| 06:15 | merged trunk check-in: 5e7d7144ec user: Ratte tags: wolfgangFormat2CSS_2 | |
| 01:14 | merge trunk Leaf check-in: 1dfb33e879 user: bharder tags: lang | |
| 00:56 | Corrections to the built-in help text for the "all" command. check-in: 0183e1917f user: drh tags: trunk | |
|
2010-09-18
| ||
| 22:22 | Enable large-file support for stat() on linux. Fix the "stat" webpage to handle repositories larger than 2GB. Ticket [b1934313bcfb3a90d4027b] check-in: 31fdc347ac user: drh tags: trunk | |
| 16:04 | more pedantic language adj check-in: ee96785db6 user: bharder tags: lang | |
Changes to src/add.c.
212 212 zFilePath = blob_str(&pathname); 213 213 if( !db_exists( 214 214 "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zFilePath) 215 215 ){ 216 216 printf("SKIPPED %s\n", zPath); 217 217 }else{ 218 218 db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath); 219 - printf("DELETED %s\n", zPath); 219 + printf("DISMISSED %s\n", zPath); 220 220 } 221 221 blob_reset(&pathname); 222 222 } 223 223 blob_resize(&path, origSize); 224 224 } 225 225 } 226 226 closedir(d); 227 227 blob_reset(&path); 228 228 } 229 229 230 230 /* 231 231 ** COMMAND: rm 232 232 ** COMMAND: delete 233 +** COMMAND: dismiss 233 234 ** 234 235 ** Usage: %fossil rm FILE... 235 236 ** or: %fossil delete FILE... 237 +** or: %fossil dismiss FILE... 236 238 ** 237 239 ** Remove one or more files from the tree. 238 240 ** 239 241 ** This command does not remove the files from disk. It just marks the 240 242 ** files as no longer being part of the project. In other words, future 241 243 ** changes to the named files will not be versioned. 242 244 */ ................................................................................ 262 264 file_tree_name(zName, &pathname, 1); 263 265 zPath = blob_str(&pathname); 264 266 if( !db_exists( 265 267 "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){ 266 268 fossil_fatal("not in the repository: %s", zName); 267 269 }else{ 268 270 db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath); 269 - printf("DELETED %s\n", zPath); 271 + printf("DISMISSED %s\n", zPath); 270 272 } 271 273 blob_reset(&pathname); 272 274 } 273 275 free(zName); 274 276 } 275 277 db_multi_exec("DELETE FROM vfile WHERE deleted AND rid=0"); 276 278 db_end_transaction(0);
Changes to src/checkin.c.
50 50 int isDeleted = db_column_int(&q, 1); 51 51 int isChnged = db_column_int(&q,2); 52 52 int isNew = db_column_int(&q,3)==0; 53 53 int isRenamed = db_column_int(&q,4); 54 54 char *zFullName = mprintf("%s/%s", g.zLocalRoot, zPathname); 55 55 blob_append(report, zPrefix, nPrefix); 56 56 if( isDeleted ){ 57 - blob_appendf(report, "DELETED %s\n", zPathname); 57 + blob_appendf(report, "DISMISSED %s\n", zPathname); 58 58 }else if( !file_isfile(zFullName) ){ 59 59 if( access(zFullName, 0)==0 ){ 60 60 blob_appendf(report, "NOT_A_FILE %s\n", zPathname); 61 61 if( missingIsFatal ){ 62 62 fossil_warning("not a file: %s", zPathname); 63 63 nErr++; 64 64 } ................................................................................ 68 68 fossil_warning("missing file: %s", zPathname); 69 69 nErr++; 70 70 } 71 71 } 72 72 }else if( isNew ){ 73 73 blob_appendf(report, "ADDED %s\n", zPathname); 74 74 }else if( isDeleted ){ 75 - blob_appendf(report, "DELETED %s\n", zPathname); 75 + blob_appendf(report, "DISMISSED %s\n", zPathname); 76 76 }else if( isChnged==2 ){ 77 77 blob_appendf(report, "UPDATED_BY_MERGE %s\n", zPathname); 78 78 }else if( isChnged==3 ){ 79 79 blob_appendf(report, "ADDED_BY_MERGE %s\n", zPathname); 80 80 }else if( isChnged==1 ){ 81 81 blob_appendf(report, "EDITED %s\n", zPathname); 82 82 }else if( isRenamed ){ ................................................................................ 173 173 }else if( !file_isfile(zFullName) ){ 174 174 if( access(zFullName, 0)==0 ){ 175 175 printf("NOT_A_FILE %s\n", zPathname); 176 176 }else{ 177 177 printf("MISSING %s\n", zPathname); 178 178 } 179 179 }else if( isDeleted ){ 180 - printf("DELETED %s\n", zPathname); 180 + printf("DISMISSED %s\n", zPathname); 181 181 }else if( chnged ){ 182 182 printf("EDITED %s\n", zPathname); 183 183 }else if( renamed ){ 184 184 printf("RENAMED %s\n", zPathname); 185 185 }else{ 186 186 printf("UNCHANGED %s\n", zPathname); 187 187 }
Changes to src/diff.c.
817 817 @ %s(ann.aOrig[i].zSrc): %h(ann.aOrig[i].z) 818 818 } 819 819 @ </pre> 820 820 style_footer(); 821 821 } 822 822 823 823 /* 824 -** COMMAND: annotate 824 +** COMMAND: annotated 825 825 ** 826 -** %fossil annotate FILENAME 826 +** %fossil annotated FILENAME 827 827 ** 828 -** Output the text of a file with markings to show when each line of 829 -** the file was last modified. 828 +** Output annotated text of a file showing when each line of the file 829 +** was last modified. 830 830 */ 831 831 void annotate_cmd(void){ 832 832 int fnid; /* Filename ID */ 833 833 int fid; /* File instance ID */ 834 834 int mid; /* Manifest where file was checked in */ 835 835 Blob treename; /* FILENAME translated to canonical form */ 836 836 char *zFilename; /* Cannonical filename */
Changes to src/diffcmd.c.
235 235 while( db_step(&q)==SQLITE_ROW ){ 236 236 const char *zPathname = db_column_text(&q,0); 237 237 int isDeleted = db_column_int(&q, 1); 238 238 int isChnged = db_column_int(&q,2); 239 239 int isNew = db_column_int(&q,3); 240 240 char *zFullName = mprintf("%s%s", g.zLocalRoot, zPathname); 241 241 if( isDeleted ){ 242 - printf("DELETED %s\n", zPathname); 242 + printf("DISMISSED %s\n", zPathname); 243 243 }else if( access(zFullName, 0) ){ 244 244 printf("MISSING %s\n", zPathname); 245 245 }else if( isNew ){ 246 246 printf("ADDED %s\n", zPathname); 247 247 }else if( isChnged==3 ){ 248 248 printf("ADDED_BY_MERGE %s\n", zPathname); 249 249 }else{ ................................................................................ 308 308 cmp = +1; 309 309 }else if( iTo>=mTo.nFile ){ 310 310 cmp = -1; 311 311 }else{ 312 312 cmp = strcmp(mFrom.aFile[iFrom].zName, mTo.aFile[iTo].zName); 313 313 } 314 314 if( cmp<0 ){ 315 - printf("DELETED %s\n", mFrom.aFile[iFrom].zName); 315 + printf("DISMISSED %s\n", mFrom.aFile[iFrom].zName); 316 316 iFrom++; 317 317 }else if( cmp>0 ){ 318 318 printf("ADDED %s\n", mTo.aFile[iTo].zName); 319 319 iTo++; 320 320 }else if( strcmp(mFrom.aFile[iFrom].zUuid, mTo.aFile[iTo].zUuid)==0 ){ 321 321 /* No changes */ 322 322 iFrom++;