Fossil SCM

merge trunk. Seems to work now. Still to be tested more.

jan.nijtmans 2012-11-29 21:21 ticket-d17d6e5b17 merge
Commit 49bdd78b75d639b855bd284e5a6489aef74894cd
Parent 258cedd6255b0a8…
6 files changed +3 +3 +5 -1 +6 -6 +6 -6 +3 -3
~ src/allrepo.c ~ src/info.c ~ src/main.c ~ src/utf8.c ~ src/utf8.c ~ win/Makefile.mingw
M src/allrepo.c
+3
--- src/allrepo.c
+++ src/allrepo.c
@@ -132,12 +132,14 @@
132132
 if( strncmp(zCmd, "list", n)==0 || strncmp(zCmd,"ls",n)==0 ){
133133
 zCmd = "list";
134134
 useCheckouts = find_option("ckout","c",0)!=0;
135135
 }else if( strncmp(zCmd, "push", n)==0 ){
136136
 zCmd = "push -autourl -R";
137
+ collect_argument(&extra, "verbose");
137138
 }else if( strncmp(zCmd, "pull", n)==0 ){
138139
 zCmd = "pull -autourl -R";
140
+ collect_argument(&extra, "verbose");
139141
 }else if( strncmp(zCmd, "rebuild", n)==0 ){
140142
 zCmd = "rebuild";
141143
 collect_argument(&extra, "cluster");
142144
 collect_argument(&extra, "compress");
143145
 collect_argument(&extra, "noverify");
@@ -146,10 +148,11 @@
146148
 collect_argument(&extra, "deanalyze");
147149
 collect_argument(&extra, "wal");
148150
 collect_argument(&extra, "stat");
149151
 }else if( strncmp(zCmd, "sync", n)==0 ){
150152
 zCmd = "sync -autourl -R";
153
+ collect_argument(&extra, "verbose");
151154
 }else if( strncmp(zCmd, "test-integrity", n)==0 ){
152155
 zCmd = "test-integrity";
153156
 }else if( strncmp(zCmd, "test-orphans", n)==0 ){
154157
 zCmd = "test-orphans -R";
155158
 }else if( strncmp(zCmd, "test-missing", n)==0 ){
156159
--- src/allrepo.c
+++ src/allrepo.c
@@ -132,12 +132,14 @@
132 if( strncmp(zCmd, "list", n)==0 || strncmp(zCmd,"ls",n)==0 ){
133 zCmd = "list";
134 useCheckouts = find_option("ckout","c",0)!=0;
135 }else if( strncmp(zCmd, "push", n)==0 ){
136 zCmd = "push -autourl -R";
 
137 }else if( strncmp(zCmd, "pull", n)==0 ){
138 zCmd = "pull -autourl -R";
 
139 }else if( strncmp(zCmd, "rebuild", n)==0 ){
140 zCmd = "rebuild";
141 collect_argument(&extra, "cluster");
142 collect_argument(&extra, "compress");
143 collect_argument(&extra, "noverify");
@@ -146,10 +148,11 @@
146 collect_argument(&extra, "deanalyze");
147 collect_argument(&extra, "wal");
148 collect_argument(&extra, "stat");
149 }else if( strncmp(zCmd, "sync", n)==0 ){
150 zCmd = "sync -autourl -R";
 
151 }else if( strncmp(zCmd, "test-integrity", n)==0 ){
152 zCmd = "test-integrity";
153 }else if( strncmp(zCmd, "test-orphans", n)==0 ){
154 zCmd = "test-orphans -R";
155 }else if( strncmp(zCmd, "test-missing", n)==0 ){
156
--- src/allrepo.c
+++ src/allrepo.c
@@ -132,12 +132,14 @@
132 if( strncmp(zCmd, "list", n)==0 || strncmp(zCmd,"ls",n)==0 ){
133 zCmd = "list";
134 useCheckouts = find_option("ckout","c",0)!=0;
135 }else if( strncmp(zCmd, "push", n)==0 ){
136 zCmd = "push -autourl -R";
137 collect_argument(&extra, "verbose");
138 }else if( strncmp(zCmd, "pull", n)==0 ){
139 zCmd = "pull -autourl -R";
140 collect_argument(&extra, "verbose");
141 }else if( strncmp(zCmd, "rebuild", n)==0 ){
142 zCmd = "rebuild";
143 collect_argument(&extra, "cluster");
144 collect_argument(&extra, "compress");
145 collect_argument(&extra, "noverify");
@@ -146,10 +148,11 @@
148 collect_argument(&extra, "deanalyze");
149 collect_argument(&extra, "wal");
150 collect_argument(&extra, "stat");
151 }else if( strncmp(zCmd, "sync", n)==0 ){
152 zCmd = "sync -autourl -R";
153 collect_argument(&extra, "verbose");
154 }else if( strncmp(zCmd, "test-integrity", n)==0 ){
155 zCmd = "test-integrity";
156 }else if( strncmp(zCmd, "test-orphans", n)==0 ){
157 zCmd = "test-orphans -R";
158 }else if( strncmp(zCmd, "test-missing", n)==0 ){
159
M src/info.c
+3
--- src/info.c
+++ src/info.c
@@ -1110,10 +1110,13 @@
11101110
 }
11111111
 cnt++;
11121112
 if( pDownloadName && blob_size(pDownloadName)==0 ){
11131113
 blob_append(pDownloadName, zName, -1);
11141114
 }
1115
+ }
1116
+ if( prevName ){
1117
+ @ </ul>
11151118
 }
11161119
 @ </ul>
11171120
 free(prevName);
11181121
 db_finalize(&q);
11191122
 db_prepare(&q,
11201123
--- src/info.c
+++ src/info.c
@@ -1110,10 +1110,13 @@
1110 }
1111 cnt++;
1112 if( pDownloadName && blob_size(pDownloadName)==0 ){
1113 blob_append(pDownloadName, zName, -1);
1114 }
 
 
 
1115 }
1116 @ </ul>
1117 free(prevName);
1118 db_finalize(&q);
1119 db_prepare(&q,
1120
--- src/info.c
+++ src/info.c
@@ -1110,10 +1110,13 @@
1110 }
1111 cnt++;
1112 if( pDownloadName && blob_size(pDownloadName)==0 ){
1113 blob_append(pDownloadName, zName, -1);
1114 }
1115 }
1116 if( prevName ){
1117 @ </ul>
1118 }
1119 @ </ul>
1120 free(prevName);
1121 db_finalize(&q);
1122 db_prepare(&q,
1123
M src/main.c
+5 -1
--- src/main.c
+++ src/main.c
@@ -492,14 +492,17 @@
492492
 g.argv = argv;
493493
 #if defined(_WIN32) && !defined(__MINGW32__)
494494
 parse_windows_command_line(&g.argc, &g.argv);
495495
 GetModuleFileNameW(NULL, buf, MAX_PATH);
496496
 g.nameOfExe = fossil_filename_to_utf8(buf);
497
+ for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]);
498
+#elif defined(__APPLE__)
499
+ for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]);
500
+ g.nameOfExe = g.argv[0];
497501
 #else
