Fossil SCM
Fix for ticket [e5999e25eedeb]. Code style fix.
Commit
4a296c0b1ca85a30fa1acfbb8bb1a7691c78503c
Parent
5f0899bba6ef6cc…
1 file changed
+8
-4
+8
-4
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -334,13 +334,17 @@ | ||
| 334 | 334 | @ for %h(zName)</p> |
| 335 | 335 | }else{ |
| 336 | 336 | @ <p>Changes to %h(zName)</p> |
| 337 | 337 | } |
| 338 | 338 | if( showDiff ){ |
| 339 | - @ <blockquote><pre> | |
| 340 | - append_diff(zOld, zNew); | |
| 341 | - @ </pre></blockquote> | |
| 339 | + if( sideBySide ){ | |
| 340 | + generate_sbsdiff(zOld, zNew); | |
| 341 | + }else{ | |
| 342 | + @ <blockquote><pre> | |
| 343 | + append_diff(zOld, zNew); | |
| 344 | + @ </pre></blockquote> | |
| 345 | + } | |
| 342 | 346 | } |
| 343 | 347 | }else{ |
| 344 | 348 | if( zOld && zNew ){ |
| 345 | 349 | if( fossil_strcmp(zOld, zNew)!=0 ){ |
| 346 | 350 | @ <p>Modified <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| @@ -361,11 +365,11 @@ | ||
| 361 | 365 | @ <p>Added <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| 362 | 366 | @ version <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)]</a> |
| 363 | 367 | } |
| 364 | 368 | if( showDiff ){ |
| 365 | 369 | if( sideBySide ){ |
| 366 | - generate_sbsdiff(zOld, zNew); | |
| 370 | + generate_sbsdiff(zOld, zNew); | |
| 367 | 371 | }else{ |
| 368 | 372 | @ <blockquote><pre> |
| 369 | 373 | append_diff(zOld, zNew); |
| 370 | 374 | @ </pre></blockquote> |
| 371 | 375 | } |
| 372 | 376 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -334,13 +334,17 @@ | |
| 334 | @ for %h(zName)</p> |
| 335 | }else{ |
| 336 | @ <p>Changes to %h(zName)</p> |
| 337 | } |
| 338 | if( showDiff ){ |
| 339 | @ <blockquote><pre> |
| 340 | append_diff(zOld, zNew); |
| 341 | @ </pre></blockquote> |
| 342 | } |
| 343 | }else{ |
| 344 | if( zOld && zNew ){ |
| 345 | if( fossil_strcmp(zOld, zNew)!=0 ){ |
| 346 | @ <p>Modified <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| @@ -361,11 +365,11 @@ | |
| 361 | @ <p>Added <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| 362 | @ version <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)]</a> |
| 363 | } |
| 364 | if( showDiff ){ |
| 365 | if( sideBySide ){ |
| 366 | generate_sbsdiff(zOld, zNew); |
| 367 | }else{ |
| 368 | @ <blockquote><pre> |
| 369 | append_diff(zOld, zNew); |
| 370 | @ </pre></blockquote> |
| 371 | } |
| 372 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -334,13 +334,17 @@ | |
| 334 | @ for %h(zName)</p> |
| 335 | }else{ |
| 336 | @ <p>Changes to %h(zName)</p> |
| 337 | } |
| 338 | if( showDiff ){ |
| 339 | if( sideBySide ){ |
| 340 | generate_sbsdiff(zOld, zNew); |
| 341 | }else{ |
| 342 | @ <blockquote><pre> |
| 343 | append_diff(zOld, zNew); |
| 344 | @ </pre></blockquote> |
| 345 | } |
| 346 | } |
| 347 | }else{ |
| 348 | if( zOld && zNew ){ |
| 349 | if( fossil_strcmp(zOld, zNew)!=0 ){ |
| 350 | @ <p>Modified <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| @@ -361,11 +365,11 @@ | |
| 365 | @ <p>Added <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| 366 | @ version <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)]</a> |
| 367 | } |
| 368 | if( showDiff ){ |
| 369 | if( sideBySide ){ |
| 370 | generate_sbsdiff(zOld, zNew); |
| 371 | }else{ |
| 372 | @ <blockquote><pre> |
| 373 | append_diff(zOld, zNew); |
| 374 | @ </pre></blockquote> |
| 375 | } |
| 376 |