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.
D 2010-01-15T09:30:28
J +comment \n\n<hr><i>altufaltu\sadded\son\s2010-01-15\s09:30:28:</i><br>\nHere\sis\sthe\spatch,\sif\ssomebody\sis\sinterested:\r\n<verbatim>\r\n---\ssrc/diffcmd.c\r\n+++\ssrc/diffcmd.c\r\n@@\s-267,13\s+267,14\s@@\r\n\s\s\s\s\s\s\sprintf("ADDED_BY_MERGE\s%s\\n",\szPathname);\r\n\s\s\s\s\s}else{\r\n\s\s\s\s\s\s\sint\ssrcid\s=\sdb_column_int(&q,\s4);\r\n\s\s\s\s\s\s\sBlob\scontent;\r\n\s\s\s\s\s\s\scontent_get(srcid,\s&content);\r\n-\s\s\s\s\s\sprintf("Index:\s%s\\n======================================="\r\n-\s\s\s\s\s\s\s\s\s\s\s\s\s"============================\\n",\r\n-\s\s\s\s\s\s\s\s\s\s\s\s\szPathname\r\n+\s\s\s\s\s\sif\s(!zDiffCmd)\r\n+\s\s\s\s\s\s\s\sprintf("Index:\s%s\\n======================================="\r\n+\s\s\s\s\s\s\s\s\s\s\s\s\s\s\s"============================\\n",\r\n+\s\s\s\s\s\s\s\s\s\s\s\s\s\s\szPathname\r\n\s\s\s\s\s\s\s);\r\n\s\s\s\s\s\s\sdiff_file(&content,\szFullName,\szPathname,\szDiffCmd);\r\n\s\s\s\s\s\s\sblob_reset(&content);\r\n\s\s\s\s\s}\r\n\s\s\s\s\sfree(zFullName);\r\n@@\s-353,11\s+354,11\s@@\r\n\s\s\szTo\s=\sfind_option("to",\s0,\s1);\r\n\r\n\s\s\sif(\szTo==0\s){\r\n\s\s\s\s\sdb_must_be_within_tree();\r\n\s\s\s\s\sverify_all_options();\r\n-\s\s\s\sif(\s!isInternDiff\s&&\sg.argc==3\s){\r\n+\s\s\s\sif(\s!isInternDiff\s){\r\n\s\s\s\s\s\s\szDiffCmd\s=\sdb_get(isGDiff\s?\s"gdiff-command"\s:\s"diff-command",\s0);\r\n\s\s\s\s\s}\r\n\s\s\s\s\sif(\sg.argc==3\s){\r\n\s\s\s\s\s\s\sdiff_one_against_disk(zFrom,\szDiffCmd);\r\n\s\s\s\s\s}else{\r\n</verbatim>
K 1457156b277688cf495142a8211a0c93eeda558c
U altufaltu
Z f1ab613ce74310295e90ae0af071d9aa