Fossil SCM

Reformat long lines

baruch 2015-01-08 10:47 svn-import
Commit 32e94835856d1b6cb692229031c3d30f2ad080fe
Parent 06d3aa22d3a25b4…
1 file changed +25 -7
~ src/import.c
M src/import.c
+25 -7
--- src/import.c
+++ src/import.c
@@ -898,10 +898,20 @@
898898
 }else{
899899
 rec->contentFlag = 0;
900900
 }
901901
 return 1;
902902
 }
903
+
904
+/*
905
+** Returns the UUID for the RID, or NULL if not found.
906
+** The returned string is allocated via db_text() and must be
907
+** free()d by the caller.
908
+*/
909
+char * rid_to_uuid(int rid)
910
+{
911
+ return db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
912
+}
903913
904914
 static void svn_finish_revision(){
905915
 Blob manifest;
906916
 static Stmt getChanges;
907917
 static Stmt getFiles;
@@ -938,33 +948,38 @@
938948
 blob_appendf(&manifest, "F %F %s %s\n", zFile, zUuid, zPerm);
939949
 }
940950
 db_reset(&getFiles);
941951
 if( !bag_find(&gsvn.newBranches, branchId) ){
942952
 parentRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions"
943
- " WHERE trev<%d AND tbranch=%d", gsvn.rev, branchId);
953
+ " WHERE trev<%d AND tbranch=%d",
954
+ gsvn.rev, branchId);
944955
 }
945956
 if( parentRid>0 ){
946
- const char *zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", parentRid);
957
+ const char *zParentUuid = rid_to_uuid(parentRid);
947958
 if( parentRid==mergeRid || mergeRid==0){
948
- const char *zParentBranch = db_text(0, "SELECT tname FROM xbranches WHERE tid=(SELECT tbranch FROM xrevisions WHERE trid=%d)", parentRid);
959
+ const char *zParentBranch =
960
+ db_text(0, "SELECT tname FROM xbranches WHERE tid="
961
+ " (SELECT tbranch FROM xrevisions WHERE trid=%d)",
962
+ parentRid
963
+ );
949964
 blob_appendf(&manifest, "P %s\n", zParentUuid);
950965
 blob_appendf(&manifest, "T *branch * %F\n", zBranch);
951966
 blob_appendf(&manifest, "T *sym-%F *\n", zBranch);
952967
 blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
953968
 blob_appendf(&manifest, "T -sym-%F *\n", zParentBranch);
954969
 }else{
955
- const char *zMergeUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mergeRid);
970
+ const char *zMergeUuid = rid_to_uuid(mergeRid);
956971
 blob_appendf(&manifest, "P %s %s\n", zParentUuid, zMergeUuid);
957972
 blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
958973
 }
959974
 }else{
960975
 blob_appendf(&manifest, "T *branch * %F\n", zBranch);
961976
 blob_appendf(&manifest, "T *sym-%F *\n", zBranch);
962977
 blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
963978
 }
964979
 }else{
965
- const char *zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", parentRid);
980
+ const char *zParentUuid = rid_to_uuid(parentRid);
966981
 blob_appendf(&manifest, "D %s\n", gsvn.zDate);
967982
 blob_appendf(&manifest, "T +sym-%F %s\n", zBranch, zParentUuid);
968983
 }
969984
 if( gsvn.zUser ){
970985
 blob_appendf(&manifest, "U %F\n", gsvn.zUser);
@@ -1150,14 +1165,17 @@
11501165
 );
11511166
 db_prepare(&cpyPath,
11521167
 "INSERT INTO xfiles (tpath, tbranch, tuuid, tperm)"
11531168
 " SELECT :path||substr(filename, length(:srcpath)+1), :branch, uuid, perm"
11541169
 " FROM xfoci"
1155
- " WHERE checkinID=:rid AND filename>:srcpath||'/' AND filename<:srcpath||'0'"
1170
+ " WHERE checkinID=:rid"
1171
+ " AND filename>:srcpath||'/'"
1172
+ " AND filename<:srcpath||'0'"
11561173
 );
11571174
 db_prepare(&revSrc,
1158
- "UPDATE xrevisions SET tparent=:parent WHERE trev=:rev AND tbranch=:branch AND tparent<:parent"
1175
+ "UPDATE xrevisions SET tparent=:parent"
1176
+ " WHERE trev=:rev AND tbranch=:branch AND tparent<:parent"
11591177
 );
11601178
 gsvn.rev = -1;
11611179
 bag_init(&gsvn.newBranches);
11621180
 while( svn_read_rec(pIn, &rec) ){
11631181
 if( (zTemp = svn_find_header(rec, "Revision-number")) ){ /* revision node */
11641182
--- src/import.c
+++ src/import.c
@@ -898,10 +898,20 @@
898 }else{
899 rec->contentFlag = 0;
900 }
901 return 1;
902 }
 
 
 
 
 
 
 
 
 
 
903
904 static void svn_finish_revision(){
905 Blob manifest;
906 static Stmt getChanges;
907 static Stmt getFiles;
@@ -938,33 +948,38 @@
938 blob_appendf(&manifest, "F %F %s %s\n", zFile, zUuid, zPerm);
939 }
940 db_reset(&getFiles);
941 if( !bag_find(&gsvn.newBranches, branchId) ){
942 parentRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions"
943 " WHERE trev<%d AND tbranch=%d", gsvn.rev, branchId);
 
