6a617d004fb… — Fossil SCM

M src/branch.c

-1

		--- src/branch.c
		+++ src/branch.c
		@@ -901,11 +901,10 @@
901	901	@ <td></td>
902	902	}
903	903	@ </tr>
904	904	}
905	905	@ </tbody></table></div>
906		- fossil_free(zMainBranch);
907	906	db_finalize(&q);
908	907	builtin_request_js("fossil.page.brlist.js");
909	908	style_table_sorter();
910	909	style_finish_page();
911	910	}
912	911

	--- src/branch.c
	+++ src/branch.c
	@@ -901,11 +901,10 @@
901	@ <td></td>
902	}
903	@ </tr>
904	}
905	@ </tbody></table></div>
906	fossil_free(zMainBranch);
907	db_finalize(&q);
908	builtin_request_js("fossil.page.brlist.js");
909	style_table_sorter();
910	style_finish_page();
911	}
912

	--- src/branch.c
	+++ src/branch.c
	@@ -901,11 +901,10 @@
901	@ <td></td>
902	}
903	@ </tr>
904	}
905	@ </tbody></table></div>

906	db_finalize(&q);
907	builtin_request_js("fossil.page.brlist.js");
908	style_table_sorter();
909	style_finish_page();
910	}
911

M src/checkin.c

-1

		--- src/checkin.c
		+++ src/checkin.c
		@@ -1674,11 +1674,10 @@
1674	1674	sqlite3_randomness(sizeof(r), r);
1675	1675	zFilename = mprintf("%scommit-description-%08x%08x.txt",
1676	1676	g.zLocalRoot, r[0], r[1]);
1677	1677	blob_write_to_file(pDesc, zFilename);
1678	1678	}
1679		- fossil_free(zMainBranch);
1680	1679	blob_reset(pDesc);
1681	1680	return zFilename;
1682	1681	}
1683	1682
1684	1683
1685	1684

	--- src/checkin.c
	+++ src/checkin.c
	@@ -1674,11 +1674,10 @@
1674	sqlite3_randomness(sizeof(r), r);
1675	zFilename = mprintf("%scommit-description-%08x%08x.txt",
1676	g.zLocalRoot, r[0], r[1]);
1677	blob_write_to_file(pDesc, zFilename);
1678	}
1679	fossil_free(zMainBranch);
1680	blob_reset(pDesc);
1681	return zFilename;
1682	}
1683
1684
1685

	--- src/checkin.c
	+++ src/checkin.c
	@@ -1674,11 +1674,10 @@
1674	sqlite3_randomness(sizeof(r), r);
1675	zFilename = mprintf("%scommit-description-%08x%08x.txt",
1676	g.zLocalRoot, r[0], r[1]);
1677	blob_write_to_file(pDesc, zFilename);
1678	}

1679	blob_reset(pDesc);
1680	return zFilename;
1681	}
1682
1683
1684

M src/descendants.c

-1

		--- src/descendants.c
		+++ src/descendants.c
		@@ -535,11 +535,10 @@
