Artifact
e69e7a37e38c5d554b158eb73969bc8ca57294e0:
Ticket change
[e69e7a37e3]
- Ticket [1457156b27]
"fossil gdiff" uses internal diff under some conditions status still Open with 1 other change
by
altufaltu
2010-01-15 09:30:28.
0000: 44 20 32 30 31 30 2d 30 31 2d 31 35 54 30 39 3a D 2010-01-15T09:
0010: 33 30 3a 32 38 0a 4a 20 2b 63 6f 6d 6d 65 6e 74 30:28.J +comment
0020: 20 5c 6e 5c 6e 3c 68 72 3e 3c 69 3e 61 6c 74 75 \n\n<hr><i>altu
0030: 66 61 6c 74 75 5c 73 61 64 64 65 64 5c 73 6f 6e faltu\sadded\son
0040: 5c 73 32 30 31 30 2d 30 31 2d 31 35 5c 73 30 39 \s2010-01-15\s09
0050: 3a 33 30 3a 32 38 3a 3c 2f 69 3e 3c 62 72 3e 5c :30:28:</i><br>\
0060: 6e 48 65 72 65 5c 73 69 73 5c 73 74 68 65 5c 73 nHere\sis\sthe\s
0070: 70 61 74 63 68 2c 5c 73 69 66 5c 73 73 6f 6d 65 patch,\sif\ssome
0080: 62 6f 64 79 5c 73 69 73 5c 73 69 6e 74 65 72 65 body\sis\sintere
0090: 73 74 65 64 3a 5c 72 5c 6e 3c 76 65 72 62 61 74 sted:\r\n<verbat
00a0: 69 6d 3e 5c 72 5c 6e 2d 2d 2d 5c 73 73 72 63 2f im>\r\n---\ssrc/
00b0: 64 69 66 66 63 6d 64 2e 63 5c 72 5c 6e 2b 2b 2b diffcmd.c\r\n+++
00c0: 5c 73 73 72 63 2f 64 69 66 66 63 6d 64 2e 63 5c \ssrc/diffcmd.c\
00d0: 72 5c 6e 40 40 5c 73 2d 32 36 37 2c 31 33 5c 73 r\n@@\s-267,13\s
00e0: 2b 32 36 37 2c 31 34 5c 73 40 40 5c 72 5c 6e 5c +267,14\s@@\r\n\
00f0: 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 70 72 69 s\s\s\s\s\s\spri
0100: 6e 74 66 28 22 41 44 44 45 44 5f 42 59 5f 4d 45 ntf("ADDED_BY_ME
0110: 52 47 45 5c 73 25 73 5c 5c 6e 22 2c 5c 73 7a 50 RGE\s%s\\n",\szP
0120: 61 74 68 6e 61 6d 65 29 3b 5c 72 5c 6e 5c 73 5c athname);\r\n\s\
0130: 73 5c 73 5c 73 5c 73 7d 65 6c 73 65 7b 5c 72 5c s\s\s\s}else{\r\
0140: 6e 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 69 n\s\s\s\s\s\s\si
0150: 6e 74 5c 73 73 72 63 69 64 5c 73 3d 5c 73 64 62 nt\ssrcid\s=\sdb
0160: 5f 63 6f 6c 75 6d 6e 5f 69 6e 74 28 26 71 2c 5c _column_int(&q,\
0170: 73 34 29 3b 5c 72 5c 6e 5c 73 5c 73 5c 73 5c 73 s4);\r\n\s\s\s\s
0180: 5c 73 5c 73 5c 73 42 6c 6f 62 5c 73 63 6f 6e 74 \s\s\sBlob\scont
0190: 65 6e 74 3b 5c 72 5c 6e 5c 73 5c 73 5c 73 5c 73 ent;\r\n\s\s\s\s
01a0: 5c 73 5c 73 5c 73 63 6f 6e 74 65 6e 74 5f 67 65 \s\s\scontent_ge
01b0: 74 28 73 72 63 69 64 2c 5c 73 26 63 6f 6e 74 65 t(srcid,\s&conte
01c0: 6e 74 29 3b 5c 72 5c 6e 2d 5c 73 5c 73 5c 73 5c nt);\r\n-\s\s\s\
01d0: 73 5c 73 5c 73 70 72 69 6e 74 66 28 22 49 6e 64 s\s\sprintf("Ind
01e0: 65 78 3a 5c 73 25 73 5c 5c 6e 3d 3d 3d 3d 3d 3d ex:\s%s\\n======
01f0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0200: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0210: 3d 22 5c 72 5c 6e 2d 5c 73 5c 73 5c 73 5c 73 5c ="\r\n-\s\s\s\s\
0220: 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c s\s\s\s\s\s\s\s\
0230: 73 22 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d s"==============
0240: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 5c 5c ==============\\
0250: 6e 22 2c 5c 72 5c 6e 2d 5c 73 5c 73 5c 73 5c 73 n",\r\n-\s\s\s\s
0260: 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 \s\s\s\s\s\s\s\s
0270: 5c 73 7a 50 61 74 68 6e 61 6d 65 5c 72 5c 6e 2b \szPathname\r\n+
0280: 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 69 66 5c 73 \s\s\s\s\s\sif\s
0290: 28 21 7a 44 69 66 66 43 6d 64 29 5c 72 5c 6e 2b (!zDiffCmd)\r\n+
02a0: 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 \s\s\s\s\s\s\s\s
02b0: 70 72 69 6e 74 66 28 22 49 6e 64 65 78 3a 5c 73 printf("Index:\s
02c0: 25 73 5c 5c 6e 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d %s\\n===========
02d0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
02e0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 22 5c 72 5c ============"\r\
02f0: 6e 2b 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 n+\s\s\s\s\s\s\s
0300: 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 \s\s\s\s\s\s\s\s
0310: 22 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d "===============
0320: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 5c 5c 6e =============\\n
0330: 22 2c 5c 72 5c 6e 2b 5c 73 5c 73 5c 73 5c 73 5c ",\r\n+\s\s\s\s\
0340: 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c s\s\s\s\s\s\s\s\
0350: 73 5c 73 5c 73 7a 50 61 74 68 6e 61 6d 65 5c 72 s\s\szPathname\r
0360: 5c 6e 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 \n\s\s\s\s\s\s\s
0370: 29 3b 5c 72 5c 6e 5c 73 5c 73 5c 73 5c 73 5c 73 );\r\n\s\s\s\s\s
0380: 5c 73 5c 73 64 69 66 66 5f 66 69 6c 65 28 26 63 \s\sdiff_file(&c
0390: 6f 6e 74 65 6e 74 2c 5c 73 7a 46 75 6c 6c 4e 61 ontent,\szFullNa
03a0: 6d 65 2c 5c 73 7a 50 61 74 68 6e 61 6d 65 2c 5c me,\szPathname,\
03b0: 73 7a 44 69 66 66 43 6d 64 29 3b 5c 72 5c 6e 5c szDiffCmd);\r\n\
03c0: 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 62 6c 6f s\s\s\s\s\s\sblo
03d0: 62 5f 72 65 73 65 74 28 26 63 6f 6e 74 65 6e 74 b_reset(&content
03e0: 29 3b 5c 72 5c 6e 5c 73 5c 73 5c 73 5c 73 5c 73 );\r\n\s\s\s\s\s
03f0: 7d 5c 72 5c 6e 5c 73 5c 73 5c 73 5c 73 5c 73 66 }\r\n\s\s\s\s\sf
0400: 72 65 65 28 7a 46 75 6c 6c 4e 61 6d 65 29 3b 5c ree(zFullName);\
0410: 72 5c 6e 40 40 5c 73 2d 33 35 33 2c 31 31 5c 73 r\n@@\s-353,11\s
0420: 2b 33 35 34 2c 31 31 5c 73 40 40 5c 72 5c 6e 5c +354,11\s@@\r\n\
0430: 73 5c 73 5c 73 7a 54 6f 5c 73 3d 5c 73 66 69 6e s\s\szTo\s=\sfin
0440: 64 5f 6f 70 74 69 6f 6e 28 22 74 6f 22 2c 5c 73 d_option("to",\s
0450: 30 2c 5c 73 31 29 3b 5c 72 5c 6e 5c 72 5c 6e 5c 0,\s1);\r\n\r\n\
0460: 73 5c 73 5c 73 69 66 28 5c 73 7a 54 6f 3d 3d 30 s\s\sif(\szTo==0
0470: 5c 73 29 7b 5c 72 5c 6e 5c 73 5c 73 5c 73 5c 73 \s){\r\n\s\s\s\s
0480: 5c 73 64 62 5f 6d 75 73 74 5f 62 65 5f 77 69 74 \sdb_must_be_wit
0490: 68 69 6e 5f 74 72 65 65 28 29 3b 5c 72 5c 6e 5c hin_tree();\r\n\
04a0: 73 5c 73 5c 73 5c 73 5c 73 76 65 72 69 66 79 5f s\s\s\s\sverify_
04b0: 61 6c 6c 5f 6f 70 74 69 6f 6e 73 28 29 3b 5c 72 all_options();\r
04c0: 5c 6e 2d 5c 73 5c 73 5c 73 5c 73 69 66 28 5c 73 \n-\s\s\s\sif(\s
04d0: 21 69 73 49 6e 74 65 72 6e 44 69 66 66 5c 73 26 !isInternDiff\s&
04e0: 26 5c 73 67 2e 61 72 67 63 3d 3d 33 5c 73 29 7b &\sg.argc==3\s){
04f0: 5c 72 5c 6e 2b 5c 73 5c 73 5c 73 5c 73 69 66 28 \r\n+\s\s\s\sif(
0500: 5c 73 21 69 73 49 6e 74 65 72 6e 44 69 66 66 5c \s!isInternDiff\
0510: 73 29 7b 5c 72 5c 6e 5c 73 5c 73 5c 73 5c 73 5c s){\r\n\s\s\s\s\
0520: 73 5c 73 5c 73 7a 44 69 66 66 43 6d 64 5c 73 3d s\s\szDiffCmd\s=
0530: 5c 73 64 62 5f 67 65 74 28 69 73 47 44 69 66 66 \sdb_get(isGDiff
0540: 5c 73 3f 5c 73 22 67 64 69 66 66 2d 63 6f 6d 6d \s?\s"gdiff-comm
0550: 61 6e 64 22 5c 73 3a 5c 73 22 64 69 66 66 2d 63 and"\s:\s"diff-c
0560: 6f 6d 6d 61 6e 64 22 2c 5c 73 30 29 3b 5c 72 5c ommand",\s0);\r\
0570: 6e 5c 73 5c 73 5c 73 5c 73 5c 73 7d 5c 72 5c 6e n\s\s\s\s\s}\r\n
0580: 5c 73 5c 73 5c 73 5c 73 5c 73 69 66 28 5c 73 67 \s\s\s\s\sif(\sg
0590: 2e 61 72 67 63 3d 3d 33 5c 73 29 7b 5c 72 5c 6e .argc==3\s){\r\n
05a0: 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 5c 73 64 69 \s\s\s\s\s\s\sdi
05b0: 66 66 5f 6f 6e 65 5f 61 67 61 69 6e 73 74 5f 64 ff_one_against_d
05c0: 69 73 6b 28 7a 46 72 6f 6d 2c 5c 73 7a 44 69 66 isk(zFrom,\szDif
05d0: 66 43 6d 64 29 3b 5c 72 5c 6e 5c 73 5c 73 5c 73 fCmd);\r\n\s\s\s
05e0: 5c 73 5c 73 7d 65 6c 73 65 7b 5c 72 5c 6e 3c 2f \s\s}else{\r\n</
05f0: 76 65 72 62 61 74 69 6d 3e 0a 4b 20 31 34 35 37 verbatim>.K 1457
0600: 31 35 36 62 32 37 37 36 38 38 63 66 34 39 35 31 156b277688cf4951
0610: 34 32 61 38 32 31 31 61 30 63 39 33 65 65 64 61 42a8211a0c93eeda
0620: 35 35 38 63 0a 55 20 61 6c 74 75 66 61 6c 74 75 558c.U altufaltu
0630: 0a 5a 20 66 31 61 62 36 31 33 63 65 37 34 33 31 .Z f1ab613ce7431
0640: 30 32 39 35 65 39 30 61 65 30 61 66 30 37 31 64 0295e90ae0af071d
0650: 39 61 61 0a 9aa.