Fossil SCM

Distinguish local-changes from changes from a merge.

graham 2020-05-30 22:22 ui-local-diff
Commit db758a34544b47a5b209e06bfc68b5cdb6017ce8fac74612b3e347677a5edb20
Parent 1fd9acb97c6dc73…
1 file changed +27 -5
~ src/info.c
M src/info.c
+27 -5
--- src/info.c
+++ src/info.c
@@ -1,6 +1,7 @@
11
 /*TODO
2
+** o Have seen some "MERGE" entries and updated messages: still not 100% happy.
23
 ** o Should /file behave differently for non-existent local files?
34
 ** o Look at adding an "extras" option (non-added, non-ignored files).
45
 ** o Find a place to add links to /local.
56
 ** o Remove //TODO TESTING HACK TODO
67
 ** ?? In hexdump_page(), should content (and downloadName?) be reset/freed?
@@ -575,19 +576,30 @@
575576
 */
576577
 case 3:
577578
 @ Added %h(zName) due to a merge.
578579
 break;
579580
 case 5:
580
- @ Added %h(zName) due to an integration merge.
581
+ @ Added %h(zName) due to an integrate-merge.
581582
 break;
582583
 case 6: append_status( "gained", "executable", zName, zOld); break;
583584
 case 7: append_status( "gained", "symlink", zName, zOld); break;
584585
 case 8: append_status( "lost", "executable", zName, zOld); break;
585586
 case 9: append_status( "lost", "symlink", zName, zOld); break;
586587
587588
 default: /* Normal edit */
588
- @ Local changes of %h(zName).
589
+ switch( isChnged ){
590
+ case 1:
591
+ @ Local changes
592
+ break;
593
+ case 2:
594
+ @ Merge
595
+ break;
596
+ case 4:
597
+ @ Integrate-merge
598
+ break;
599
+ }
600
+ @ of %h(zName).
589601
 //TODO:Remove? showDiff = 1;
590602
 }
591603
 if( showDiff && diffFlags ){
592604
 append_diff(zOld, NULL, zName, diffFlags, pRe);
593605
 }
@@ -617,22 +629,32 @@
617629
 @ %z(href("%R/file/%T?ci=ckout&annot=added by merge",zName))%h(zName)
618630
 @ </a> to %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> due to merge.
619631
 break;
620632
 case 5: /* Added by an integration merge */
621633
 @ Added
622
- @ %z(href("%R/file/%T?ci=ckout&annot=added by integration merge",zName))
634
+ @ %z(href("%R/file/%T?ci=ckout&annot=added by integration-merge",zName))
623635
 @ %h(zName)</a> to
624636
 @ %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> due to integrate merge.
625637
 break;
626638
 case 6: append_status( "gained", "executable", zName, zOld); break;
627639
 case 7: append_status( "gained", "symlink", zName, zOld); break;
628640
 case 8: append_status( "lost", "executable", zName, zOld); break;
629641
 case 9: append_status( "lost", "symlink", zName, zOld); break;
630642
631643
 default: /* Normal edit */
632
- @ Local changes of
633
- @ %z(href("%R/finfo?name=%T&m=%!S",zName,zOld))%h(zName)</a>
644
+ switch( isChnged ){
645
+ case 1:
646
+ @ Local changes
647
+ break;
648
+ case 2:
649
+ @ Merge
650
+ break;
651
+ case 4:
652
+ @ Integrate-merge
653
+ break;
654
+ }
655
+ @ of %z(href("%R/finfo?name=%T&m=%!S",zName,zOld))%h(zName)</a>
634656
 @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> to
635657
 @ %z(href("%R/file/%T?ci=ckout&annot=edited locally",zName))
636658
 @ [local file]</a>
637659
 //TODO:Remove? showDiff = 1;
638660
 }
639661
--- src/info.c
+++ src/info.c
@@ -1,6 +1,7 @@
1 /*TODO
 
2 ** o Should /file behave differently for non-existent local files?
3 ** o Look at adding an "extras" option (non-added, non-ignored files).
4 ** o Find a place to add links to /local.
5 ** o Remove //TODO TESTING HACK TODO
6 ** ?? In hexdump_page(), should content (and downloadName?) be reset/freed?
@@ -575,19 +576,30 @@
575 */
576 case 3:
577 @ Added %h(zName) due to a merge.
578 break;
579 case 5:
580 @ Added %h(zName) due to an integration merge.
581 break;
582 case 6: append_status( "gained", "executable", zName, zOld); break;
583 case 7: append_status( "gained", "symlink", zName, zOld); break;
584 case 8: append_status( "lost", "executable", zName, zOld); break;
585 case 9: append_status( "lost", "symlink", zName, zOld); break;
586
587 default: /* Normal edit */
588 @ Local changes of %h(zName).
 
 
 
 
 
 
 
 
 
 
 