535	535	zBranchPoint ? zBranchPoint : "");
536	536	comment_print(z, zCom, 7, width, get_comment_format());
537	537	fossil_free(z);
538	538	fossil_free(zBranchPoint);
539	539	}
540		- fossil_free(zMainBranch);
541	540	fossil_free(zLastBr);
542	541	db_finalize(&q);
543	542	}
544	543
545	544	/*
546	545

	--- src/descendants.c
	+++ src/descendants.c
	@@ -535,11 +535,10 @@
535	zBranchPoint ? zBranchPoint : "");
536	comment_print(z, zCom, 7, width, get_comment_format());
537	fossil_free(z);
538	fossil_free(zBranchPoint);
539	}
540	fossil_free(zMainBranch);
541	fossil_free(zLastBr);
542	db_finalize(&q);
543	}
544
545	/*
546

	--- src/descendants.c
	+++ src/descendants.c
	@@ -535,11 +535,10 @@
535	zBranchPoint ? zBranchPoint : "");
536	comment_print(z, zCom, 7, width, get_comment_format());
537	fossil_free(z);
538	fossil_free(zBranchPoint);
539	}

540	fossil_free(zLastBr);
541	db_finalize(&q);
542	}
543
544	/*
545

M src/export.c

-3

		--- src/export.c
		+++ src/export.c
		@@ -543,11 +543,10 @@
543	543	db_bind_int(&qc, ":rid", rid);
544	544	db_step(&qc);
545	545	db_reset(&qc);
546	546	}while((rid = bag_next(&vers, rid))!=0);
547	547	}
548		- fossil_free(zMainBranch);
549	548	db_finalize(&qb);
550	549	db_finalize(&qc);
551	550	fclose(f);
552	551	}
553	552
		@@ -699,11 +698,10 @@
699	698	}
700	699	db_finalize(&q4);
701	700	db_finalize(&q3);
702	701	printf("\n");
703	702	}
704		- fossil_free(zMainBranch);
705	703	db_finalize(&q2);
706	704	db_finalize(&q);
707	705	manifest_cache_clear();
708	706
709	707
		@@ -1308,11 +1306,10 @@
1308	1306	fprintf(xCmd, "D manifest.tags\n");
1309	1307	}
1310	1308
1311	1309	/* The check-in is finished, so decrement the counter */
1312	1310	(*pnLimit)--;
1313		- fossil_free(zMainBranch);
1314	1311	return 0;
1315	1312	}
1316	1313
1317	1314	/*
1318	1315	** Create a new Git repository at zMirror to use as the mirror.
1319	1316

	--- src/export.c
	+++ src/export.c
	@@ -543,11 +543,10 @@
543	db_bind_int(&qc, ":rid", rid);
544	db_step(&qc);
545	db_reset(&qc);
546	}while((rid = bag_next(&vers, rid))!=0);
547	}
548	fossil_free(zMainBranch);
549	db_finalize(&qb);
550	db_finalize(&qc);
551	fclose(f);
552	}
553
	@@ -699,11 +698,10 @@
699	}
700	db_finalize(&q4);
701	db_finalize(&q3);
702	printf("\n");
703	}
704	fossil_free(zMainBranch);
705	db_finalize(&q2);
706	db_finalize(&q);
707	manifest_cache_clear();
708
709
	@@ -1308,11 +1306,10 @@
1308	fprintf(xCmd, "D manifest.tags\n");
1309	}
1310
1311	/* The check-in is finished, so decrement the counter */
1312	(*pnLimit)--;
1313	fossil_free(zMainBranch);
1314	return 0;
1315	}
1316
1317	/*
1318	** Create a new Git repository at zMirror to use as the mirror.
1319

	--- src/export.c
	+++ src/export.c
	@@ -543,11 +543,10 @@
543	db_bind_int(&qc, ":rid", rid);
544	db_step(&qc);
545	db_reset(&qc);
546	}while((rid = bag_next(&vers, rid))!=0);
547	}

548	db_finalize(&qb);
549	db_finalize(&qc);
550	fclose(f);
551	}
552
	@@ -699,11 +698,10 @@
698	}
699	db_finalize(&q4);
700	db_finalize(&q3);
701	printf("\n");
702	}

703	db_finalize(&q2);
704	db_finalize(&q);
705	manifest_cache_clear();
706
707
	@@ -1308,11 +1306,10 @@
1306	fprintf(xCmd, "D manifest.tags\n");
1307	}
1308
1309	/* The check-in is finished, so decrement the counter */
1310	(*pnLimit)--;

