SHA1 Hash:	a21806dcf394d6b99c775fa5f3daccab091d1795
Date:	2007-10-07 14:38:54
User:	jnc
Comment:	Fixed omitsign discrepancies. Windows version now looks for USERNAME instead of USER when creating new database.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/branch.c from [efd61694e3] to [e4e607578f].

@@ -37,11 +37,11 @@
   Blob cksum1, cksum2;   /* Before and after commit checksums */
   Blob cksum1b;          /* Checksum recorded in the manifest */
 
   noSign = find_option("nosign","",0)!=0;
   db_must_be_within_tree();
-  noSign = db_get_int("omit-sign", 0)|noSign;
+  noSign = db_get_int("omitsign", 0)|noSign;
   zColor = find_option("bgcolor","c",1);
 
   verify_all_options();
 
   /* fossil branch new name */

Modified src/checkin.c from [1fd79ac4b7] to [6e8cb78df8].

@@ -335,11 +335,11 @@
 
   noSign = find_option("nosign","",0)!=0;
   zComment = find_option("comment","m",1);
   forceFlag = find_option("force", "r", 0)!=0;
   db_must_be_within_tree();
-  noSign = db_get_int("omit-sign", 0)|noSign;
+  noSign = db_get_int("omitsign", 0)|noSign;
   verify_all_options();
 
   /*
   ** Autosync if requested.
   */

Modified src/db.c from [a10c6acdae] to [61d4843c1d].

@@ -698,11 +698,15 @@
   if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
   if( !db_is_global("safemerge") ) db_set_int("safemerge", 0, 0);
   if( !db_is_global("localauth") ) db_set_int("localauth", 0, 0);
   zUser = db_get("default-user", 0);
   if( zUser==0 ){
+#ifdef __MINGW32__
+    zUser = getenv("USERNAME");
+#else
     zUser = getenv("USER");
+#endif
   }
   if( zUser==0 ){
     zUser = "root";
   }
   db_multi_exec(
@@ -972,21 +976,21 @@
 **
 **    autosync         If enabled, automatically pull prior to
 **                     commit or update and automatically push
 **                     after commit or tag or branch creation.
 **
-**    clear-sign       Command used to clear-sign manifests at check-in.
+**    clearsign        Command used to clear-sign manifests at check-in.
 **                     The default is "gpg --clearsign -o ".
 **
 **    editor           Text editor command used for check-in comments.
 **
 **    localauth        If enabled, require that HTTP connections from
 **                     127.0.0.1 be authenticated by password.  If
 **                     false, all HTTP requests from localhost have
 **                     unrestricted access to the repository.
 **
-**    omit-sign        When enabled, fossil will not attempt to sign any
+**    omitsign         When enabled, fossil will not attempt to sign any
 **                     commit with gpg. All commits will be unsigned.
 **
 **    safemerge        If enabled, when commit will cause a fork, the
 **                     commit will not abort with warning. Also update
 **                     will not be allowed if local changes exist.
@@ -995,11 +999,11 @@
   static const char *azName[] = {
     "autosync",
     "clearsign",
     "editor",
     "localauth",
-    "omitsig",
+    "omitsign",
     "safemerge",
   };
   int i;
   int globalFlag = find_option("global","g",0)!=0;
   db_find_and_open_repository();