Fossil SCM

less threatening desc. for removing an artifact from repo

bharder 2010-09-17 06:02 lang
Commit 6938d5fe8057fc33f00f3455573c20640e0e1700
Parent 6e258c4ae35f3ac…
3 files changed +2 -2 +3 -3 +2 -4
~ src/add.c ~ src/checkin.c ~ src/diffcmd.c
M src/add.c
+2 -2
--- src/add.c
+++ src/add.c
@@ -214,11 +214,11 @@
214214
 "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zFilePath)
215215
 ){
216216
 printf("SKIPPED %s\n", zPath);
217217
 }else{
218218
 db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath);
219
- printf("DELETED %s\n", zPath);
219
+ printf("DISMISSED %s\n", zPath);
220220
 }
221221
 blob_reset(&pathname);
222222
 }
223223
 blob_resize(&path, origSize);
224224
 }
@@ -264,11 +264,11 @@
264264
 if( !db_exists(
265265
 "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){
266266
 fossil_fatal("not in the repository: %s", zName);
267267
 }else{
268268
 db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath);
269
- printf("DELETED %s\n", zPath);
269
+ printf("DISMISSED %s\n", zPath);
270270
 }
271271
 blob_reset(&pathname);
272272
 }
273273
 free(zName);
274274
 }
275275
--- src/add.c
+++ src/add.c
@@ -214,11 +214,11 @@
214 "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zFilePath)
215 ){
216 printf("SKIPPED %s\n", zPath);
217 }else{
218 db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath);
219 printf("DELETED %s\n", zPath);
220 }
221 blob_reset(&pathname);
222 }
223 blob_resize(&path, origSize);
224 }
@@ -264,11 +264,11 @@
264 if( !db_exists(
265 "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){
266 fossil_fatal("not in the repository: %s", zName);
267 }else{
268 db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath);
269 printf("DELETED %s\n", zPath);
270 }
271 blob_reset(&pathname);
272 }
273 free(zName);
274 }
275
--- src/add.c
+++ src/add.c
@@ -214,11 +214,11 @@
214 "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zFilePath)
215 ){
216 printf("SKIPPED %s\n", zPath);
217 }else{
218 db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath);
219 printf("DISMISSED %s\n", zPath);
220 }
221 blob_reset(&pathname);
222 }
223 blob_resize(&path, origSize);
224 }
@@ -264,11 +264,11 @@
264 if( !db_exists(
265 "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){
266 fossil_fatal("not in the repository: %s", zName);
267 }else{
268 db_multi_exec("UPDATE vfile SET deleted=1 WHERE pathname=%Q", zPath);
269 printf("DISMISSED %s\n", zPath);
270 }
271 blob_reset(&pathname);
272 }
273 free(zName);
274 }
275
M src/checkin.c
+3 -3
--- src/checkin.c
+++ src/checkin.c
@@ -52,11 +52,11 @@
5252
 int isNew = db_column_int(&q,3)==0;
5353
 int isRenamed = db_column_int(&q,4);
5454
 char *zFullName = mprintf("%s/%s", g.zLocalRoot, zPathname);
5555
 blob_append(report, zPrefix, nPrefix);
5656
 if( isDeleted ){
57
- blob_appendf(report, "DELETED %s\n", zPathname);
57
+ blob_appendf(report, "DISMISSED %s\n", zPathname);
5858
 }else if( !file_isfile(zFullName) ){
5959
 if( access(zFullName, 0)==0 ){
6060
 blob_appendf(report, "NOT_A_FILE %s\n", zPathname);
6161
 if( missingIsFatal ){
6262
 fossil_warning("not a file: %s", zPathname);
@@ -70,11 +70,11 @@
7070
 }
7171
 }
7272
 }else if( isNew ){
7373
 blob_appendf(report, "ADDED %s\n", zPathname);
7474
 }else if( isDeleted ){
75
- blob_appendf(report, "DELETED %s\n", zPathname);
75
+ blob_appendf(report, "DISMISSED %s\n", zPathname);
7676
 }else if( isChnged==2 ){
7777
 blob_appendf(report, "UPDATED_BY_MERGE %s\n", zPathname);
7878
 }else if( isChnged==3 ){
7979
 blob_appendf(report, "ADDED_BY_MERGE %s\n", zPathname);
8080
 }else if( isChnged==1 ){
@@ -175,11 +175,11 @@
175175
 printf("NOT_A_FILE %s\n", zPathname);
176176
 }else{
177177
 printf("MISSING %s\n", zPathname);
178178
 }