1311	return 0;
1312	}
1313
1314	/*
1315	** Create a new Git repository at zMirror to use as the mirror.
1316

M src/finfo.c

-2

		--- src/finfo.c
		+++ src/finfo.c
		@@ -258,11 +258,10 @@
258	258	blob_appendf(&line, "%8.8s ", zBr);
259	259	blob_appendf(&line,"%-39.39s", zCom );
260	260	comment_print(blob_str(&line), zCom, 0, iWidth, get_comment_format());
261	261	}
262	262	}
263		- fossil_free(zMainBranch);
264	263	db_finalize(&q);
265	264	blob_reset(&fname);
266	265	}
267	266	}
268	267
		@@ -810,11 +809,10 @@
810	809	}else{
811	810	@ )</span>
812	811	}
813	812	@ </td></tr>
814	813	}
815		- fossil_free(zMainBranch);
816	814	db_finalize(&q);
817	815	db_finalize(&qparent);
818	816	if( pGraph ){
819	817	graph_finish(pGraph, 0, TIMELINE_DISJOINT);
820	818	if( pGraph->nErr ){
821	819

	--- src/finfo.c
	+++ src/finfo.c
	@@ -258,11 +258,10 @@
258	blob_appendf(&line, "%8.8s ", zBr);
259	blob_appendf(&line,"%-39.39s", zCom );
260	comment_print(blob_str(&line), zCom, 0, iWidth, get_comment_format());
261	}
262	}
263	fossil_free(zMainBranch);
264	db_finalize(&q);
265	blob_reset(&fname);
266	}
267	}
268
	@@ -810,11 +809,10 @@
810	}else{
811	@ )</span>
812	}
813	@ </td></tr>
814	}
815	fossil_free(zMainBranch);
816	db_finalize(&q);
817	db_finalize(&qparent);
818	if( pGraph ){
819	graph_finish(pGraph, 0, TIMELINE_DISJOINT);
820	if( pGraph->nErr ){
821

	--- src/finfo.c
	+++ src/finfo.c
	@@ -258,11 +258,10 @@
258	blob_appendf(&line, "%8.8s ", zBr);
259	blob_appendf(&line,"%-39.39s", zCom );
260	comment_print(blob_str(&line), zCom, 0, iWidth, get_comment_format());
261	}
262	}

263	db_finalize(&q);
264	blob_reset(&fname);
265	}
266	}
267
	@@ -810,11 +809,10 @@
809	}else{
810	@ )</span>
811	}
812	@ </td></tr>
813	}

814	db_finalize(&q);
815	db_finalize(&qparent);
816	if( pGraph ){
817	graph_finish(pGraph, 0, TIMELINE_DISJOINT);
818	if( pGraph->nErr ){
819

M src/graph.c

-1

		--- src/graph.c
		+++ src/graph.c
		@@ -711,11 +711,10 @@
711	711	**
712	712	** Strive to put the main branch (usually "trunk") on far left.
713	713	*/
714	714	zMainBranch = db_get("main-branch", 0);
715	715	zTrunk = persistBranchName(p, zMainBranch);
716		- fossil_free(zMainBranch);
717	716	for(i=0; i<2; i++){
718	717	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
719	718	if( i==0 && pRow->zBranch!=zTrunk ) continue;
720	719	if( pRow->iRail>=0 ) continue;
721	720	if( pRow->isDup ) continue;
722	721

	--- src/graph.c
	+++ src/graph.c
	@@ -711,11 +711,10 @@
711	**
712	** Strive to put the main branch (usually "trunk") on far left.
713	*/
714	zMainBranch = db_get("main-branch", 0);
715	zTrunk = persistBranchName(p, zMainBranch);
716	fossil_free(zMainBranch);
717	for(i=0; i<2; i++){
718	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
719	if( i==0 && pRow->zBranch!=zTrunk ) continue;
720	if( pRow->iRail>=0 ) continue;
721	if( pRow->isDup ) continue;
722

	--- src/graph.c
	+++ src/graph.c
	@@ -711,11 +711,10 @@
711	**
712	** Strive to put the main branch (usually "trunk") on far left.
713	*/
714	zMainBranch = db_get("main-branch", 0);
715	zTrunk = persistBranchName(p, zMainBranch);

716	for(i=0; i<2; i++){
717	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
718	if( i==0 && pRow->zBranch!=zTrunk ) continue;
719	if( pRow->iRail>=0 ) continue;
720	if( pRow->isDup ) continue;
721

M src/import.c

-2

		--- src/import.c
		+++ src/import.c
		@@ -1319,11 +1319,10 @@
1319	1319	db_multi_exec("INSERT INTO xbranches (tname, ttype) VALUES(%Q, %d)",
1320	1320	zBranch, *type);
1321	1321	branchId = db_last_insert_rowid();
1322	1322	}
1323	1323	}
1324		- fossil_free(zMainBranch);
1325	1324	return branchId;
1326	1325	}
1327	1326
1328	1327	/*
1329	1328	** Insert content of corresponding content blob into the database.
		@@ -2027,7 +2026,6 @@
2027	2026	fossil_print("server-id: %s\n", db_get("server-code", 0));
2028	2027	zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
2029	2028	fossil_print("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
2030	2029	hash_user_password(g.zLogin);
2031	2030	}
2032		- fossil_free(zMainBranch);
2033	2031	}
2034	2032

	--- src/import.c
	+++ src/import.c
	@@ -1319,11 +1319,10 @@
1319	db_multi_exec("INSERT INTO xbranches (tname, ttype) VALUES(%Q, %d)",
1320	zBranch, *type);
1321	branchId = db_last_insert_rowid();
1322	}
1323	}
1324	fossil_free(zMainBranch);
1325	return branchId;
1326	}
1327
1328	/*
1329	** Insert content of corresponding content blob into the database.
	@@ -2027,7 +2026,6 @@
2027	fossil_print("server-id: %s\n", db_get("server-code", 0));
2028	zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
2029	fossil_print("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
2030	hash_user_password(g.zLogin);
2031	}
2032	fossil_free(zMainBranch);
2033	}
2034

	--- src/import.c
	+++ src/import.c
	@@ -1319,11 +1319,10 @@
1319	db_multi_exec("INSERT INTO xbranches (tname, ttype) VALUES(%Q, %d)",
1320	zBranch, *type);
1321	branchId = db_last_insert_rowid();
1322	}
1323	}

1324	return branchId;
1325	}
1326
1327	/*
1328	** Insert content of corresponding content blob into the database.
	@@ -2027,7 +2026,6 @@
2026	fossil_print("server-id: %s\n", db_get("server-code", 0));
2027	zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
2028	fossil_print("admin-user: %s (password is \"%s\")\n", g.zLogin, zPassword);
2029	hash_user_password(g.zLogin);
2030	}

2031	}
2032

M src/info.c

-2

		--- src/info.c
		+++ src/info.c
		@@ -1157,11 +1157,10 @@
1157	1157	if( g.anon.Write ){
1158	1158	@ \| %z(href("%R/ci_edit?r=%!S",zUuid))edit</a>
1159	1159	}
1160	1160	@ </td>
1161	1161	@ </tr>
1162		- fossil_free(zMainBranch);
1163	1162	}
1164	1163	@ </table>
1165	1164	blob_reset(&wiki_read_links);
1166	1165	blob_reset(&wiki_add_links);
1167	1166	}else{
		@@ -3763,11 +3762,10 @@
3763	3762	@ <p>The timestamp on the tag used to make the changes above
3764	3763	@ will be overridden as: %s(date_in_standard_format(zChngTime))</p>
3765	3764	}
3766	3765	@ </blockquote>
3767	3766	@ <hr>
3768		- fossil_free(zMainBranch);
3769	3767	blob_reset(&suffix);
3770	3768	}
3771	3769	@ <p>Make changes to attributes of check-in
3772	3770	@ [%z(href("%R/ci/%!S",zUuid))%s(zUuid)</a>]:</p>
3773	3771	form_begin(0, "%R/ci_edit");
3774	3772

	--- src/info.c
	+++ src/info.c
	@@ -1157,11 +1157,10 @@
1157	if( g.anon.Write ){
1158	@ \| %z(href("%R/ci_edit?r=%!S",zUuid))edit</a>
1159	}
1160	@ </td>
1161	@ </tr>
1162	fossil_free(zMainBranch);
1163	}
1164	@ </table>
1165	blob_reset(&wiki_read_links);
1166	blob_reset(&wiki_add_links);
1167	}else{
	@@ -3763,11 +3762,10 @@
3763	@ <p>The timestamp on the tag used to make the changes above
3764	@ will be overridden as: %s(date_in_standard_format(zChngTime))</p>
3765	}
3766	@ </blockquote>
3767	@ <hr>
3768	fossil_free(zMainBranch);
3769	blob_reset(&suffix);
3770	}
3771	@ <p>Make changes to attributes of check-in
3772	@ [%z(href("%R/ci/%!S",zUuid))%s(zUuid)</a>]:</p>
3773	form_begin(0, "%R/ci_edit");
3774

	--- src/info.c
	+++ src/info.c
	@@ -1157,11 +1157,10 @@
1157	if( g.anon.Write ){
1158	@ \| %z(href("%R/ci_edit?r=%!S",zUuid))edit</a>
1159	}
1160	@ </td>
1161	@ </tr>

1162	}
1163	@ </table>
1164	blob_reset(&wiki_read_links);
1165	blob_reset(&wiki_add_links);
1166	}else{
	@@ -3763,11 +3762,10 @@
3762	@ <p>The timestamp on the tag used to make the changes above
3763	@ will be overridden as: %s(date_in_standard_format(zChngTime))</p>
3764	}
3765	@ </blockquote>
3766	@ <hr>

3767	blob_reset(&suffix);
3768	}
3769	@ <p>Make changes to attributes of check-in
3770	@ [%z(href("%R/ci/%!S",zUuid))%s(zUuid)</a>]:</p>
3771	form_begin(0, "%R/ci_edit");
3772

M src/json_branch.c

-2

		--- src/json_branch.c
		+++ src/json_branch.c
		@@ -367,12 +367,10 @@
367	367	cson_object_set(pay,"basis",json_new_string(opt.zBasis));
368	368	cson_object_set(pay,"rid",json_new_int(rid));
369	369	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
370	370	cson_object_set(pay,"uuid", json_new_string(zUuid));
371	371	cson_object_set(pay, "isPrivate", cson_value_new_bool(opt.isPrivate));
372		- fossil_free(zMainBranch);
373		- fossil_free(zUuid);
374	372	if(opt.zColor){
375	373	cson_object_set(pay,"bgColor",json_new_string(opt.zColor));
376	374	}
377	375
378	376	goto ok;
379	377

	--- src/json_branch.c
	+++ src/json_branch.c
	@@ -367,12 +367,10 @@
367	cson_object_set(pay,"basis",json_new_string(opt.zBasis));
368	cson_object_set(pay,"rid",json_new_int(rid));
369	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
370	cson_object_set(pay,"uuid", json_new_string(zUuid));
371	cson_object_set(pay, "isPrivate", cson_value_new_bool(opt.isPrivate));
372	fossil_free(zMainBranch);
373	fossil_free(zUuid);
374	if(opt.zColor){
375	cson_object_set(pay,"bgColor",json_new_string(opt.zColor));
376	}
377
378	goto ok;
379

	--- src/json_branch.c
	+++ src/json_branch.c
	@@ -367,12 +367,10 @@
367	cson_object_set(pay,"basis",json_new_string(opt.zBasis));
368	cson_object_set(pay,"rid",json_new_int(rid));
369	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
370	cson_object_set(pay,"uuid", json_new_string(zUuid));
371	cson_object_set(pay, "isPrivate", cson_value_new_bool(opt.isPrivate));


372	if(opt.zColor){
373	cson_object_set(pay,"bgColor",json_new_string(opt.zColor));
374	}
375
376	goto ok;
377

M src/rebuild.c

-1

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -366,11 +366,10 @@
366	366	/* Add the trunk tag to the root of the whole tree */
367	367	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
368	368	if( zUuid==0 ) return;
369	369	tag_add_artifact("sym-", zMainBranch, zUuid, 0, 2, 0, 0);
370	370	tag_add_artifact("", "branch", zUuid, zMainBranch, 2, 0, 0);
371		- fossil_free(zMainBranch);
372	371	}
373	372
374	373	/*
375	374	** Core function to rebuild the information in the derived tables of a
376	375	** fossil repository from the blobs. This function is shared between
377	376

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -366,11 +366,10 @@
366	/* Add the trunk tag to the root of the whole tree */
367	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
368	if( zUuid==0 ) return;
369	tag_add_artifact("sym-", zMainBranch, zUuid, 0, 2, 0, 0);
370	tag_add_artifact("", "branch", zUuid, zMainBranch, 2, 0, 0);
371	fossil_free(zMainBranch);
372	}
373
374	/*
375	** Core function to rebuild the information in the derived tables of a
376	** fossil repository from the blobs. This function is shared between
377

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -366,11 +366,10 @@
366	/* Add the trunk tag to the root of the whole tree */
367	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
368	if( zUuid==0 ) return;
369	tag_add_artifact("sym-", zMainBranch, zUuid, 0, 2, 0, 0);
370	tag_add_artifact("", "branch", zUuid, zMainBranch, 2, 0, 0);

