Check-in [d327f12522]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
SHA1 Hash:d327f12522c7afd718c7b752ed5eb7d3d10f7249
Date: 2010-03-15 18:09:35
User: drh
Comment:Add the --binary option to the "merge" command and a new "binary-glob" setting. These identify files that should be treated as binary files and which should not be subjected to a 3-way merge.
Tags And Properties
Changes
hide diffs unified diffs patch

Changes to src/db.c

Old (62f60a50b626578f) New (661dae96053d4043)
1 /* 1 /*
2 ** Copyright (c) 2006 D. Richard Hipp 2 ** Copyright (c) 2006 D. Richard Hipp
3 ** 3 **
4 ** This program is free software; you can redistribute it and/or 4 ** This program is free software; you can redistribute it and/or
5 ** modify it under the terms of the GNU General Public 5 ** modify it under the terms of the GNU General Public
1433 hidden lines
1439 ** autosync If enabled, automatically pull prior to commit 1439 ** autosync If enabled, automatically pull prior to commit
1440 ** or update and automatically push after commit or 1440 ** or update and automatically push after commit or
1441 ** tag or branch creation. If the the value is "pullonly" 1441 ** tag or branch creation. If the the value is "pullonly"
1442 ** then only pull operations occur automatically. 1442 ** then only pull operations occur automatically.
1443 ** 1443 **
> 1444 ** binary-glob The VALUE is a comma-separated list of GLOB patterns
> 1445 ** that should be treated as binary files for merging
> 1446 ** purposes. Example: *.xml
> 1447 **
1444 ** clearsign When enabled, fossil will attempt to sign all commits 1448 ** clearsign When enabled, fossil will attempt to sign all commits
1445 ** with gpg. When disabled (the default), commits will 1449 ** with gpg. When disabled (the default), commits will
1446 ** be unsigned. 1450 ** be unsigned.
1447 ** 1451 **
1448 ** diff-command External command to run when performing a diff. 1452 ** diff-command External command to run when performing a diff.
37 hidden lines
1486 */ 1490 */
1487 void setting_cmd(void){ 1491 void setting_cmd(void){
1488 static const char *azName[] = { 1492 static const char *azName[] = {
1489 "auto-captcha", 1493 "auto-captcha",
1490 "autosync", 1494 "autosync",
> 1495 "binary-glob",
1491 "clearsign", 1496 "clearsign",
1492 "diff-command", 1497 "diff-command",
1493 "dont-push", 1498 "dont-push",
1494 "editor", 1499 "editor",
1495 "gdiff-command", 1500 "gdiff-command",
38 hidden lines
1534 } 1539 }
1535 }else{ 1540 }else{
1536 usage("?PROPERTY? ?VALUE?"); 1541 usage("?PROPERTY? ?VALUE?");
1537 } 1542 }
1538 } 1543 }

Changes to src/merge.c

