Fossil SCM

A few more places where Cygwin should do the same as win32.

jan.nijtmans 2013-02-27 08:49 trunk
Commit 8cc71be05f1f64ca1e3aa2646a4c317daeebc845
2 files changed +1 -1 +2 -2
+1 -1
--- src/add.c
+++ src/add.c
@@ -262,11 +262,11 @@
262262
if( vid==0 ){
263263
fossil_panic("no checkout to add to");
264264
}
265265
db_begin_transaction();
266266
db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
267
-#if defined(_WIN32)
267
+#if defined(_WIN32) || defined(__CYGWIN__)
268268
db_multi_exec(
269269
"CREATE INDEX IF NOT EXISTS vfile_pathname "
270270
" ON vfile(pathname COLLATE nocase)"
271271
);
272272
#endif
273273
--- src/add.c
+++ src/add.c
@@ -262,11 +262,11 @@
262 if( vid==0 ){
263 fossil_panic("no checkout to add to");
264 }
265 db_begin_transaction();
266 db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
267 #if defined(_WIN32)
268 db_multi_exec(
269 "CREATE INDEX IF NOT EXISTS vfile_pathname "
270 " ON vfile(pathname COLLATE nocase)"
271 );
272 #endif
273
--- src/add.c
+++ src/add.c
@@ -262,11 +262,11 @@
262 if( vid==0 ){
263 fossil_panic("no checkout to add to");
264 }
265 db_begin_transaction();
266 db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
267 #if defined(_WIN32) || defined(__CYGWIN__)
268 db_multi_exec(
269 "CREATE INDEX IF NOT EXISTS vfile_pathname "
270 " ON vfile(pathname COLLATE nocase)"
271 );
272 #endif
273
+2 -2
--- src/db.c
+++ src/db.c
@@ -824,11 +824,11 @@
824824
if( access(zHome, W_OK) ){
825825
fossil_fatal("home directory %s must be writeable", zHome);
826826
}
827827
#endif
828828
g.zHome = mprintf("%/", zHome);
829
-#if defined(_WIN32)
829
+#if defined(_WIN32) || defined(__CYGWIN__)
830830
/* . filenames give some window systems problems and many apps problems */
831831
zDbName = mprintf("%//_fossil", zHome);
832832
#else
833833
zDbName = mprintf("%s/.fossil", zHome);
834834
#endif
@@ -1981,11 +1981,11 @@
19811981
if( !allowNested && db_open_local() ){
19821982
fossil_panic("already within an open tree rooted at %s", g.zLocalRoot);
19831983
}
19841984
file_canonical_name(g.argv[2], &path, 0);
19851985
db_open_repository(blob_str(&path));
1986
-#if defined(_WIN32)
1986
+#if defined(_WIN32) || defined(__CYGWIN__)
19871987
# define LOCALDB_NAME "./_FOSSIL_"
19881988
#else
19891989
# define LOCALDB_NAME "./.fslckout"
19901990
#endif
19911991
db_init_database(LOCALDB_NAME, zLocalSchema,
19921992
--- src/db.c
+++ src/db.c
@@ -824,11 +824,11 @@
824 if( access(zHome, W_OK) ){
825 fossil_fatal("home directory %s must be writeable", zHome);
826 }
827 #endif
828 g.zHome = mprintf("%/", zHome);
829 #if defined(_WIN32)
830 /* . filenames give some window systems problems and many apps problems */
831 zDbName = mprintf("%//_fossil", zHome);
832 #else
833 zDbName = mprintf("%s/.fossil", zHome);
834 #endif
@@ -1981,11 +1981,11 @@
1981 if( !allowNested && db_open_local() ){
1982 fossil_panic("already within an open tree rooted at %s", g.zLocalRoot);
1983 }
1984 file_canonical_name(g.argv[2], &path, 0);
1985 db_open_repository(blob_str(&path));
1986 #if defined(_WIN32)
1987 # define LOCALDB_NAME "./_FOSSIL_"
1988 #else
1989 # define LOCALDB_NAME "./.fslckout"
1990 #endif
1991 db_init_database(LOCALDB_NAME, zLocalSchema,
1992
--- src/db.c
+++ src/db.c
@@ -824,11 +824,11 @@
824 if( access(zHome, W_OK) ){
825 fossil_fatal("home directory %s must be writeable", zHome);
826 }
827 #endif
828 g.zHome = mprintf("%/", zHome);
829 #if defined(_WIN32) || defined(__CYGWIN__)
830 /* . filenames give some window systems problems and many apps problems */
831 zDbName = mprintf("%//_fossil", zHome);
832 #else
833 zDbName = mprintf("%s/.fossil", zHome);
834 #endif
@@ -1981,11 +1981,11 @@
1981 if( !allowNested && db_open_local() ){
1982 fossil_panic("already within an open tree rooted at %s", g.zLocalRoot);
1983 }
1984 file_canonical_name(g.argv[2], &path, 0);
1985 db_open_repository(blob_str(&path));
1986 #if defined(_WIN32) || defined(__CYGWIN__)
1987 # define LOCALDB_NAME "./_FOSSIL_"
1988 #else
1989 # define LOCALDB_NAME "./.fslckout"
1990 #endif
1991 db_init_database(LOCALDB_NAME, zLocalSchema,
1992

Keyboard Shortcuts

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