Fossil SCM

Merged from trunk to pick up test case edits made there, along with recent cosmetic fixes.

rberteig 2016-01-27 01:28 rberteig-json-test merge
Commit 4e0e141e0d7249c1619ee5eb3ba441eecda037ec
Parent c4f8d88fd91a892…
4 files changed +2 +1 -9 +16 +17
~ src/checkin.c ~ src/printf.c ~ test/amend.test ~ test/revert.test
M src/checkin.c
+2
--- src/checkin.c
+++ src/checkin.c
@@ -396,10 +396,12 @@
396396
 if( zRev!=0 ){
397397
 db_find_and_open_repository(0, 0);
398398
 verify_all_options();
399399
 ls_cmd_rev(zRev,verboseFlag,showAge,timeOrder);
400400
 return;
401
+ }else if( find_option("R",0,1)!=0 ){
402
+ fossil_fatal("the -r is required in addition to -R");
401403
 }
402404
403405
 db_must_be_within_tree();
404406
 vid = db_lget_int("checkout", 0);
405407
 if( timeOrder ){
406408
--- src/checkin.c
+++ src/checkin.c
@@ -396,10 +396,12 @@
396 if( zRev!=0 ){
397 db_find_and_open_repository(0, 0);
398 verify_all_options();
399 ls_cmd_rev(zRev,verboseFlag,showAge,timeOrder);
400 return;
 
 
401 }
402
403 db_must_be_within_tree();
404 vid = db_lget_int("checkout", 0);
405 if( timeOrder ){
406
--- src/checkin.c
+++ src/checkin.c
@@ -396,10 +396,12 @@
396 if( zRev!=0 ){
397 db_find_and_open_repository(0, 0);
398 verify_all_options();
399 ls_cmd_rev(zRev,verboseFlag,showAge,timeOrder);
400 return;
401 }else if( find_option("R",0,1)!=0 ){
402 fossil_fatal("the -r is required in addition to -R");
403 }
404
405 db_must_be_within_tree();
406 vid = db_lget_int("checkout", 0);
407 if( timeOrder ){
408
M src/printf.c
+1 -9
--- src/printf.c
+++ src/printf.c
@@ -232,19 +232,11 @@
232232
233233
 /*
234234
 ** The root program. All variations call this core.
235235
 **
236236
 ** INPUTS:
237
-** func This is a pointer to a function taking three arguments
238
-** 1. A pointer to anything. Same as the "arg" parameter.
239
-** 2. A pointer to the list of characters to be output
240
-** (Note, this list is NOT null terminated.)
241
-** 3. An integer number of characters to be output.
242
-** (Note: This number might be zero.)
243
-**
244
-** arg This is the pointer to anything which will be passed as the
245
-** first argument to "func". Use it for whatever you like.
237
+** pBlob This is the blob where the output will be built.
246238
 **
247239
 ** fmt This is the format string, as in the usual print.
248240
 **
249241
 ** ap This is a pointer to a list of arguments. Same as in
250242
 ** vfprint.
251243
--- src/printf.c
+++ src/printf.c
@@ -232,19 +232,11 @@
232
233 /*
234 ** The root program. All variations call this core.
235 **
236 ** INPUTS:
237 ** func This is a pointer to a function taking three arguments
238 ** 1. A pointer to anything. Same as the "arg" parameter.
239 ** 2. A pointer to the list of characters to be output
240 ** (Note, this list is NOT null terminated.)
241 ** 3. An integer number of characters to be output.
242 ** (Note: This number might be zero.)
243 **
244 ** arg This is the pointer to anything which will be passed as the
245 ** first argument to "func". Use it for whatever you like.
246 **
247 ** fmt This is the format string, as in the usual print.
248 **
249 ** ap This is a pointer to a list of arguments. Same as in
250 ** vfprint.
251
--- src/printf.c
+++ src/printf.c
@@ -232,19 +232,11 @@
232
233 /*
234 ** The root program. All variations call this core.
235 **
236 ** INPUTS:
237 ** pBlob This is the blob where the output will be built.
 
 
 
 
 
 
 
 
238 **
239 ** fmt This is the format string, as in the usual print.
240 **
241 ** ap This is a pointer to a list of arguments. Same as in
242 ** vfprint.
243
M test/amend.test
+16
--- test/amend.test
+++ test/amend.test
@@ -1,6 +1,22 @@
11
 #
2
+# Copyright (c) 2015 D. Richard Hipp
3
+#
4
+# This program is free software; you can redistribute it and/or
5
+# modify it under the terms of the Simplified BSD License (also
6
+# known as the "2-Clause License" or "FreeBSD License".)
7
+#
8
+# This program is distributed in the hope that it will be useful,
9
+# but without any warranty; without even the implied warranty of
10
+# merchantability or fitness for a particular purpose.
11
+#
12
+# Author contact information:
13
+# [email protected]
14
+# http://www.hwaci.com/drh/
15
+#
16
+############################################################################
17
+#
218
 # Tests for the "amend" command.
319
 #
420
521
 proc short_uuid {uuid {len 10}} {
622
 string range $uuid 0 $len-1
723
--- test/amend.test
+++ test/amend.test
@@ -1,6 +1,22 @@
1 #
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2 # Tests for the "amend" command.
3 #
4
5 proc short_uuid {uuid {len 10}} {
6 string range $uuid 0 $len-1
7
--- test/amend.test
+++ test/amend.test
@@ -1,6 +1,22 @@
1 #
2 # Copyright (c) 2015 D. Richard Hipp
3 #
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the Simplified BSD License (also
6 # known as the "2-Clause License" or "FreeBSD License".)
7 #
8 # This program is distributed in the hope that it will be useful,
9 # but without any warranty; without even the implied warranty of
10 # merchantability or fitness for a particular purpose.
11 #
12 # Author contact information:
13 # [email protected]
14 # http://www.hwaci.com/drh/
15 #
16 ############################################################################
17 #
18 # Tests for the "amend" command.
19 #
20
21 proc short_uuid {uuid {len 10}} {
22 string range $uuid 0 $len-1
23
M test/revert.test
+17
--- test/revert.test
+++ test/revert.test
@@ -1,5 +1,22 @@
1
+#
2
+# Copyright (c) 2013 D. Richard Hipp
3
+#
4
+# This program is free software; you can redistribute it and/or
5
+# modify it under the terms of the Simplified BSD License (also
6
+# known as the "2-Clause License" or "FreeBSD License".)
7
+#
8
+# This program is distributed in the hope that it will be useful,
9
+# but without any warranty; without even the implied warranty of
10
+# merchantability or fitness for a particular purpose.
11
+#
12
+# Author contact information:
13
+# [email protected]
14
+# http://www.hwaci.com/drh/
15
+#
16
+############################################################################
17
+#
118
 #
219
 # Tests for 'fossil revert'
320
 #
421
 #
522
623
--- test/revert.test
+++ test/revert.test
@@ -1,5 +1,22 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1 #
2 # Tests for 'fossil revert'
3 #
4 #
5
6
--- test/revert.test
+++ test/revert.test
@@ -1,5 +1,22 @@
1 #
2 # Copyright (c) 2013 D. Richard Hipp
3 #
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the Simplified BSD License (also
6 # known as the "2-Clause License" or "FreeBSD License".)
7 #
8 # This program is distributed in the hope that it will be useful,
9 # but without any warranty; without even the implied warranty of
10 # merchantability or fitness for a particular purpose.
11 #
12 # Author contact information:
13 # [email protected]
14 # http://www.hwaci.com/drh/
15 #
16 ############################################################################
17 #
18 #
19 # Tests for 'fossil revert'
20 #
21 #
22
23

Keyboard Shortcuts

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