Fossil SCM

Integrate andygoth-undo-redo-revert-spacing.

andygoth 2015-08-03 18:35 trunk merge
Commit 0a2ebe576d27ba7501eb6d43eaac60c99ce83e5e
Parent 1d3a80474b90353…
4 files changed +2 -2 +2 -2 +3 -3 +3 -3
~ src/undo.c ~ src/undo.c ~ src/update.c ~ src/update.c
M src/undo.c
+2 -2
--- src/undo.c
+++ src/undo.c
@@ -75,13 +75,13 @@
7575
 if( old_exists ){
7676
 db_ephemeral_blob(&q, 0, &new);
7777
 }
7878
 if( old_exists ){
7979
 if( new_exists ){
80
- fossil_print("%s %s\n", redoFlag ? "REDO" : "UNDO", zPathname);
80
+ fossil_print("%s %s\n", redoFlag ? "REDO" : "UNDO", zPathname);
8181
 }else{
82
- fossil_print("NEW %s\n", zPathname);
82
+ fossil_print("NEW %s\n", zPathname);
8383
 }
8484
 if( new_exists && (new_link || old_link) ){
8585
 file_delete(zFullname);
8686
 }
8787
 if( old_link ){
8888
--- src/undo.c
+++ src/undo.c
@@ -75,13 +75,13 @@
75 if( old_exists ){
76 db_ephemeral_blob(&q, 0, &new);
77 }
78 if( old_exists ){
79 if( new_exists ){
80 fossil_print("%s %s\n", redoFlag ? "REDO" : "UNDO", zPathname);
81 }else{
82 fossil_print("NEW %s\n", zPathname);
83 }
84 if( new_exists && (new_link || old_link) ){
85 file_delete(zFullname);
86 }
87 if( old_link ){
88
--- src/undo.c
+++ src/undo.c
@@ -75,13 +75,13 @@
75 if( old_exists ){
76 db_ephemeral_blob(&q, 0, &new);
77 }
78 if( old_exists ){
79 if( new_exists ){
80 fossil_print("%s %s\n", redoFlag ? "REDO" : "UNDO", zPathname);
81 }else{
82 fossil_print("NEW %s\n", zPathname);
83 }
84 if( new_exists && (new_link || old_link) ){
85 file_delete(zFullname);
86 }
87 if( old_link ){
88
M src/undo.c
+2 -2
--- src/undo.c
+++ src/undo.c
@@ -75,13 +75,13 @@
7575
 if( old_exists ){
7676
 db_ephemeral_blob(&q, 0, &new);
7777
 }
7878
 if( old_exists ){
7979
 if( new_exists ){
80
- fossil_print("%s %s\n", redoFlag ? "REDO" : "UNDO", zPathname);
80
+ fossil_print("%s %s\n", redoFlag ? "REDO" : "UNDO", zPathname);
8181
 }else{
82
- fossil_print("NEW %s\n", zPathname);
82
+ fossil_print("NEW %s\n", zPathname);
8383
 }
8484
 if( new_exists && (new_link || old_link) ){
8585
 file_delete(zFullname);
8686
 }
8787
 if( old_link ){
8888
--- src/undo.c
+++ src/undo.c
@@ -75,13 +75,13 @@
75 if( old_exists ){
76 db_ephemeral_blob(&q, 0, &new);
77 }
78 if( old_exists ){
79 if( new_exists ){
80 fossil_print("%s %s\n", redoFlag ? "REDO" : "UNDO", zPathname);
81 }else{
82 fossil_print("NEW %s\n", zPathname);
83 }
84 if( new_exists && (new_link || old_link) ){
85 file_delete(zFullname);
86 }
87 if( old_link ){
88
--- src/undo.c
+++ src/undo.c
@@ -75,13 +75,13 @@
75 if( old_exists ){
76 db_ephemeral_blob(&q, 0, &new);
77 }
78 if( old_exists ){
79 if( new_exists ){
80 fossil_print("%s %s\n", redoFlag ? "REDO" : "UNDO", zPathname);
81 }else{
82 fossil_print("NEW %s\n", zPathname);
83 }
84 if( new_exists && (new_link || old_link) ){
85 file_delete(zFullname);
86 }
87 if( old_link ){
88
M src/update.c
+3 -3
--- src/update.c
+++ src/update.c
@@ -785,15 +785,15 @@
785785
 errCode = historical_version_of_file(zRevision, zFile, &record,
786786
 &isLink, &isExe, 0, 2);
787787
 if( errCode==2 ){
788788
 if( db_int(0, "SELECT rid FROM vfile WHERE pathname=%Q OR origname=%Q",
789789
 zFile, zFile)==0 ){
790
- fossil_print("UNMANAGE: %s\n", zFile);
790
+ fossil_print("UNMANAGE %s\n", zFile);
791791
 }else{
792792
 undo_save(zFile);
793793
 file_delete(zFull);
794
- fossil_print("DELETE: %s\n", zFile);
794
+ fossil_print("DELETE %s\n", zFile);
795795
 }
796796
 db_multi_exec(
797797
 "UPDATE OR REPLACE vfile"
798798
 " SET pathname=origname, origname=NULL"
799799
 " WHERE pathname=%Q AND origname!=pathname;"
@@ -810,11 +810,11 @@
810810
 symlink_create(blob_str(&record), zFull);
811811
 }else{
812812
 blob_write_to_file(&record, zFull);
813813
 }
814814
 file_wd_setexe(zFull, isExe);
815
- fossil_print("REVERTED: %s\n", zFile);
815
+ fossil_print("REVERT %s\n", zFile);
816816
 mtime = file_wd_mtime(zFull);
817817
 db_multi_exec(
818818
 "UPDATE vfile"
819819
 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid"
820820
 " WHERE pathname=%Q OR origname=%Q",
821821
--- src/update.c
+++ src/update.c
@@ -785,15 +785,15 @@
785 errCode = historical_version_of_file(zRevision, zFile, &record,
786 &isLink, &isExe, 0, 2);
787 if( errCode==2 ){
788 if( db_int(0, "SELECT rid FROM vfile WHERE pathname=%Q OR origname=%Q",
789 zFile, zFile)==0 ){
790 fossil_print("UNMANAGE: %s\n", zFile);
791 }else{
792 undo_save(zFile);
793 file_delete(zFull);
794 fossil_print("DELETE: %s\n", zFile);
795 }
796 db_multi_exec(
797 "UPDATE OR REPLACE vfile"
798 " SET pathname=origname, origname=NULL"
799 " WHERE pathname=%Q AND origname!=pathname;"
@@ -810,11 +810,11 @@
810 symlink_create(blob_str(&record), zFull);
811 }else{
812 blob_write_to_file(&record, zFull);
813 }
814 file_wd_setexe(zFull, isExe);
815 fossil_print("REVERTED: %s\n", zFile);
816 mtime = file_wd_mtime(zFull);
817 db_multi_exec(
818 "UPDATE vfile"
819 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid"
820 " WHERE pathname=%Q OR origname=%Q",
821
--- src/update.c
+++ src/update.c
@@ -785,15 +785,15 @@
785 errCode = historical_version_of_file(zRevision, zFile, &record,
786 &isLink, &isExe, 0, 2);
787 if( errCode==2 ){
788 if( db_int(0, "SELECT rid FROM vfile WHERE pathname=%Q OR origname=%Q",
789 zFile, zFile)==0 ){
790 fossil_print("UNMANAGE %s\n", zFile);
791 }else{
792 undo_save(zFile);
793 file_delete(zFull);
794 fossil_print("DELETE %s\n", zFile);
795 }
796 db_multi_exec(
797 "UPDATE OR REPLACE vfile"
798 " SET pathname=origname, origname=NULL"
799 " WHERE pathname=%Q AND origname!=pathname;"
@@ -810,11 +810,11 @@
810 symlink_create(blob_str(&record), zFull);
811 }else{
812 blob_write_to_file(&record, zFull);
813 }
814 file_wd_setexe(zFull, isExe);
815 fossil_print("REVERT %s\n", zFile);
816 mtime = file_wd_mtime(zFull);
817 db_multi_exec(
818 "UPDATE vfile"
819 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid"
820 " WHERE pathname=%Q OR origname=%Q",
821
M src/update.c
+3 -3
--- src/update.c
+++ src/update.c
@@ -785,15 +785,15 @@
785785
 errCode = historical_version_of_file(zRevision, zFile, &record,
786786
 &isLink, &isExe, 0, 2);
787787
 if( errCode==2 ){
788788
 if( db_int(0, "SELECT rid FROM vfile WHERE pathname=%Q OR origname=%Q",
789789
 zFile, zFile)==0 ){
790
- fossil_print("UNMANAGE: %s\n", zFile);
790
+ fossil_print("UNMANAGE %s\n", zFile);
791791
 }else{
792792
 undo_save(zFile);
793793
 file_delete(zFull);
794
- fossil_print("DELETE: %s\n", zFile);
794
+ fossil_print("DELETE %s\n", zFile);
795795
 }
796796
 db_multi_exec(
797797
 "UPDATE OR REPLACE vfile"
798798
 " SET pathname=origname, origname=NULL"
799799
 " WHERE pathname=%Q AND origname!=pathname;"
@@ -810,11 +810,11 @@
810810
 symlink_create(blob_str(&record), zFull);
811811
 }else{
812812
 blob_write_to_file(&record, zFull);
813813
 }
814814
 file_wd_setexe(zFull, isExe);
815
- fossil_print("REVERTED: %s\n", zFile);
815
+ fossil_print("REVERT %s\n", zFile);
816816
 mtime = file_wd_mtime(zFull);
817817
 db_multi_exec(
818818
 "UPDATE vfile"
819819
 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid"
820820
 " WHERE pathname=%Q OR origname=%Q",
821821
--- src/update.c
+++ src/update.c
@@ -785,15 +785,15 @@
785 errCode = historical_version_of_file(zRevision, zFile, &record,
786 &isLink, &isExe, 0, 2);
787 if( errCode==2 ){
788 if( db_int(0, "SELECT rid FROM vfile WHERE pathname=%Q OR origname=%Q",
789 zFile, zFile)==0 ){
790 fossil_print("UNMANAGE: %s\n", zFile);
791 }else{
792 undo_save(zFile);
793 file_delete(zFull);
794 fossil_print("DELETE: %s\n", zFile);
795 }
796 db_multi_exec(
797 "UPDATE OR REPLACE vfile"
798 " SET pathname=origname, origname=NULL"
799 " WHERE pathname=%Q AND origname!=pathname;"
@@ -810,11 +810,11 @@
810 symlink_create(blob_str(&record), zFull);
811 }else{
812 blob_write_to_file(&record, zFull);
813 }
814 file_wd_setexe(zFull, isExe);
815 fossil_print("REVERTED: %s\n", zFile);
816 mtime = file_wd_mtime(zFull);
817 db_multi_exec(
818 "UPDATE vfile"
819 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid"
820 " WHERE pathname=%Q OR origname=%Q",
821
--- src/update.c
+++ src/update.c
@@ -785,15 +785,15 @@
785 errCode = historical_version_of_file(zRevision, zFile, &record,
786 &isLink, &isExe, 0, 2);
787 if( errCode==2 ){
788 if( db_int(0, "SELECT rid FROM vfile WHERE pathname=%Q OR origname=%Q",
789 zFile, zFile)==0 ){
790 fossil_print("UNMANAGE %s\n", zFile);
791 }else{
792 undo_save(zFile);
793 file_delete(zFull);
794 fossil_print("DELETE %s\n", zFile);
795 }
796 db_multi_exec(
797 "UPDATE OR REPLACE vfile"
798 " SET pathname=origname, origname=NULL"
799 " WHERE pathname=%Q AND origname!=pathname;"
@@ -810,11 +810,11 @@
810 symlink_create(blob_str(&record), zFull);
811 }else{
812 blob_write_to_file(&record, zFull);
813 }
814 file_wd_setexe(zFull, isExe);
815 fossil_print("REVERT %s\n", zFile);
816 mtime = file_wd_mtime(zFull);
817 db_multi_exec(
818 "UPDATE vfile"
819 " SET mtime=%lld, chnged=0, deleted=0, isexe=%d, islink=%d,mrid=rid"
820 " WHERE pathname=%Q OR origname=%Q",
821

Keyboard Shortcuts

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