179179
 }else if( isDeleted ){
180
- printf("DELETED %s\n", zPathname);
180
+ printf("DISMISSED %s\n", zPathname);
181181
 }else if( chnged ){
182182
 printf("EDITED %s\n", zPathname);
183183
 }else if( renamed ){
184184
 printf("RENAMED %s\n", zPathname);
185185
 }else{
186186
--- src/checkin.c
+++ src/checkin.c
@@ -52,11 +52,11 @@
52 int isNew = db_column_int(&q,3)==0;
53 int isRenamed = db_column_int(&q,4);
54 char *zFullName = mprintf("%s/%s", g.zLocalRoot, zPathname);
55 blob_append(report, zPrefix, nPrefix);
56 if( isDeleted ){
57 blob_appendf(report, "DELETED %s\n", zPathname);
58 }else if( !file_isfile(zFullName) ){
59 if( access(zFullName, 0)==0 ){
60 blob_appendf(report, "NOT_A_FILE %s\n", zPathname);
61 if( missingIsFatal ){
62 fossil_warning("not a file: %s", zPathname);
@@ -70,11 +70,11 @@
70 }
71 }
72 }else if( isNew ){
73 blob_appendf(report, "ADDED %s\n", zPathname);
74 }else if( isDeleted ){
75 blob_appendf(report, "DELETED %s\n", zPathname);
76 }else if( isChnged==2 ){
77 blob_appendf(report, "UPDATED_BY_MERGE %s\n", zPathname);
78 }else if( isChnged==3 ){
79 blob_appendf(report, "ADDED_BY_MERGE %s\n", zPathname);
80 }else if( isChnged==1 ){
@@ -175,11 +175,11 @@
175 printf("NOT_A_FILE %s\n", zPathname);
176 }else{
177 printf("MISSING %s\n", zPathname);
178 }
179 }else if( isDeleted ){
180 printf("DELETED %s\n", zPathname);
181 }else if( chnged ){
182 printf("EDITED %s\n", zPathname);
183 }else if( renamed ){
184 printf("RENAMED %s\n", zPathname);
185 }else{
186
--- src/checkin.c
+++ src/checkin.c
@@ -52,11 +52,11 @@
52 int isNew = db_column_int(&q,3)==0;
53 int isRenamed = db_column_int(&q,4);
54 char *zFullName = mprintf("%s/%s", g.zLocalRoot, zPathname);
55 blob_append(report, zPrefix, nPrefix);
56 if( isDeleted ){
57 blob_appendf(report, "DISMISSED %s\n", zPathname);
58 }else if( !file_isfile(zFullName) ){
59 if( access(zFullName, 0)==0 ){
60 blob_appendf(report, "NOT_A_FILE %s\n", zPathname);
61 if( missingIsFatal ){
62 fossil_warning("not a file: %s", zPathname);
@@ -70,11 +70,11 @@
70 }
71 }
72 }else if( isNew ){
73 blob_appendf(report, "ADDED %s\n", zPathname);
74 }else if( isDeleted ){
75 blob_appendf(report, "DISMISSED %s\n", zPathname);
76 }else if( isChnged==2 ){
77 blob_appendf(report, "UPDATED_BY_MERGE %s\n", zPathname);
78 }else if( isChnged==3 ){
79 blob_appendf(report, "ADDED_BY_MERGE %s\n", zPathname);
80 }else if( isChnged==1 ){
@@ -175,11 +175,11 @@
175 printf("NOT_A_FILE %s\n", zPathname);
176 }else{
177 printf("MISSING %s\n", zPathname);
178 }
179 }else if( isDeleted ){
180 printf("DISMISSED %s\n", zPathname);
181 }else if( chnged ){
182 printf("EDITED %s\n", zPathname);
183 }else if( renamed ){
184 printf("RENAMED %s\n", zPathname);
185 }else{
186
M src/diffcmd.c
+2 -4
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -237,17 +237,15 @@
237237
 int isDeleted = db_column_int(&q, 1);
238238
 int isChnged = db_column_int(&q,2);
239239
 int isNew = db_column_int(&q,3);
240240
 char *zFullName = mprintf("%s%s", g.zLocalRoot, zPathname);
241241
 if( isDeleted ){
242
- printf("DELETED %s\n", zPathname);
242
+ printf("DISMISSED %s\n", zPathname);
243243
 }else if( access(zFullName, 0) ){
244244
 printf("MISSING %s\n", zPathname);
245245
 }else if( isNew ){
246246
 printf("ADDED %s\n", zPathname);
247
- }else if( isDeleted ){
248
- printf("DELETED %s\n", zPathname);
249247
 }else if( isChnged==3 ){
250248
 printf("ADDED_BY_MERGE %s\n", zPathname);
251249
 }else{
252250
 int srcid = db_column_int(&q, 4);
253251
 Blob content;
@@ -312,11 +310,11 @@
312310
 cmp = -1;
313311
 }else{
314312
 cmp = strcmp(mFrom.aFile[iFrom].zName, mTo.aFile[iTo].zName);
315313
 }
316314
 if( cmp<0 ){
317
- printf("DELETED %s\n", mFrom.aFile[iFrom].zName);
315
+ printf("DISMISSED %s\n", mFrom.aFile[iFrom].zName);
318316
 iFrom++;
319317
 }else if( cmp>0 ){
320318
 printf("ADDED %s\n", mTo.aFile[iTo].zName);
321319
 iTo++;
322320
 }else if( strcmp(mFrom.aFile[iFrom].zUuid, mTo.aFile[iTo].zUuid)==0 ){
323321
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -237,17 +237,15 @@
237 int isDeleted = db_column_int(&q, 1);
238 int isChnged = db_column_int(&q,2);
239 int isNew = db_column_int(&q,3);
240 char *zFullName = mprintf("%s%s", g.zLocalRoot, zPathname);
241 if( isDeleted ){
242 printf("DELETED %s\n", zPathname);
243 }else if( access(zFullName, 0) ){
244 printf("MISSING %s\n", zPathname);
245 }else if( isNew ){
246 printf("ADDED %s\n", zPathname);
247 }else if( isDeleted ){
248 printf("DELETED %s\n", zPathname);
249 }else if( isChnged==3 ){
250 printf("ADDED_BY_MERGE %s\n", zPathname);
251 }else{
252 int srcid = db_column_int(&q, 4);
253 Blob content;
@@ -312,11 +310,11 @@
312 cmp = -1;
313 }else{
314 cmp = strcmp(mFrom.aFile[iFrom].zName, mTo.aFile[iTo].zName);
315 }
316 if( cmp<0 ){
317 printf("DELETED %s\n", mFrom.aFile[iFrom].zName);
318 iFrom++;
319 }else if( cmp>0 ){
320 printf("ADDED %s\n", mTo.aFile[iTo].zName);
321 iTo++;
322 }else if( strcmp(mFrom.aFile[iFrom].zUuid, mTo.aFile[iTo].zUuid)==0 ){
323
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -237,17 +237,15 @@
237 int isDeleted = db_column_int(&q, 1);
238 int isChnged = db_column_int(&q,2);
239 int isNew = db_column_int(&q,3);
240 char *zFullName = mprintf("%s%s", g.zLocalRoot, zPathname);
241 if( isDeleted ){
242 printf("DISMISSED %s\n", zPathname);
243 }else if( access(zFullName, 0) ){
244 printf("MISSING %s\n", zPathname);
245 }else if( isNew ){
246 printf("ADDED %s\n", zPathname);
 
 
247 }else if( isChnged==3 ){
248 printf("ADDED_BY_MERGE %s\n", zPathname);
249 }else{
250 int srcid = db_column_int(&q, 4);
251 Blob content;
@@ -312,11 +310,11 @@
310 cmp = -1;
311 }else{
312 cmp = strcmp(mFrom.aFile[iFrom].zName, mTo.aFile[iTo].zName);
313 }
314 if( cmp<0 ){
315 printf("DISMISSED %s\n", mFrom.aFile[iFrom].zName);
316 iFrom++;
317 }else if( cmp>0 ){
318 printf("ADDED %s\n", mTo.aFile[iTo].zName);
319 iTo++;
320 }else if( strcmp(mFrom.aFile[iFrom].zUuid, mTo.aFile[iTo].zUuid)==0 ){
321

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button