Fossil SCM

For "fossil rebuild" increment the progress counter after each artifact is processed, rather than waiting for its delta children to be processed, in order to give a more uniform progress indication. Possibly related to ticket [2a1e8e3c4b0b39e08fdde].

drh 2010-10-03 19:01 trunk
Commit ae000c23fa01b1a98c3353600ab969cad5a9354d
1 file changed +1 -1
+1 -1
--- src/rebuild.c
+++ src/rebuild.c
@@ -135,10 +135,11 @@
135135
blob_copy(&copy, pBase);
136136
pUse = ©
137137
}
138138
manifest_crosslink(rid, pUse);
139139
blob_reset(pUse);
140
+ rebuild_step_done(rid);
140141
141142
/* Call all children recursively */
142143
for(cid=bag_first(&children), i=1; cid; cid=bag_next(&children, cid), i++){
143144
Stmt q2;
144145
int sz;
@@ -161,11 +162,10 @@
161162
db_finalize(&q2);
162163
blob_reset(pUse);
163164
}
164165
}
165166
bag_clear(&children);
166
- rebuild_step_done(rid);
167167
}
168168
169169
/*
170170
** Check to see if the "sym-trunk" tag exists. If not, create it
171171
** and attach it to the very first check-in.
172172
--- src/rebuild.c
+++ src/rebuild.c
@@ -135,10 +135,11 @@
135 blob_copy(&copy, pBase);
136 pUse = ©
137 }
138 manifest_crosslink(rid, pUse);
139 blob_reset(pUse);
 
140
141 /* Call all children recursively */
142 for(cid=bag_first(&children), i=1; cid; cid=bag_next(&children, cid), i++){
143 Stmt q2;
144 int sz;
@@ -161,11 +162,10 @@
161 db_finalize(&q2);
162 blob_reset(pUse);
163 }
164 }
165 bag_clear(&children);
166 rebuild_step_done(rid);
167 }
168
169 /*
170 ** Check to see if the "sym-trunk" tag exists. If not, create it
171 ** and attach it to the very first check-in.
172
--- src/rebuild.c
+++ src/rebuild.c
@@ -135,10 +135,11 @@
135 blob_copy(&copy, pBase);
136 pUse = ©
137 }
138 manifest_crosslink(rid, pUse);
139 blob_reset(pUse);
140 rebuild_step_done(rid);
141
142 /* Call all children recursively */
143 for(cid=bag_first(&children), i=1; cid; cid=bag_next(&children, cid), i++){
144 Stmt q2;
145 int sz;
@@ -161,11 +162,10 @@
162 db_finalize(&q2);
163 blob_reset(pUse);
164 }
165 }
166 bag_clear(&children);
 
167 }
168
169 /*
170 ** Check to see if the "sym-trunk" tag exists. If not, create it
171 ** and attach it to the very first check-in.
172

Keyboard Shortcuts

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