498502
 g.nameOfExe = g.argv[0];
499503
 #endif
500
- for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]);
501504
 for(i=1; i<g.argc-1; i++){
502505
 z = g.argv[i];
503506
 if( z[0]!='-' ) continue;
504507
 z++;
505508
 if( z[0]=='-' ) z++;
@@ -2034,10 +2037,11 @@
20342037
 ** to verify the fossil_filename_to_utf8() routine on Windows and Mac.
20352038
 */
20362039
 void test_echo_cmd(void){
20372040
 int i, j;
20382041
 if( find_option("hex",0,0)==0 ){
2042
+ fossil_print("g.nameOfExe = [%s]\n", g.nameOfExe);
20392043
 for(i=0; i<g.argc; i++){
20402044
 fossil_print("argv[%d] = [%s]\n", i, g.argv[i]);
20412045
 }
20422046
 }else{
20432047
 unsigned char *z, c;
20442048
--- src/main.c
+++ src/main.c
@@ -492,14 +492,17 @@
492 g.argv = argv;
493 #if defined(_WIN32) && !defined(__MINGW32__)
494 parse_windows_command_line(&g.argc, &g.argv);
495 GetModuleFileNameW(NULL, buf, MAX_PATH);
496 g.nameOfExe = fossil_filename_to_utf8(buf);
 
 
 
 
497 #else
498 g.nameOfExe = g.argv[0];
499 #endif
500 for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]);
501 for(i=1; i<g.argc-1; i++){
502 z = g.argv[i];
503 if( z[0]!='-' ) continue;
504 z++;
505 if( z[0]=='-' ) z++;
@@ -2034,10 +2037,11 @@
2034 ** to verify the fossil_filename_to_utf8() routine on Windows and Mac.
2035 */
2036 void test_echo_cmd(void){
2037 int i, j;
2038 if( find_option("hex",0,0)==0 ){
 
2039 for(i=0; i<g.argc; i++){
2040 fossil_print("argv[%d] = [%s]\n", i, g.argv[i]);
2041 }
2042 }else{
2043 unsigned char *z, c;
2044
--- src/main.c
+++ src/main.c
@@ -492,14 +492,17 @@
492 g.argv = argv;
493 #if defined(_WIN32) && !defined(__MINGW32__)
494 parse_windows_command_line(&g.argc, &g.argv);
495 GetModuleFileNameW(NULL, buf, MAX_PATH);
496 g.nameOfExe = fossil_filename_to_utf8(buf);
497 for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]);
498 #elif defined(__APPLE__)
499 for(i=0; i<g.argc; i++) g.argv[i] = fossil_filename_to_utf8(g.argv[i]);
500 g.nameOfExe = g.argv[0];
501 #else
502 g.nameOfExe = g.argv[0];
503 #endif
 
504 for(i=1; i<g.argc-1; i++){
505 z = g.argv[i];
506 if( z[0]!='-' ) continue;
507 z++;
508 if( z[0]=='-' ) z++;
@@ -2034,10 +2037,11 @@
2037 ** to verify the fossil_filename_to_utf8() routine on Windows and Mac.
2038 */
2039 void test_echo_cmd(void){
2040 int i, j;
2041 if( find_option("hex",0,0)==0 ){
2042 fossil_print("g.nameOfExe = [%s]\n", g.nameOfExe);
2043 for(i=0; i<g.argc; i++){
2044 fossil_print("argv[%d] = [%s]\n", i, g.argv[i]);
2045 }
2046 }else{
2047 unsigned char *z, c;
2048
M src/utf8.c
+6 -6
--- src/utf8.c
+++ src/utf8.c
@@ -134,26 +134,26 @@
134134
 return 0;
135135
 }
136136
 WideCharToMultiByte(CP_UTF8, 0, zFilename, -1, zUtf, nByte, 0, 0);
137137
 return zUtf;
138138
 #elif defined(__APPLE__)
139
+ char *zIn = (char*)zFilename;
139140
 char *zOut;
140141
 iconv_t cd;
141142
 size_t n, x;
142
- const char *zUtf = zFilename1
143
- for(n=0; zUtf[n]>0 && zUtf[n]<=0x7f; n++){}
144
- if( zUtf[n]!=0 && (cd = iconv_open("UTF-8", "UTF-8-MAC"))!=(iconv_t)-1 ){
145
- char *zIn = (char*)zUtf;
143
+ for(n=0; zIn[n]>0 && zIn[n]<=0x7f; n++){}
144
+ if( zIn[n]!=0 && (cd = iconv_open("UTF-8", "UTF-8-MAC"))!=(iconv_t)-1 ){
146145
 char *zOutx;
146
+ char *zOrig = zIn;
147147
 size_t nIn, nOutx;
148
- nIn = n = strlen(zUtf);
148
+ nIn = n = strlen(zIn);
149149
 nOutx = nIn+100;
150150
 zOutx = zOut = fossil_malloc( nOutx+1 );
151151
 x = iconv(cd, &zIn, &nIn, &zOutx, &nOutx);
152152
 if( x==(size_t)-1 ){
153153
 fossil_free(zOut);
154
- zOut = fossil_strdup(zUtf);
154
+ zOut = fossil_strdup(zOrig);
155155
 }else{
156156
 zOut[n+100-nOutx] = 0;
157157
 }
158158
 iconv_close(cd);
159159
 }else{
160160
--- src/utf8.c
+++ src/utf8.c
@@ -134,26 +134,26 @@
134 return 0;
135 }
136 WideCharToMultiByte(CP_UTF8, 0, zFilename, -1, zUtf, nByte, 0, 0);
137 return zUtf;
138 #elif defined(__APPLE__)
 
139 char *zOut;
140 iconv_t cd;
141 size_t n, x;
142 const char *zUtf = zFilename1
143 for(n=0; zUtf[n]>0 && zUtf[n]<=0x7f; n++){}
144 if( zUtf[n]!=0 && (cd = iconv_open("UTF-8", "UTF-8-MAC"))!=(iconv_t)-1 ){
145 char *zIn = (char*)zUtf;
146 char *zOutx;
 
147 size_t nIn, nOutx;
148 nIn = n = strlen(zUtf);
149 nOutx = nIn+100;
150 zOutx = zOut = fossil_malloc( nOutx+1 );
151 x = iconv(cd, &zIn, &nIn, &zOutx, &nOutx);
152 if( x==(size_t)-1 ){
153 fossil_free(zOut);
154 zOut = fossil_strdup(zUtf);
155 }else{
156 zOut[n+100-nOutx] = 0;
157 }
158 iconv_close(cd);
159 }else{
160
--- src/utf8.c
+++ src/utf8.c
@@ -134,26 +134,26 @@
134 return 0;
135 }
136 WideCharToMultiByte(CP_UTF8, 0, zFilename, -1, zUtf, nByte, 0, 0);
137 return zUtf;
138 #elif defined(__APPLE__)
139 char *zIn = (char*)zFilename;
140 char *zOut;
141 iconv_t cd;
142 size_t n, x;
143 for(n=0; zIn[n]>0 && zIn[n]<=0x7f; n++){}
144 if( zIn[n]!=0 && (cd = iconv_open("UTF-8", "UTF-8-MAC"))!=(iconv_t)-1 ){
 
 
145 char *zOutx;
146 char *zOrig = zIn;
147 size_t nIn, nOutx;
148 nIn = n = strlen(zIn);
149 nOutx = nIn+100;
150 zOutx = zOut = fossil_malloc( nOutx+1 );
151 x = iconv(cd, &zIn, &nIn, &zOutx, &nOutx);
152 if( x==(size_t)-1 ){
153 fossil_free(zOut);
154 zOut = fossil_strdup(zOrig);
155 }else{
156 zOut[n+100-nOutx] = 0;
157 }
158 iconv_close(cd);
159 }else{
160
M src/utf8.c
+6 -6
--- src/utf8.c
+++ src/utf8.c
@@ -134,26 +134,26 @@
134134
 return 0;
135135
 }
136136
 WideCharToMultiByte(CP_UTF8, 0, zFilename, -1, zUtf, nByte, 0, 0);
137137
 return zUtf;
138138
 #elif defined(__APPLE__)
139
+ char *zIn = (char*)zFilename;
139140
 char *zOut;
140141
 iconv_t cd;
141142
 size_t n, x;
142
- const char *zUtf = zFilename1
143
- for(n=0; zUtf[n]>0 && zUtf[n]<=0x7f; n++){}
144
- if( zUtf[n]!=0 && (cd = iconv_open("UTF-8", "UTF-8-MAC"))!=(iconv_t)-1 ){
145
- char *zIn = (char*)zUtf;
143
+ for(n=0; zIn[n]>0 && zIn[n]<=0x7f; n++){}
144
+ if( zIn[n]!=0 && (cd = iconv_open("UTF-8", "UTF-8-MAC"))!=(iconv_t)-1 ){
146145
 char *zOutx;
146
+ char *zOrig = zIn;
147147
 size_t nIn, nOutx;
148
- nIn = n = strlen(zUtf);
148
+ nIn = n = strlen(zIn);
149149
 nOutx = nIn+100;
150150
 zOutx = zOut = fossil_malloc( nOutx+1 );
151151
 x = iconv(cd, &zIn, &nIn, &zOutx, &nOutx);
152152
 if( x==(size_t)-1 ){
153153
 fossil_free(zOut);
154
- zOut = fossil_strdup(zUtf);
154
+ zOut = fossil_strdup(zOrig);
155155
 }else{
156156
 zOut[n+100-nOutx] = 0;
157157
 }
158158
 iconv_close(cd);
159159
 }else{
160160
--- src/utf8.c
+++ src/utf8.c
@@ -134,26 +134,26 @@
134 return 0;
135 }
136 WideCharToMultiByte(CP_UTF8, 0, zFilename, -1, zUtf, nByte, 0, 0);
137 return zUtf;
138 #elif defined(__APPLE__)
 
139 char *zOut;
140 iconv_t cd;
141 size_t n, x;
142 const char *zUtf = zFilename1
143 for(n=0; zUtf[n]>0 && zUtf[n]<=0x7f; n++){}
144 if( zUtf[n]!=0 && (cd = iconv_open("UTF-8", "UTF-8-MAC"))!=(iconv_t)-1 ){
145 char *zIn = (char*)zUtf;
146 char *zOutx;
 
147 size_t nIn, nOutx;
148 nIn = n = strlen(zUtf);
149 nOutx = nIn+100;
150 zOutx = zOut = fossil_malloc( nOutx+1 );
151 x = iconv(cd, &zIn, &nIn, &zOutx, &nOutx);
152 if( x==(size_t)-1 ){
153 fossil_free(zOut);
154 zOut = fossil_strdup(zUtf);
155 }else{
156 zOut[n+100-nOutx] = 0;
157 }
158 iconv_close(cd);
159 }else{
160
--- src/utf8.c
+++ src/utf8.c
@@ -134,26 +134,26 @@
134 return 0;
135 }
136 WideCharToMultiByte(CP_UTF8, 0, zFilename, -1, zUtf, nByte, 0, 0);
137 return zUtf;
138 #elif defined(__APPLE__)
139 char *zIn = (char*)zFilename;
140 char *zOut;
141 iconv_t cd;
142 size_t n, x;
143 for(n=0; zIn[n]>0 && zIn[n]<=0x7f; n++){}
144 if( zIn[n]!=0 && (cd = iconv_open("UTF-8", "UTF-8-MAC"))!=(iconv_t)-1 ){
 
 
145 char *zOutx;
146 char *zOrig = zIn;
147 size_t nIn, nOutx;
148 nIn = n = strlen(zIn);
149 nOutx = nIn+100;
150 zOutx = zOut = fossil_malloc( nOutx+1 );
151 x = iconv(cd, &zIn, &nIn, &zOutx, &nOutx);
152 if( x==(size_t)-1 ){
153 fossil_free(zOut);
154 zOut = fossil_strdup(zOrig);
155 }else{
156 zOut[n+100-nOutx] = 0;
157 }
158 iconv_close(cd);
159 }else{
160
M win/Makefile.mingw
+3 -3
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,14 @@
1313
 #
1414
1515
 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
1616
 # By default, this is an empty string (i.e. use the native compiler).
1717
 #
18
-# PREFIX =
18
+PREFIX =
1919
 # PREFIX = mingw32-
2020
 # PREFIX = i686-pc-mingw32-
21
-PREFIX = i686-w64-mingw32-
21
+# PREFIX = i686-w64-mingw32-
2222
 # PREFIX = x86_64-w64-mingw32-
2323
2424
 #### The toplevel directory of the source tree. Fossil can be built
2525
 # in a directory that is separate from the source tree. Just change
2626
 # the following to point from the build directory to the src/ folder.
@@ -207,11 +207,11 @@
207207
 endif
208208
209209
 #### Tcl shell for use in running the fossil test suite. This is only
210210
 # used for testing.
211211
 #
212
-TCLSH = tclsh86
212
+TCLSH = tclsh
213213
214214
 #### Nullsoft installer MakeNSIS location
215215
 #
216216
 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
217217
218218
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,14 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 # PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
21 PREFIX = i686-w64-mingw32-
22 # PREFIX = x86_64-w64-mingw32-
23
24 #### The toplevel directory of the source tree. Fossil can be built
25 # in a directory that is separate from the source tree. Just change
26 # the following to point from the build directory to the src/ folder.
@@ -207,11 +207,11 @@
207 endif
208
209 #### Tcl shell for use in running the fossil test suite. This is only
210 # used for testing.
211 #
212 TCLSH = tclsh86
213
214 #### Nullsoft installer MakeNSIS location
215 #
216 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
217
218
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -13,14 +13,14 @@
13 #
14
15 #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
16 # By default, this is an empty string (i.e. use the native compiler).
17 #
18 PREFIX =
19 # PREFIX = mingw32-
20 # PREFIX = i686-pc-mingw32-
21 # PREFIX = i686-w64-mingw32-
22 # PREFIX = x86_64-w64-mingw32-
23
24 #### The toplevel directory of the source tree. Fossil can be built
25 # in a directory that is separate from the source tree. Just change
26 # the following to point from the build directory to the src/ folder.
@@ -207,11 +207,11 @@
207 endif
208
209 #### Tcl shell for use in running the fossil test suite. This is only
210 # used for testing.
211 #
212 TCLSH = tclsh
213
214 #### Nullsoft installer MakeNSIS location
215 #
216 MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
217
218

Keyboard Shortcuts

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