589 //TODO:Remove? showDiff = 1;
590 }
591 if( showDiff && diffFlags ){
592 append_diff(zOld, NULL, zName, diffFlags, pRe);
593 }
@@ -617,22 +629,32 @@
617 @ %z(href("%R/file/%T?ci=ckout&annot=added by merge",zName))%h(zName)
618 @ </a> to %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> due to merge.
619 break;
620 case 5: /* Added by an integration merge */
621 @ Added
622 @ %z(href("%R/file/%T?ci=ckout&annot=added by integration merge",zName))
623 @ %h(zName)</a> to
624 @ %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> due to integrate merge.
625 break;
626 case 6: append_status( "gained", "executable", zName, zOld); break;
627 case 7: append_status( "gained", "symlink", zName, zOld); break;
628 case 8: append_status( "lost", "executable", zName, zOld); break;
629 case 9: append_status( "lost", "symlink", zName, zOld); break;
630
631 default: /* Normal edit */
632 @ Local changes of
633 @ %z(href("%R/finfo?name=%T&m=%!S",zName,zOld))%h(zName)</a>
 
 
 
 
 
 
 
 
 
 
634 @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> to
635 @ %z(href("%R/file/%T?ci=ckout&annot=edited locally",zName))
636 @ [local file]</a>
637 //TODO:Remove? showDiff = 1;
638 }
639
--- src/info.c
+++ src/info.c
@@ -1,6 +1,7 @@
1 /*TODO
2 ** o Have seen some "MERGE" entries and updated messages: still not 100% happy.
3 ** o Should /file behave differently for non-existent local files?
4 ** o Look at adding an "extras" option (non-added, non-ignored files).
5 ** o Find a place to add links to /local.
6 ** o Remove //TODO TESTING HACK TODO
7 ** ?? In hexdump_page(), should content (and downloadName?) be reset/freed?
@@ -575,19 +576,30 @@
576 */
577 case 3:
578 @ Added %h(zName) due to a merge.
579 break;
580 case 5:
581 @ Added %h(zName) due to an integrate-merge.
582 break;
583 case 6: append_status( "gained", "executable", zName, zOld); break;
584 case 7: append_status( "gained", "symlink", zName, zOld); break;
585 case 8: append_status( "lost", "executable", zName, zOld); break;
586 case 9: append_status( "lost", "symlink", zName, zOld); break;
587
588 default: /* Normal edit */
589 switch( isChnged ){
590 case 1:
591 @ Local changes
592 break;
593 case 2:
594 @ Merge
595 break;
596 case 4:
597 @ Integrate-merge
598 break;
599 }
600 @ of %h(zName).
601 //TODO:Remove? showDiff = 1;
602 }
603 if( showDiff && diffFlags ){
604 append_diff(zOld, NULL, zName, diffFlags, pRe);
605 }
@@ -617,22 +629,32 @@
629 @ %z(href("%R/file/%T?ci=ckout&annot=added by merge",zName))%h(zName)
630 @ </a> to %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> due to merge.
631 break;
632 case 5: /* Added by an integration merge */
633 @ Added
634 @ %z(href("%R/file/%T?ci=ckout&annot=added by integration-merge",zName))
635 @ %h(zName)</a> to
636 @ %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> due to integrate merge.
637 break;
638 case 6: append_status( "gained", "executable", zName, zOld); break;
639 case 7: append_status( "gained", "symlink", zName, zOld); break;
640 case 8: append_status( "lost", "executable", zName, zOld); break;
641 case 9: append_status( "lost", "symlink", zName, zOld); break;
642
643 default: /* Normal edit */
644 switch( isChnged ){
645 case 1:
646 @ Local changes
647 break;
648 case 2:
649 @ Merge
650 break;
651 case 4:
652 @ Integrate-merge
653 break;
654 }
655 @ of %z(href("%R/finfo?name=%T&m=%!S",zName,zOld))%h(zName)</a>
656 @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> to
657 @ %z(href("%R/file/%T?ci=ckout&annot=edited locally",zName))
658 @ [local file]</a>
659 //TODO:Remove? showDiff = 1;
660 }
661

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button