Old (09d6fd3ca08a9fdd) New (b7d15ae3ad17eff8)
1 /* 1 /*
2 ** Copyright (c) 2007 D. Richard Hipp 2 ** Copyright (c) 2007 D. Richard Hipp
3 ** 3 **
4 ** This program is free software; you can redistribute it and/or 4 ** This program is free software; you can redistribute it and/or
5 ** modify it under the terms of the GNU General Public 5 ** modify it under the terms of the GNU General Public
37 hidden lines
43 ** checkout rather than added. 43 ** checkout rather than added.
44 ** 44 **
45 ** Only file content is merged. The result continues to use the 45 ** Only file content is merged. The result continues to use the
46 ** file and directory names from the current checkout even if those 46 ** file and directory names from the current checkout even if those
47 ** names might have been changed in the branch being merged in. 47 ** names might have been changed in the branch being merged in.
> 48 **
> 49 ** Other options:
> 50 **
> 51 ** --detail Show additional details of the merge
> 52 **
> 53 ** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
> 54 ** and do not try to merge parallel changes. This
> 55 ** option overrides the "binary-glob" setting.
48 */ 56 */
49 void merge_cmd(void){ 57 void merge_cmd(void){
50 int vid; /* Current version */ 58 int vid; /* Current version */
51 int mid; /* Version we are merging against */ 59 int mid; /* Version we are merging against */
52 int pid; /* The pivot version - most recent common ancestor */ 60 int pid; /* The pivot version - most recent common ancestor */
53 int detailFlag; /* True if the --detail option is present */ 61 int detailFlag; /* True if the --detail option is present */
54 int pickFlag; /* True if the --cherrypick option is present */ 62 int pickFlag; /* True if the --cherrypick option is present */
55 int backoutFlag; /* True if the --backout optioni is present */ 63 int backoutFlag; /* True if the --backout optioni is present */
> 64 const char *zBinGlob; /* The value of --binary */
56 Stmt q; 65 Stmt q;
57 66
58 detailFlag = find_option("detail",0,0)!=0; 67 detailFlag = find_option("detail",0,0)!=0;
59 pickFlag = find_option("cherrypick",0,0)!=0; 68 pickFlag = find_option("cherrypick",0,0)!=0;
60 backoutFlag = find_option("backout",0,0)!=0; 69 backoutFlag = find_option("backout",0,0)!=0;
> 70 zBinGlob = find_option("binary",0,1);
61 if( g.argc!=3 ){ 71 if( g.argc!=3 ){
62 usage("VERSION"); 72 usage("VERSION");
63 } 73 }
64 db_must_be_within_tree(); 74 db_must_be_within_tree();
> 75 if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0);
65 vid = db_lget_int("checkout", 0); 76 vid = db_lget_int("checkout", 0);
66 if( vid==0 ){ 77 if( vid==0 ){
67 fossil_fatal("nothing is checked out"); 78 fossil_fatal("nothing is checked out");
68 } 79 }
69 mid = name_to_rid(g.argv[2]); 80 mid = name_to_rid(g.argv[2]);
168 hidden lines
238 249
239 /* 250 /*
240 ** Do a three-way merge on files that have changes pid->mid and pid->vid 251 ** Do a three-way merge on files that have changes pid->mid and pid->vid
241 */ 252 */
242 db_prepare(&q, 253 db_prepare(&q,
243 "SELECT ridm, idv, ridp, ridv FROM fv" | 254 "SELECT ridm, idv, ridp, ridv, %s FROM fv"
244 " WHERE idp>0 AND idv>0 AND idm>0" 255 " WHERE idp>0 AND idv>0 AND idm>0"
245 " AND ridm!=ridp AND (ridv!=ridp OR chnged)" | 256 " AND ridm!=ridp AND (ridv!=ridp OR chnged)",
| 257 glob_expr("fv.fn", zBinGlob)
246 ); 258 );
247 while( db_step(&q)==SQLITE_ROW ){ 259 while( db_step(&q)==SQLITE_ROW ){
248 int ridm = db_column_int(&q, 0); 260 int ridm = db_column_int(&q, 0);
249 int idv = db_column_int(&q, 1); 261 int idv = db_column_int(&q, 1);
250 int ridp = db_column_int(&q, 2); 262 int ridp = db_column_int(&q, 2);
251 int ridv = db_column_int(&q, 3); 263 int ridv = db_column_int(&q, 3);
> 264 int isBinary = db_column_int(&q, 4);
252 int rc; 265 int rc;
253 char *zName = db_text(0, "SELECT pathname FROM vfile WHERE id=%d", idv); 266 char *zName = db_text(0, "SELECT pathname FROM vfile WHERE id=%d", idv);
254 char *zFullPath; 267 char *zFullPath;
255 Blob m, p, v, r; 268 Blob m, p, v, r;
256 /* Do a 3-way merge of idp->idm into idp->idv. The results go into idv. */ 269 /* Do a 3-way merge of idp->idm into idp->idv. The results go into idv. */
6 hidden lines
263 zFullPath = mprintf("%s/%s", g.zLocalRoot, zName); 276 zFullPath = mprintf("%s/%s", g.zLocalRoot, zName);
264 content_get(ridp, &p); 277 content_get(ridp, &p);
265 content_get(ridm, &m); 278 content_get(ridm, &m);
266 blob_zero(&v); 279 blob_zero(&v);
267 blob_read_from_file(&v, zFullPath); 280 blob_read_from_file(&v, zFullPath);
268 rc = blob_merge(&p, &m, &v, &r); | 281 if( isBinary ){
| 282 rc = -1;
| 283 blob_zero(&r);
| 284 }else{
| 285 rc = blob_merge(&p, &m, &v, &r);
| 286 }
269 if( rc>=0 ){ 287 if( rc>=0 ){
270 blob_write_to_file(&r, zFullPath); 288 blob_write_to_file(&r, zFullPath);
271 if( rc>0 ){ 289 if( rc>0 ){
272 printf("***** %d merge conflicts in %s\n", rc, zName); 290 printf("***** %d merge conflicts in %s\n", rc, zName);
273 } 291 }
38 hidden lines
312 db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(0,%d)", mid); 330 db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(0,%d)", mid);
313 } 331 }
314 undo_finish(); 332 undo_finish();
315 db_end_transaction(0); 333 db_end_transaction(0);
316 } 334 }
Fossil version [c4ade43651] 2011-12-17 15:20:39