b5edfa3b3cf… — Fossil SCM

M src/diffcmd.c

+3 -1

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -797,10 +797,11 @@
797	797	** Options:
798	798	** --binary PATTERN Treat files that match the glob PATTERN as binary
799	799	** --branch BRANCH Show diff of all changes on BRANCH
800	800	** --brief Show filenames only
801	801	** --checkin VERSION Show diff of all changes in VERSION
	802	+** --command PROG External diff program - overrides "diff-command"
802	803	** --context\|-c N Use N lines of context
803	804	** --diff-binary BOOL Include binary files when using external commands
804	805	** --exec-abs-paths Force absolute path names with external commands.
805	806	** --exec-rel-paths Force relative path names with external commands.
806	807	** --from\|-r VERSION Select VERSION as source for the diff
		@@ -868,11 +869,12 @@
868	869	fossil_fatal("must use --from if --to is present");
869	870	}else{
870	871	db_find_and_open_repository(0, 0);
871	872	}
872	873	if( !isInternDiff ){
873		- zDiffCmd = diff_command_external(isGDiff);
	874	+ zDiffCmd = find_option("command", 0, 1);
	875	+ if( zDiffCmd==0 ) zDiffCmd = diff_command_external(isGDiff);
874	876	}
875	877	zBinGlob = diff_get_binary_glob();
876	878	fIncludeBinary = diff_include_binary_files();
877	879	determine_exec_relative_option(1);
878	880	verify_all_options();
879	881

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -797,10 +797,11 @@
797	** Options:
798	** --binary PATTERN Treat files that match the glob PATTERN as binary
799	** --branch BRANCH Show diff of all changes on BRANCH
800	** --brief Show filenames only
801	** --checkin VERSION Show diff of all changes in VERSION

802	** --context\|-c N Use N lines of context
803	** --diff-binary BOOL Include binary files when using external commands
804	** --exec-abs-paths Force absolute path names with external commands.
805	** --exec-rel-paths Force relative path names with external commands.
806	** --from\|-r VERSION Select VERSION as source for the diff
	@@ -868,11 +869,12 @@
868	fossil_fatal("must use --from if --to is present");
869	}else{
870	db_find_and_open_repository(0, 0);
871	}
872	if( !isInternDiff ){
873	zDiffCmd = diff_command_external(isGDiff);

874	}
875	zBinGlob = diff_get_binary_glob();
876	fIncludeBinary = diff_include_binary_files();
877	determine_exec_relative_option(1);
878	verify_all_options();
879

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -797,10 +797,11 @@
797	** Options:
798	** --binary PATTERN Treat files that match the glob PATTERN as binary
799	** --branch BRANCH Show diff of all changes on BRANCH
800	** --brief Show filenames only
801	** --checkin VERSION Show diff of all changes in VERSION
802	** --command PROG External diff program - overrides "diff-command"
803	** --context\|-c N Use N lines of context
804	** --diff-binary BOOL Include binary files when using external commands
805	** --exec-abs-paths Force absolute path names with external commands.
806	** --exec-rel-paths Force relative path names with external commands.
807	** --from\|-r VERSION Select VERSION as source for the diff
	@@ -868,11 +869,12 @@
869	fossil_fatal("must use --from if --to is present");
870	}else{
871	db_find_and_open_repository(0, 0);
872	}
873	if( !isInternDiff ){
874	zDiffCmd = find_option("command", 0, 1);
875	if( zDiffCmd==0 ) zDiffCmd = diff_command_external(isGDiff);
876	}
877	zBinGlob = diff_get_binary_glob();
878	fIncludeBinary = diff_include_binary_files();
879	determine_exec_relative_option(1);
880	verify_all_options();
881

M www/changes.wiki

+1 -1

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -3,11 +3,11 @@
3	3	<a name='v1_37'></a>
4	4	<h2>Changes for Version 1.37 (2017-XX-YY)</h2>
5	5
6	6	* Added support for the ms=EXACT\|LIKE\|GLOB\|REGEXP query parameter on the
7	7	[/help?cmd=/timeline\|/timeline] webpage.
8		- * Fix a C89-ism that previous the 1.36 release from building with MSVC.
	8	+ * Fix a C99-ism that prevents the 1.36 release from building with MSVC.
9	9
10	10	<a name='v1_36'></a>
11	11	<h2>Changes for Version 1.36 (2016-10-24)</h2>
12	12
13	13	* Add support for [./unvers.wiki\|unversioned content],
14	14

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -3,11 +3,11 @@
3	<a name='v1_37'></a>
4	<h2>Changes for Version 1.37 (2017-XX-YY)</h2>
5
6	* Added support for the ms=EXACT\|LIKE\|GLOB\|REGEXP query parameter on the
7	[/help?cmd=/timeline\|/timeline] webpage.
8	* Fix a C89-ism that previous the 1.36 release from building with MSVC.
9
10	<a name='v1_36'></a>
11	<h2>Changes for Version 1.36 (2016-10-24)</h2>
12
13	* Add support for [./unvers.wiki\|unversioned content],
14

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -3,11 +3,11 @@
3	<a name='v1_37'></a>
4	<h2>Changes for Version 1.37 (2017-XX-YY)</h2>
5
6	* Added support for the ms=EXACT\|LIKE\|GLOB\|REGEXP query parameter on the
7	[/help?cmd=/timeline\|/timeline] webpage.
8	* Fix a C99-ism that prevents the 1.36 release from building with MSVC.
9
10	<a name='v1_36'></a>
11	<h2>Changes for Version 1.36 (2016-10-24)</h2>
12
13	* Add support for [./unvers.wiki\|unversioned content],
14

M www/changes.wiki