944 }
945 if( parentRid>0 ){
946 const char *zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", parentRid);
947 if( parentRid==mergeRid || mergeRid==0){
948 const char *zParentBranch = db_text(0, "SELECT tname FROM xbranches WHERE tid=(SELECT tbranch FROM xrevisions WHERE trid=%d)", parentRid);
 
 
 
 
949 blob_appendf(&manifest, "P %s\n", zParentUuid);
950 blob_appendf(&manifest, "T *branch * %F\n", zBranch);
951 blob_appendf(&manifest, "T *sym-%F *\n", zBranch);
952 blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
953 blob_appendf(&manifest, "T -sym-%F *\n", zParentBranch);
954 }else{
955 const char *zMergeUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mergeRid);
956 blob_appendf(&manifest, "P %s %s\n", zParentUuid, zMergeUuid);
957 blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
958 }
959 }else{
960 blob_appendf(&manifest, "T *branch * %F\n", zBranch);
961 blob_appendf(&manifest, "T *sym-%F *\n", zBranch);
962 blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
963 }
964 }else{
965 const char *zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", parentRid);
966 blob_appendf(&manifest, "D %s\n", gsvn.zDate);
967 blob_appendf(&manifest, "T +sym-%F %s\n", zBranch, zParentUuid);
968 }
969 if( gsvn.zUser ){
970 blob_appendf(&manifest, "U %F\n", gsvn.zUser);
@@ -1150,14 +1165,17 @@
1150 );
1151 db_prepare(&cpyPath,
1152 "INSERT INTO xfiles (tpath, tbranch, tuuid, tperm)"
1153 " SELECT :path||substr(filename, length(:srcpath)+1), :branch, uuid, perm"
1154 " FROM xfoci"
1155 " WHERE checkinID=:rid AND filename>:srcpath||'/' AND filename<:srcpath||'0'"
 
 
1156 );
1157 db_prepare(&revSrc,
1158 "UPDATE xrevisions SET tparent=:parent WHERE trev=:rev AND tbranch=:branch AND tparent<:parent"
 
1159 );
1160 gsvn.rev = -1;
1161 bag_init(&gsvn.newBranches);
1162 while( svn_read_rec(pIn, &rec) ){
1163 if( (zTemp = svn_find_header(rec, "Revision-number")) ){ /* revision node */
1164
--- src/import.c
+++ src/import.c
@@ -898,10 +898,20 @@
898 }else{
899 rec->contentFlag = 0;
900 }
901 return 1;
902 }
903
904 /*
905 ** Returns the UUID for the RID, or NULL if not found.
906 ** The returned string is allocated via db_text() and must be
907 ** free()d by the caller.
908 */
909 char * rid_to_uuid(int rid)
910 {
911 return db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
912 }
913
914 static void svn_finish_revision(){
915 Blob manifest;
916 static Stmt getChanges;
917 static Stmt getFiles;
@@ -938,33 +948,38 @@
948 blob_appendf(&manifest, "F %F %s %s\n", zFile, zUuid, zPerm);
949 }
950 db_reset(&getFiles);
951 if( !bag_find(&gsvn.newBranches, branchId) ){
952 parentRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions"
953 " WHERE trev<%d AND tbranch=%d",
954 gsvn.rev, branchId);
955 }
956 if( parentRid>0 ){
957 const char *zParentUuid = rid_to_uuid(parentRid);
958 if( parentRid==mergeRid || mergeRid==0){
959 const char *zParentBranch =
960 db_text(0, "SELECT tname FROM xbranches WHERE tid="
961 " (SELECT tbranch FROM xrevisions WHERE trid=%d)",
962 parentRid
963 );
964 blob_appendf(&manifest, "P %s\n", zParentUuid);
965 blob_appendf(&manifest, "T *branch * %F\n", zBranch);
966 blob_appendf(&manifest, "T *sym-%F *\n", zBranch);
967 blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
968 blob_appendf(&manifest, "T -sym-%F *\n", zParentBranch);
969 }else{
970 const char *zMergeUuid = rid_to_uuid(mergeRid);
971 blob_appendf(&manifest, "P %s %s\n", zParentUuid, zMergeUuid);
972 blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
973 }
974 }else{
975 blob_appendf(&manifest, "T *branch * %F\n", zBranch);
976 blob_appendf(&manifest, "T *sym-%F *\n", zBranch);
977 blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
978 }
979 }else{
980 const char *zParentUuid = rid_to_uuid(parentRid);
981 blob_appendf(&manifest, "D %s\n", gsvn.zDate);
982 blob_appendf(&manifest, "T +sym-%F %s\n", zBranch, zParentUuid);
983 }
984 if( gsvn.zUser ){
985 blob_appendf(&manifest, "U %F\n", gsvn.zUser);
@@ -1150,14 +1165,17 @@
1165 );
1166 db_prepare(&cpyPath,
1167 "INSERT INTO xfiles (tpath, tbranch, tuuid, tperm)"
1168 " SELECT :path||substr(filename, length(:srcpath)+1), :branch, uuid, perm"
1169 " FROM xfoci"
1170 " WHERE checkinID=:rid"
1171 " AND filename>:srcpath||'/'"
1172 " AND filename<:srcpath||'0'"
1173 );
1174 db_prepare(&revSrc,
1175 "UPDATE xrevisions SET tparent=:parent"
1176 " WHERE trev=:rev AND tbranch=:branch AND tparent<:parent"
1177 );
1178 gsvn.rev = -1;
1179 bag_init(&gsvn.newBranches);
1180 while( svn_read_rec(pIn, &rec) ){
1181 if( (zTemp = svn_find_header(rec, "Revision-number")) ){ /* revision node */
1182

Keyboard Shortcuts

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