Fossil SCM

Fix [http://permalink.gmane.org/gmane.comp.version-control.fossil-scm.user/17266]

jan.nijtmans 2014-07-27 23:48 branch-1.29 merge
Commit 4a1188d56992f14d9945a088350958115b3ea4d5
Parent 49e41bf9b421068…
4 files changed +5 +5 +13 -11 +13 -11
~ src/descendants.c ~ src/descendants.c ~ src/update.c ~ src/update.c
M src/descendants.c
+5
--- src/descendants.c
+++ src/descendants.c
@@ -130,10 +130,15 @@
130130
 db_finalize(&ins);
131131
 db_finalize(&isBr);
132132
 db_finalize(&q1);
133133
 bag_clear(&pending);
134134
 bag_clear(&seen);
135
+ }else{
136
+ db_multi_exec(
137
+ "INSERT INTO leaves"
138
+ " SELECT leaf.rid FROM leaf"
139
+ );
135140
 }
136141
 if( closeMode==1 ){
137142
 db_multi_exec(
138143
 "DELETE FROM leaves WHERE rid IN"
139144
 " (SELECT leaves.rid FROM leaves, tagxref"
140145
--- src/descendants.c
+++ src/descendants.c
@@ -130,10 +130,15 @@
130 db_finalize(&ins);
131 db_finalize(&isBr);
132 db_finalize(&q1);
133 bag_clear(&pending);
134 bag_clear(&seen);
 
 
 
 
 
135 }
136 if( closeMode==1 ){
137 db_multi_exec(
138 "DELETE FROM leaves WHERE rid IN"
139 " (SELECT leaves.rid FROM leaves, tagxref"
140
--- src/descendants.c
+++ src/descendants.c
@@ -130,10 +130,15 @@
130 db_finalize(&ins);
131 db_finalize(&isBr);
132 db_finalize(&q1);
133 bag_clear(&pending);
134 bag_clear(&seen);
135 }else{
136 db_multi_exec(
137 "INSERT INTO leaves"
138 " SELECT leaf.rid FROM leaf"
139 );
140 }
141 if( closeMode==1 ){
142 db_multi_exec(
143 "DELETE FROM leaves WHERE rid IN"
144 " (SELECT leaves.rid FROM leaves, tagxref"
145
M src/descendants.c
+5
--- src/descendants.c
+++ src/descendants.c
@@ -130,10 +130,15 @@
130130
 db_finalize(&ins);
131131
 db_finalize(&isBr);
132132
 db_finalize(&q1);
133133
 bag_clear(&pending);
134134
 bag_clear(&seen);
135
+ }else{
136
+ db_multi_exec(
137
+ "INSERT INTO leaves"
138
+ " SELECT leaf.rid FROM leaf"
139
+ );
135140
 }
136141
 if( closeMode==1 ){
137142
 db_multi_exec(
138143
 "DELETE FROM leaves WHERE rid IN"
139144
 " (SELECT leaves.rid FROM leaves, tagxref"
140145
--- src/descendants.c
+++ src/descendants.c
@@ -130,10 +130,15 @@
130 db_finalize(&ins);
131 db_finalize(&isBr);
132 db_finalize(&q1);
133 bag_clear(&pending);
134 bag_clear(&seen);
 
 
 
 
 
135 }
136 if( closeMode==1 ){
137 db_multi_exec(
138 "DELETE FROM leaves WHERE rid IN"
139 " (SELECT leaves.rid FROM leaves, tagxref"
140
--- src/descendants.c
+++ src/descendants.c
@@ -130,10 +130,15 @@
130 db_finalize(&ins);
131 db_finalize(&isBr);
132 db_finalize(&q1);
133 bag_clear(&pending);
134 bag_clear(&seen);
135 }else{
136 db_multi_exec(
137 "INSERT INTO leaves"
138 " SELECT leaf.rid FROM leaf"
139 );
140 }
141 if( closeMode==1 ){
142 db_multi_exec(
143 "DELETE FROM leaves WHERE rid IN"
144 " (SELECT leaves.rid FROM leaves, tagxref"
145
M src/update.c
+13 -11
--- src/update.c
+++ src/update.c
@@ -247,21 +247,23 @@
247247
 );
248248
249249
 /* Compute file name changes on V->T. Record name changes in files that
250250
 ** have changed locally.
251251
 */
252
- find_filename_changes(vid, tid, 1, &nChng, &aChng, debugFlag ? "V->T": 0);
253
- if( nChng ){
254
- for(i=0; i<nChng; i++){
255
- db_multi_exec(
256
- "UPDATE fv"
257
- " SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
258
- " WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
259
- aChng[i*2+1], aChng[i*2]
260
- );
261
- }
262
- fossil_free(aChng);
252
+ if( vid ){
253
+ find_filename_changes(vid, tid, 1, &nChng, &aChng, debugFlag ? "V->T": 0);
254
+ if( nChng ){
255
+ for(i=0; i<nChng; i++){
256
+ db_multi_exec(
257
+ "UPDATE fv"
258
+ " SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
259
+ " WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
260
+ aChng[i*2+1], aChng[i*2]
261
+ );
262
+ }
263
+ fossil_free(aChng);
264
+ }
263265
 }
264266
265267
 /* Add files found in the target version T but missing from the current
266268
 ** version V.
267269
 */
268270
--- src/update.c
+++ src/update.c
@@ -247,21 +247,23 @@
247 );
248
249 /* Compute file name changes on V->T. Record name changes in files that
250 ** have changed locally.
251 */
252 find_filename_changes(vid, tid, 1, &nChng, &aChng, debugFlag ? "V->T": 0);
253 if( nChng ){
254 for(i=0; i<nChng; i++){
255 db_multi_exec(
256 "UPDATE fv"
257 " SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
258 " WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
259 aChng[i*2+1], aChng[i*2]
260 );
261 }
262 fossil_free(aChng);
 
 
263 }
264
265 /* Add files found in the target version T but missing from the current
266 ** version V.
267 */
268
--- src/update.c
+++ src/update.c
@@ -247,21 +247,23 @@
247 );
248
249 /* Compute file name changes on V->T. Record name changes in files that
250 ** have changed locally.
251 */
252 if( vid ){
253 find_filename_changes(vid, tid, 1, &nChng, &aChng, debugFlag ? "V->T": 0);
254 if( nChng ){
255 for(i=0; i<nChng; i++){
256 db_multi_exec(
257 "UPDATE fv"
258 " SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
259 " WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
260 aChng[i*2+1], aChng[i*2]
261 );
262 }
263 fossil_free(aChng);
264 }
265 }
266
267 /* Add files found in the target version T but missing from the current
268 ** version V.
269 */
270
M src/update.c
+13 -11
--- src/update.c
+++ src/update.c
@@ -247,21 +247,23 @@
247247
 );
248248
249249
 /* Compute file name changes on V->T. Record name changes in files that
250250
 ** have changed locally.
251251
 */
252
- find_filename_changes(vid, tid, 1, &nChng, &aChng, debugFlag ? "V->T": 0);
253
- if( nChng ){
254
- for(i=0; i<nChng; i++){
255
- db_multi_exec(
256
- "UPDATE fv"
257
- " SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
258
- " WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
259
- aChng[i*2+1], aChng[i*2]
260
- );
261
- }
262
- fossil_free(aChng);
252
+ if( vid ){
253
+ find_filename_changes(vid, tid, 1, &nChng, &aChng, debugFlag ? "V->T": 0);
254
+ if( nChng ){
255
+ for(i=0; i<nChng; i++){
256
+ db_multi_exec(
257
+ "UPDATE fv"
258
+ " SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
259
+ " WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
260
+ aChng[i*2+1], aChng[i*2]
261
+ );
262
+ }
263
+ fossil_free(aChng);
264
+ }
263265
 }
264266
265267
 /* Add files found in the target version T but missing from the current
266268
 ** version V.
267269
 */
268270
--- src/update.c
+++ src/update.c
@@ -247,21 +247,23 @@
247 );
248
249 /* Compute file name changes on V->T. Record name changes in files that
250 ** have changed locally.
251 */
252 find_filename_changes(vid, tid, 1, &nChng, &aChng, debugFlag ? "V->T": 0);
253 if( nChng ){
254 for(i=0; i<nChng; i++){
255 db_multi_exec(
256 "UPDATE fv"
257 " SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
258 " WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
259 aChng[i*2+1], aChng[i*2]
260 );
261 }
262 fossil_free(aChng);
 
 
263 }
264
265 /* Add files found in the target version T but missing from the current
266 ** version V.
267 */
268
--- src/update.c
+++ src/update.c
@@ -247,21 +247,23 @@
247 );
248
249 /* Compute file name changes on V->T. Record name changes in files that
250 ** have changed locally.
251 */
252 if( vid ){
253 find_filename_changes(vid, tid, 1, &nChng, &aChng, debugFlag ? "V->T": 0);
254 if( nChng ){
255 for(i=0; i<nChng; i++){
256 db_multi_exec(
257 "UPDATE fv"
258 " SET fnt=(SELECT name FROM filename WHERE fnid=%d)"
259 " WHERE fn=(SELECT name FROM filename WHERE fnid=%d) AND chnged",
260 aChng[i*2+1], aChng[i*2]
261 );
262 }
263 fossil_free(aChng);
264 }
265 }
266
267 /* Add files found in the target version T but missing from the current
268 ** version V.
269 */
270

Keyboard Shortcuts

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