+1 -1

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -3,11 +3,11 @@
3	3	<a name='v1_37'></a>
4	4	<h2>Changes for Version 1.37 (2017-XX-YY)</h2>
5	5
6	6	* Added support for the ms=EXACT\|LIKE\|GLOB\|REGEXP query parameter on the
7	7	[/help?cmd=/timeline\|/timeline] webpage.
8		- * Fix a C89-ism that previous the 1.36 release from building with MSVC.
	8	+ * Fix a C99-ism that prevents the 1.36 release from building with MSVC.
9	9
10	10	<a name='v1_36'></a>
11	11	<h2>Changes for Version 1.36 (2016-10-24)</h2>
12	12
13	13	* Add support for [./unvers.wiki\|unversioned content],
14	14

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -3,11 +3,11 @@
3	<a name='v1_37'></a>
4	<h2>Changes for Version 1.37 (2017-XX-YY)</h2>
5
6	* Added support for the ms=EXACT\|LIKE\|GLOB\|REGEXP query parameter on the
7	[/help?cmd=/timeline\|/timeline] webpage.
8	* Fix a C89-ism that previous the 1.36 release from building with MSVC.
9
10	<a name='v1_36'></a>
11	<h2>Changes for Version 1.36 (2016-10-24)</h2>
12
13	* Add support for [./unvers.wiki\|unversioned content],
14

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -3,11 +3,11 @@
3	<a name='v1_37'></a>
4	<h2>Changes for Version 1.37 (2017-XX-YY)</h2>
5
6	* Added support for the ms=EXACT\|LIKE\|GLOB\|REGEXP query parameter on the
7	[/help?cmd=/timeline\|/timeline] webpage.
8	* Fix a C99-ism that prevents the 1.36 release from building with MSVC.
9
10	<a name='v1_36'></a>
11	<h2>Changes for Version 1.36 (2016-10-24)</h2>
12
13	* Add support for [./unvers.wiki\|unversioned content],
14

M www/index.wiki

+1 -1

		--- www/index.wiki
		+++ www/index.wiki
		@@ -2,11 +2,11 @@
2	2
3	3	<h3>What Is Fossil?</h3>
4	4
5	5	<div style='width:200px;float:right;border:2px solid #446979;padding:10px;margin:0px 10px;'>
6	6	<ul>
7		-<li> [http://www.fossil-scm.org/download.html \| Download]
	7	+<li> [/uv/download.html \| Download]
8	8	<li> [./quickstart.wiki \| Quick Start]
9	9	<li> [./build.wiki \| Install]
10	10	<li> [../COPYRIGHT-BSD2.txt \| License]
11	11	<li> [./faq.wiki \| FAQ]
12	12	<li> [./changes.wiki \| Change Log]
13	13

	--- www/index.wiki
	+++ www/index.wiki
	@@ -2,11 +2,11 @@
2
3	<h3>What Is Fossil?</h3>
4
5	<div style='width:200px;float:right;border:2px solid #446979;padding:10px;margin:0px 10px;'>
6	<ul>
7	<li> [http://www.fossil-scm.org/download.html \| Download]
8	<li> [./quickstart.wiki \| Quick Start]
9	<li> [./build.wiki \| Install]
10	<li> [../COPYRIGHT-BSD2.txt \| License]
11	<li> [./faq.wiki \| FAQ]
12	<li> [./changes.wiki \| Change Log]
13

	--- www/index.wiki
	+++ www/index.wiki
	@@ -2,11 +2,11 @@
2
3	<h3>What Is Fossil?</h3>
4
5	<div style='width:200px;float:right;border:2px solid #446979;padding:10px;margin:0px 10px;'>
6	<ul>
7	<li> [/uv/download.html \| Download]
8	<li> [./quickstart.wiki \| Quick Start]
9	<li> [./build.wiki \| Install]
10	<li> [../COPYRIGHT-BSD2.txt \| License]
11	<li> [./faq.wiki \| FAQ]
12	<li> [./changes.wiki \| Change Log]
13

M www/mkdownload.tcl

+1 -2

		--- www/mkdownload.tcl
		+++ www/mkdownload.tcl
		@@ -7,12 +7,11 @@
7	7	#
8	8	#
9	9	set out [open download.html w]
10	10	fconfigure $out -encoding utf-8 -translation lf
11	11	puts $out \
12		-{<!DOCTYPE html>
13		-<div class='fossil-doc' data-title='Download Page'>
	12	+{<div class='fossil-doc' data-title='Download Page'>
14	13
15	14	<center><font size=4>}
16	15	puts $out \
17	16	"<b>To install Fossil →</b> download the stand-alone executable"
18	17	puts $out \
19	18

	--- www/mkdownload.tcl
	+++ www/mkdownload.tcl
	@@ -7,12 +7,11 @@
7	#
8	#
9	set out [open download.html w]
10	fconfigure $out -encoding utf-8 -translation lf
11	puts $out \
12	{<!DOCTYPE html>
13	<div class='fossil-doc' data-title='Download Page'>
14
15	<center><font size=4>}
16	puts $out \
17	"<b>To install Fossil →</b> download the stand-alone executable"
18	puts $out \
19

	--- www/mkdownload.tcl
	+++ www/mkdownload.tcl
	@@ -7,12 +7,11 @@
7	#
8	#
9	set out [open download.html w]
10	fconfigure $out -encoding utf-8 -translation lf
11	puts $out \
12	{<div class='fossil-doc' data-title='Download Page'>

13
14	<center><font size=4>}
15	puts $out \
16	"<b>To install Fossil →</b> download the stand-alone executable"
17	puts $out \
18

Fossil SCM

Keyboard Shortcuts