Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix reading delta from wrong column in stash. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | symlinks |
| Files: | files | file ages | folders |
| SHA1: |
0317a929cb7a40ac5230fd3cc1b418b0 |
| User & Date: | dmitry 2011-08-27 09:44:28 |
Context
|
2011-08-27
| ||
| 18:12 | Fix a C89 error specific to the symlinks branch and also pull in the C89 fix and the versionable settings fix from trunk. check-in: 4778edd3 user: drh tags: symlinks | |
| 09:44 | Fix reading delta from wrong column in stash. check-in: 0317a929 user: dmitry tags: symlinks | |
| 01:21 | Reverse the order of column/table existence checking to make validation of already updated local database faster. check-in: 8c0f4bc7 user: dmitry tags: symlinks | |
Changes
Changes to src/stash.c.
82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 ... 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 ... 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 ... 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 |
"INSERT INTO stashfile(stashid, rid, isAdded, isRemoved, isExec, isLink,"
"origname, newname, delta)"
"VALUES(%d,:rid,:isadd,:isrm,:isexe,:islink,:orig,:new,:content)",
stashid
);
while( db_step(&q)==SQLITE_ROW ){
int deleted = db_column_int(&q, 0);
//int isLink = db_column_int(&q, 2);
int rid = db_column_int(&q, 3);
const char *zName = db_column_text(&q, 4);
const char *zOrig = db_column_text(&q, 5);
char *zPath = mprintf("%s%s", g.zLocalRoot, zName);
Blob content;
int isNewLink = file_islink(zPath);
db_bind_int(&ins, ":rid", rid);
db_bind_int(&ins, ":isadd", rid==0);
db_bind_int(&ins, ":isrm", deleted);
db_bind_int(&ins, ":isexe", db_column_int(&q, 1));
//db_bind_int(&ins, ":islink", isLink); //TODO(dchest) what's that?
db_bind_text(&ins, ":orig", zOrig);
db_bind_text(&ins, ":new", zName);
if( rid==0 ){
/* A new file */
if( isNewLink ){
blob_read_link(&content, zPath);
................................................................................
const char *zNew = db_column_text(&q, 5);
char *zOPath = mprintf("%s%s", g.zLocalRoot, zOrig);
char *zNPath = mprintf("%s%s", g.zLocalRoot, zNew);
Blob delta;
undo_save(zNew);
blob_zero(&delta);
if( rid==0 ){
db_ephemeral_blob(&q, 5, &delta);
blob_write_to_file(&delta, zNPath);
file_setexe(zNPath, isExec);
fossil_print("ADD %s\n", zNew);
}else if( isRemoved ){
fossil_print("DELETE %s\n", zOrig);
file_delete(zOPath);
}else{
Blob a, b, out, disk;
int isNewLink = file_islink(zOPath);
db_ephemeral_blob(&q, 5, &delta);
if( isNewLink ){
blob_read_link(&disk, zOPath);
}else{
blob_read_from_file(&disk, zOPath);
}
content_get(rid, &a);
blob_delta_apply(&a, &delta, &b);
................................................................................
int isRemoved = db_column_int(&q, 1);
int isLink = db_column_int(&q, 3);
const char *zOrig = db_column_text(&q, 4);
const char *zNew = db_column_text(&q, 5);
char *zOPath = mprintf("%s%s", g.zLocalRoot, zOrig);
Blob delta;
if( rid==0 ){
db_ephemeral_blob(&q, 5, &delta);
fossil_print("ADDED %s\n", zNew);
diff_print_index(zNew);
diff_file_mem(&empty, &delta, zNew, zDiffCmd, 0);
}else if( isRemoved ){
fossil_print("DELETE %s\n", zOrig);
if( file_islink(zOPath) ){
blob_read_link(&delta, zOPath);
................................................................................
blob_read_from_file(&delta, zOPath);
}
diff_print_index(zNew);
diff_file_mem(&delta, &empty, zOrig, zDiffCmd, 0);
}else{
Blob a, b, disk;
int isOrigLink = file_islink(zOPath);
db_ephemeral_blob(&q, 5, &delta);
if( isOrigLink ){
blob_read_link(&disk, zOPath);
}else{
blob_read_from_file(&disk, zOPath);
}
fossil_print("CHANGED %s\n", zNew);
if( !isOrigLink != !isLink ){
|
< | | | | | |
82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 ... 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 ... 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 ... 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 |
"INSERT INTO stashfile(stashid, rid, isAdded, isRemoved, isExec, isLink,"
"origname, newname, delta)"
"VALUES(%d,:rid,:isadd,:isrm,:isexe,:islink,:orig,:new,:content)",
stashid
);
while( db_step(&q)==SQLITE_ROW ){
int deleted = db_column_int(&q, 0);
int rid = db_column_int(&q, 3);
const char *zName = db_column_text(&q, 4);
const char *zOrig = db_column_text(&q, 5);
char *zPath = mprintf("%s%s", g.zLocalRoot, zName);
Blob content;
int isNewLink = file_islink(zPath);
db_bind_int(&ins, ":rid", rid);
db_bind_int(&ins, ":isadd", rid==0);
db_bind_int(&ins, ":isrm", deleted);
db_bind_int(&ins, ":isexe", db_column_int(&q, 1));
db_bind_int(&ins, ":islink", db_column_int(&q, 2));
db_bind_text(&ins, ":orig", zOrig);
db_bind_text(&ins, ":new", zName);
if( rid==0 ){
/* A new file */
if( isNewLink ){
blob_read_link(&content, zPath);
................................................................................
const char *zNew = db_column_text(&q, 5);
char *zOPath = mprintf("%s%s", g.zLocalRoot, zOrig);
char *zNPath = mprintf("%s%s", g.zLocalRoot, zNew);
Blob delta;
undo_save(zNew);
blob_zero(&delta);
if( rid==0 ){
db_ephemeral_blob(&q, 6, &delta);
blob_write_to_file(&delta, zNPath);
file_setexe(zNPath, isExec);
fossil_print("ADD %s\n", zNew);
}else if( isRemoved ){
fossil_print("DELETE %s\n", zOrig);
file_delete(zOPath);
}else{
Blob a, b, out, disk;
int isNewLink = file_islink(zOPath);
db_ephemeral_blob(&q, 6, &delta);
if( isNewLink ){
blob_read_link(&disk, zOPath);
}else{
blob_read_from_file(&disk, zOPath);
}
content_get(rid, &a);
blob_delta_apply(&a, &delta, &b);
................................................................................
int isRemoved = db_column_int(&q, 1);
int isLink = db_column_int(&q, 3);
const char *zOrig = db_column_text(&q, 4);
const char *zNew = db_column_text(&q, 5);
char *zOPath = mprintf("%s%s", g.zLocalRoot, zOrig);
Blob delta;
if( rid==0 ){
db_ephemeral_blob(&q, 6, &delta);
fossil_print("ADDED %s\n", zNew);
diff_print_index(zNew);
diff_file_mem(&empty, &delta, zNew, zDiffCmd, 0);
}else if( isRemoved ){
fossil_print("DELETE %s\n", zOrig);
if( file_islink(zOPath) ){
blob_read_link(&delta, zOPath);
................................................................................
blob_read_from_file(&delta, zOPath);
}
diff_print_index(zNew);
diff_file_mem(&delta, &empty, zOrig, zDiffCmd, 0);
}else{
Blob a, b, disk;
int isOrigLink = file_islink(zOPath);
db_ephemeral_blob(&q, 6, &delta);
if( isOrigLink ){
blob_read_link(&disk, zOPath);
}else{
blob_read_from_file(&disk, zOPath);
}
fossil_print("CHANGED %s\n", zNew);
if( !isOrigLink != !isLink ){
|