371	}
372
373	/*
374	** Core function to rebuild the information in the derived tables of a
375	** fossil repository from the blobs. This function is shared between
376

M src/search.c

-2

		--- src/search.c
		+++ src/search.c
		@@ -884,11 +884,10 @@
884	884	zBranch, zBranch, zBranch, glob_expr("foci.filename", zDocGlob)
885	885	);
886	886	}
887	887	glob_free(pGlob);
888	888	}
889		- fossil_free(zMainBranch);
890	889	fossil_free(zDocGlob);
891	890	fossil_free(zDocBr);
892	891	}
893	892	if( (srchFlags & SRCH_WIKI)!=0 ){
894	893	db_multi_exec(
		@@ -2046,11 +2045,10 @@
2046	2045	" bx=NULL,"
2047	2046	" label='Document: '\|\|label"
2048	2047	" WHERE type='d' AND NOT idxed"
2049	2048	);
2050	2049	}
2051		- fossil_free(zMainBranch);
2052	2050	glob_free(pGlob);
2053	2051	}
2054	2052
2055	2053	/*
2056	2054	** Deal with all of the unindexed 'c' terms in FTSDOCS
2057	2055

	--- src/search.c
	+++ src/search.c
	@@ -884,11 +884,10 @@
884	zBranch, zBranch, zBranch, glob_expr("foci.filename", zDocGlob)
885	);
886	}
887	glob_free(pGlob);
888	}
889	fossil_free(zMainBranch);
890	fossil_free(zDocGlob);
891	fossil_free(zDocBr);
892	}
893	if( (srchFlags & SRCH_WIKI)!=0 ){
894	db_multi_exec(
	@@ -2046,11 +2045,10 @@
2046	" bx=NULL,"
2047	" label='Document: '\|\|label"
2048	" WHERE type='d' AND NOT idxed"
2049	);
2050	}
2051	fossil_free(zMainBranch);
2052	glob_free(pGlob);
2053	}
2054
2055	/*
2056	** Deal with all of the unindexed 'c' terms in FTSDOCS
2057

	--- src/search.c
	+++ src/search.c
	@@ -884,11 +884,10 @@
884	zBranch, zBranch, zBranch, glob_expr("foci.filename", zDocGlob)
885	);
886	}
887	glob_free(pGlob);
888	}

889	fossil_free(zDocGlob);
890	fossil_free(zDocBr);
891	}
892	if( (srchFlags & SRCH_WIKI)!=0 ){
893	db_multi_exec(
	@@ -2046,11 +2045,10 @@
2045	" bx=NULL,"
2046	" label='Document: '\|\|label"
2047	" WHERE type='d' AND NOT idxed"
2048	);
2049	}

2050	glob_free(pGlob);
2051	}
2052
2053	/*
2054	** Deal with all of the unindexed 'c' terms in FTSDOCS
2055

M src/setup.c

-1

		--- src/setup.c
		+++ src/setup.c
		@@ -2371,11 +2371,10 @@
2371	2371	@ larger repositories.</p>
2372	2372	select_fts_tokenizer();
2373	2373	@ <p><input type="submit" name="fts1" value="Create A Full-Text Index">
2374	2374	}
2375	2375	@ </div></form>
2376		- fossil_free(zMainBranch);
2377	2376	style_finish_page();
2378	2377	}
2379	2378
2380	2379	/*
2381	2380	** A URL Alias originally called zOldName is now zNewName/zValue.
2382	2381

	--- src/setup.c
	+++ src/setup.c
	@@ -2371,11 +2371,10 @@
2371	@ larger repositories.</p>
2372	select_fts_tokenizer();
2373	@ <p><input type="submit" name="fts1" value="Create A Full-Text Index">
2374	}
2375	@ </div></form>
2376	fossil_free(zMainBranch);
2377	style_finish_page();
2378	}
2379
2380	/*
2381	** A URL Alias originally called zOldName is now zNewName/zValue.
2382

	--- src/setup.c
	+++ src/setup.c
	@@ -2371,11 +2371,10 @@
2371	@ larger repositories.</p>
2372	select_fts_tokenizer();
2373	@ <p><input type="submit" name="fts1" value="Create A Full-Text Index">
2374	}
2375	@ </div></form>

2376	style_finish_page();
2377	}
2378
2379	/*
2380	** A URL Alias originally called zOldName is now zNewName/zValue.
2381

M src/tar.c

-1

		--- src/tar.c
		+++ src/tar.c
		@@ -1035,11 +1035,10 @@
1035	1035	tarball_of_checkin(rid, &tarball, zName, pInclude, pExclude, 0);
1036	1036	cache_write(&tarball, zKey);
1037	1037	}
1038	1038	glob_free(pInclude);
1039	1039	glob_free(pExclude);
1040		- fossil_free(zMainBranch);
1041	1040	fossil_free(zName);
1042	1041	fossil_free(zRid);
1043	1042	g.zOpenRevision = 0;
1044	1043	blob_reset(&cacheKey);
1045	1044	cgi_set_content(&tarball);
1046	1045

	--- src/tar.c
	+++ src/tar.c
	@@ -1035,11 +1035,10 @@
1035	tarball_of_checkin(rid, &tarball, zName, pInclude, pExclude, 0);
1036	cache_write(&tarball, zKey);
1037	}
1038	glob_free(pInclude);
1039	glob_free(pExclude);
1040	fossil_free(zMainBranch);
1041	fossil_free(zName);
1042	fossil_free(zRid);
1043	g.zOpenRevision = 0;
1044	blob_reset(&cacheKey);
1045	cgi_set_content(&tarball);
1046

	--- src/tar.c
	+++ src/tar.c
	@@ -1035,11 +1035,10 @@
1035	tarball_of_checkin(rid, &tarball, zName, pInclude, pExclude, 0);
1036	cache_write(&tarball, zKey);
1037	}
1038	glob_free(pInclude);
1039	glob_free(pExclude);

1040	fossil_free(zName);
1041	fossil_free(zRid);
1042	g.zOpenRevision = 0;
1043	blob_reset(&cacheKey);
1044	cgi_set_content(&tarball);
1045

M src/timeline.c

-1

		--- src/timeline.c
		+++ src/timeline.c
		@@ -640,11 +640,10 @@
640	640	** not actually draw anything on the graph, but it will set the
641	641	** background color of the timeline entry */
642	642	gidx = graph_add_row(pGraph, rid, -1, 0, 0, zBr, zBgClr, zUuid, 0);
643	643	@ <div id="m%d(gidx)" class="tl-nodemark"></div>
644	644	}
645		- fossil_free(zMainBranch);
646	645	fossil_free(zBr);
647	646	@</td>
648	647	if( !isSelectedOrCurrent ){
649	648	@ <td class="timeline%s(zStyle)Cell%s(zExtraClass)" id='mc%d(gidx)'>
650	649	}else{
651	650

	--- src/timeline.c
	+++ src/timeline.c
	@@ -640,11 +640,10 @@
640	** not actually draw anything on the graph, but it will set the
641	** background color of the timeline entry */
642	gidx = graph_add_row(pGraph, rid, -1, 0, 0, zBr, zBgClr, zUuid, 0);
643	@ <div id="m%d(gidx)" class="tl-nodemark"></div>
644	}
645	fossil_free(zMainBranch);
646	fossil_free(zBr);
647	@</td>
648	if( !isSelectedOrCurrent ){
649	@ <td class="timeline%s(zStyle)Cell%s(zExtraClass)" id='mc%d(gidx)'>
650	}else{
651

	--- src/timeline.c
	+++ src/timeline.c
	@@ -640,11 +640,10 @@
640	** not actually draw anything on the graph, but it will set the
641	** background color of the timeline entry */
642	gidx = graph_add_row(pGraph, rid, -1, 0, 0, zBr, zBgClr, zUuid, 0);
643	@ <div id="m%d(gidx)" class="tl-nodemark"></div>
644	}

