Fossil SCM

Merge updates from trunk. Add 'th1-uri-regexp' to the common TH1 configuration settings.

mistachkin 2013-10-18 07:50 tkt-change-hook merge
Commit 9e4a3bc67bded71ff4c63157fa482075e8ca7799
Parent 2438518e66661ff…
3 files changed +1 -1 +11 -3 +11 -3
~ src/allrepo.c ~ src/configure.c ~ src/configure.c
M src/allrepo.c
+1 -1
--- src/allrepo.c
+++ src/allrepo.c
@@ -226,11 +226,11 @@
226226
 }
227227
 db_end_transaction(0);
228228
 return;
229229
 }else{
230230
 fossil_fatal("\"all\" subcommand should be one of: "
231
- "changes ignore list ls push pull rebuild sync");
231
+ "changes clean extra ignore list ls push pull rebuild sync");
232232
 }
233233
 verify_all_options();
234234
 zFossil = quoteFilename(g.nameOfExe);
235235
 if( useCheckouts ){
236236
 db_prepare(&q,
237237
--- src/allrepo.c
+++ src/allrepo.c
@@ -226,11 +226,11 @@
226 }
227 db_end_transaction(0);
228 return;
229 }else{
230 fossil_fatal("\"all\" subcommand should be one of: "
231 "changes ignore list ls push pull rebuild sync");
232 }
233 verify_all_options();
234 zFossil = quoteFilename(g.nameOfExe);
235 if( useCheckouts ){
236 db_prepare(&q,
237
--- src/allrepo.c
+++ src/allrepo.c
@@ -226,11 +226,11 @@
226 }
227 db_end_transaction(0);
228 return;
229 }else{
230 fossil_fatal("\"all\" subcommand should be one of: "
231 "changes clean extra ignore list ls push pull rebuild sync");
232 }
233 verify_all_options();
234 zFossil = quoteFilename(g.nameOfExe);
235 if( useCheckouts ){
236 db_prepare(&q,
237
M src/configure.c
+11 -3
--- src/configure.c
+++ src/configure.c
@@ -41,10 +41,17 @@
4141
 #define CONFIGSET_ALL 0x0000ff /* Everything */
4242
4343
 #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
4444
 #define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */
4545
46
+/*
47
+** This mask is used for the common TH1 configuration settings (i.e. those
48
+** that are not specific to one particular subsystem, such as the transfer
49
+** subsystem).
50
+*/
51
+#define CONFIGSET_TH1 (CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER)
52
+
4653
 #endif /* INTERFACE */
4754
4855
 /*
4956
 ** Names of the configuration sets
5057
 */
@@ -90,15 +97,16 @@
9097
 { "timeline-max-comment", CONFIGSET_SKIN },
9198
 { "timeline-plaintext", CONFIGSET_SKIN },
9299
 { "adunit", CONFIGSET_SKIN },
93100
 { "adunit-omit-if-admin", CONFIGSET_SKIN },
94101
 { "adunit-omit-if-user", CONFIGSET_SKIN },
95
- { "th1-setup", CONFIGSET_ALL },
102
+ { "th1-setup", CONFIGSET_TH1 },
103
+ { "th1-uri-regexp", CONFIGSET_TH1 },
96104
97105
 #ifdef FOSSIL_ENABLE_TCL
98
- { "tcl", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER },
99
- { "tcl-setup", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER },
106
+ { "tcl", CONFIGSET_TH1 },
107
+ { "tcl-setup", CONFIGSET_TH1 },
100108
 #endif
101109
102110
 { "project-name", CONFIGSET_PROJ },
103111
 { "short-project-name", CONFIGSET_PROJ },
104112
 { "project-description", CONFIGSET_PROJ },
105113
--- src/configure.c
+++ src/configure.c
@@ -41,10 +41,17 @@
41 #define CONFIGSET_ALL 0x0000ff /* Everything */
42
43 #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
44 #define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */
45
 
 
 
 
 
 
 
46 #endif /* INTERFACE */
47
48 /*
49 ** Names of the configuration sets
50 */
@@ -90,15 +97,16 @@
90 { "timeline-max-comment", CONFIGSET_SKIN },
91 { "timeline-plaintext", CONFIGSET_SKIN },
92 { "adunit", CONFIGSET_SKIN },
93 { "adunit-omit-if-admin", CONFIGSET_SKIN },
94 { "adunit-omit-if-user", CONFIGSET_SKIN },
95 { "th1-setup", CONFIGSET_ALL },
 
96
97 #ifdef FOSSIL_ENABLE_TCL
98 { "tcl", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER },
99 { "tcl-setup", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER },
100 #endif
101
102 { "project-name", CONFIGSET_PROJ },
103 { "short-project-name", CONFIGSET_PROJ },
104 { "project-description", CONFIGSET_PROJ },
105
--- src/configure.c
+++ src/configure.c
@@ -41,10 +41,17 @@
41 #define CONFIGSET_ALL 0x0000ff /* Everything */
42
43 #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
44 #define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */
45
46 /*
47 ** This mask is used for the common TH1 configuration settings (i.e. those
48 ** that are not specific to one particular subsystem, such as the transfer
49 ** subsystem).
50 */
51 #define CONFIGSET_TH1 (CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER)
52
53 #endif /* INTERFACE */
54
55 /*
56 ** Names of the configuration sets
57 */
@@ -90,15 +97,16 @@
97 { "timeline-max-comment", CONFIGSET_SKIN },
98 { "timeline-plaintext", CONFIGSET_SKIN },
99 { "adunit", CONFIGSET_SKIN },
100 { "adunit-omit-if-admin", CONFIGSET_SKIN },
101 { "adunit-omit-if-user", CONFIGSET_SKIN },
102 { "th1-setup", CONFIGSET_TH1 },
103 { "th1-uri-regexp", CONFIGSET_TH1 },
104
105 #ifdef FOSSIL_ENABLE_TCL
106 { "tcl", CONFIGSET_TH1 },
107 { "tcl-setup", CONFIGSET_TH1 },
108 #endif
109
110 { "project-name", CONFIGSET_PROJ },
111 { "short-project-name", CONFIGSET_PROJ },
112 { "project-description", CONFIGSET_PROJ },
113
M src/configure.c
+11 -3
--- src/configure.c
+++ src/configure.c
@@ -41,10 +41,17 @@
4141
 #define CONFIGSET_ALL 0x0000ff /* Everything */
4242
4343
 #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
4444
 #define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */
4545
46
+/*
47
+** This mask is used for the common TH1 configuration settings (i.e. those
48
+** that are not specific to one particular subsystem, such as the transfer
49
+** subsystem).
50
+*/
51
+#define CONFIGSET_TH1 (CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER)
52
+
4653
 #endif /* INTERFACE */
4754
4855
 /*
4956
 ** Names of the configuration sets
5057
 */
@@ -90,15 +97,16 @@
9097
 { "timeline-max-comment", CONFIGSET_SKIN },
9198
 { "timeline-plaintext", CONFIGSET_SKIN },
9299
 { "adunit", CONFIGSET_SKIN },
93100
 { "adunit-omit-if-admin", CONFIGSET_SKIN },
94101
 { "adunit-omit-if-user", CONFIGSET_SKIN },
95
- { "th1-setup", CONFIGSET_ALL },
102
+ { "th1-setup", CONFIGSET_TH1 },
103
+ { "th1-uri-regexp", CONFIGSET_TH1 },
96104
97105
 #ifdef FOSSIL_ENABLE_TCL
98
- { "tcl", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER },
99
- { "tcl-setup", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER },
106
+ { "tcl", CONFIGSET_TH1 },
107
+ { "tcl-setup", CONFIGSET_TH1 },
100108
 #endif
101109
102110
 { "project-name", CONFIGSET_PROJ },
103111
 { "short-project-name", CONFIGSET_PROJ },
104112
 { "project-description", CONFIGSET_PROJ },
105113
--- src/configure.c
+++ src/configure.c
@@ -41,10 +41,17 @@
41 #define CONFIGSET_ALL 0x0000ff /* Everything */
42
43 #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
44 #define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */
45
 
 
 
 
 
 
 
46 #endif /* INTERFACE */
47
48 /*
49 ** Names of the configuration sets
50 */
@@ -90,15 +97,16 @@
90 { "timeline-max-comment", CONFIGSET_SKIN },
91 { "timeline-plaintext", CONFIGSET_SKIN },
92 { "adunit", CONFIGSET_SKIN },
93 { "adunit-omit-if-admin", CONFIGSET_SKIN },
94 { "adunit-omit-if-user", CONFIGSET_SKIN },
95 { "th1-setup", CONFIGSET_ALL },
 
96
97 #ifdef FOSSIL_ENABLE_TCL
98 { "tcl", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER },
99 { "tcl-setup", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER },
100 #endif
101
102 { "project-name", CONFIGSET_PROJ },
103 { "short-project-name", CONFIGSET_PROJ },
104 { "project-description", CONFIGSET_PROJ },
105
--- src/configure.c
+++ src/configure.c
@@ -41,10 +41,17 @@
41 #define CONFIGSET_ALL 0x0000ff /* Everything */
42
43 #define CONFIGSET_OVERWRITE 0x100000 /* Causes overwrite instead of merge */
44 #define CONFIGSET_OLDFORMAT 0x200000 /* Use the legacy format */
45
46 /*
47 ** This mask is used for the common TH1 configuration settings (i.e. those
48 ** that are not specific to one particular subsystem, such as the transfer
49 ** subsystem).
50 */
51 #define CONFIGSET_TH1 (CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER)
52
53 #endif /* INTERFACE */
54
55 /*
56 ** Names of the configuration sets
57 */
@@ -90,15 +97,16 @@
97 { "timeline-max-comment", CONFIGSET_SKIN },
98 { "timeline-plaintext", CONFIGSET_SKIN },
99 { "adunit", CONFIGSET_SKIN },
100 { "adunit-omit-if-admin", CONFIGSET_SKIN },
101 { "adunit-omit-if-user", CONFIGSET_SKIN },
102 { "th1-setup", CONFIGSET_TH1 },
103 { "th1-uri-regexp", CONFIGSET_TH1 },
104
105 #ifdef FOSSIL_ENABLE_TCL
106 { "tcl", CONFIGSET_TH1 },
107 { "tcl-setup", CONFIGSET_TH1 },
108 #endif
109
110 { "project-name", CONFIGSET_PROJ },
111 { "short-project-name", CONFIGSET_PROJ },
112 { "project-description", CONFIGSET_PROJ },
113

Keyboard Shortcuts

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