645	fossil_free(zBr);
646	@</td>
647	if( !isSelectedOrCurrent ){
648	@ <td class="timeline%s(zStyle)Cell%s(zExtraClass)" id='mc%d(gidx)'>
649	}else{
650

M src/update.c

-1

		--- src/update.c
		+++ src/update.c
		@@ -758,11 +758,10 @@
758	758	/* Determine the check-in manifest artifact ID. Panic on failure. */
759	759	if( zRevision ){
760	760	vid = name_to_typed_rid(zRevision, "ci");
761	761	}else if( !g.localOpen ){
762	762	vid = name_to_typed_rid(zMainBranch, "ci");
763		- fossil_free(zMainBranch);
764	763	}else{
765	764	vid = db_lget_int("checkout", 0);
766	765	if( !is_a_version(vid) ){
767	766	if( vid==0 ) return 0;
768	767	zRevision = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
769	768

	--- src/update.c
	+++ src/update.c
	@@ -758,11 +758,10 @@
758	/* Determine the check-in manifest artifact ID. Panic on failure. */
759	if( zRevision ){
760	vid = name_to_typed_rid(zRevision, "ci");
761	}else if( !g.localOpen ){
762	vid = name_to_typed_rid(zMainBranch, "ci");
763	fossil_free(zMainBranch);
764	}else{
765	vid = db_lget_int("checkout", 0);
766	if( !is_a_version(vid) ){
767	if( vid==0 ) return 0;
768	zRevision = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
769

	--- src/update.c
	+++ src/update.c
	@@ -758,11 +758,10 @@
758	/* Determine the check-in manifest artifact ID. Panic on failure. */
759	if( zRevision ){
760	vid = name_to_typed_rid(zRevision, "ci");
761	}else if( !g.localOpen ){
762	vid = name_to_typed_rid(zMainBranch, "ci");

763	}else{
764	vid = db_lget_int("checkout", 0);
765	if( !is_a_version(vid) ){
766	if( vid==0 ) return 0;
767	zRevision = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
768

M src/zip.c

-1

		--- src/zip.c
		+++ src/zip.c
		@@ -1124,11 +1124,10 @@
1124	1124	zip_of_checkin(eType, rid, &zip, zName, pInclude, pExclude, 0);
1125	1125	cache_write(&zip, zKey);
1126	1126	}
1127	1127	glob_free(pInclude);
1128	1128	glob_free(pExclude);
1129		- fossil_free(zMainBranch);
1130	1129	fossil_free(zName);
1131	1130	fossil_free(zRid);
1132	1131	g.zOpenRevision = 0;
1133	1132	blob_reset(&cacheKey);
1134	1133	cgi_set_content(&zip);
1135	1134

	--- src/zip.c
	+++ src/zip.c
	@@ -1124,11 +1124,10 @@
1124	zip_of_checkin(eType, rid, &zip, zName, pInclude, pExclude, 0);
1125	cache_write(&zip, zKey);
1126	}
1127	glob_free(pInclude);
1128	glob_free(pExclude);
1129	fossil_free(zMainBranch);
1130	fossil_free(zName);
1131	fossil_free(zRid);
1132	g.zOpenRevision = 0;
1133	blob_reset(&cacheKey);
1134	cgi_set_content(&zip);
1135

	--- src/zip.c
	+++ src/zip.c
	@@ -1124,11 +1124,10 @@
1124	zip_of_checkin(eType, rid, &zip, zName, pInclude, pExclude, 0);
1125	cache_write(&zip, zKey);
1126	}
1127	glob_free(pInclude);
1128	glob_free(pExclude);

1129	fossil_free(zName);
1130	fossil_free(zRid);
1131	g.zOpenRevision = 0;
1132	blob_reset(&cacheKey);
1133	cgi_set_content(&zip);
1134

Fossil SCM

Keyboard Shortcuts