SHA1 Hash:	5cc845cfeb32e18a3ce82593b0c8c28387f198c8
Date:	2008-02-08 21:42:46
User:	drh
Comment:	Rename the 'clearsign' setting to 'pgp-command'. Remove the 'safemerge' setting - safemerge is on by default and cannot be disabled.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

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

Modified src/checkin.c from [cd202e5357] to [844a72c5ae].

@@ -393,11 +393,11 @@
   }
 
   vid = db_lget_int("checkout", 0);
   if( db_exists("SELECT 1 FROM plink WHERE pid=%d", vid) ){
     wouldFork=1;
-    if( forceFlag==0 && db_get_int("safemerge", 0)==0 ){
+    if( forceFlag==0 ){
       fossil_fatal("would fork.  use -f or --force");
     }
   }
   vfile_aggregate_checksum_disk(vid, &cksum1);
   if( zComment ){

Modified src/clearsign.c from [b8ecd2533f] to [3868e827c1].

@@ -34,11 +34,11 @@
 */
 int clearsign(Blob *pIn, Blob *pOut){
   char *zRand;
   char *zIn;
   char *zOut;
-  char *zBase = db_get("clear-sign", "gpg --clearsign -o ");
+  char *zBase = db_get("pgp-command", "gpg --clearsign -o ");
   char *zCmd;
   int rc;
   zRand = db_text(0, "SELECT hex(randomblob(10))");
   zOut = mprintf("out-%s", zRand);
   zIn = mprintf("in-%z", zRand);

Modified src/db.c from [d35f14ef60] to [ce0cf6d921].

@@ -757,11 +757,10 @@
       "INSERT INTO config(name,value)"
       " VALUES('project-code', lower(hex(randomblob(20))));"
     );
   }
   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");
@@ -1052,11 +1051,11 @@
 **
 **    autosync         If enabled, automatically pull prior to
 **                     commit or update and automatically push
 **                     after commit or tag or branch creation.
 **
-**    clearsign        Command used to clear-sign manifests at check-in.
+**    pgp-command      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
@@ -1065,28 +1064,23 @@
 **                     unrestricted access to the repository.
 **
 **    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.
-**
-**   diff-command      External command to run when performing a diff.
+**    diff-command     External command to run when performing a diff.
 **                     If undefined, the internal text diff will be used.
 **
-**   gdiff-command     External command to run when performing a graphical
+**    gdiff-command    External command to run when performing a graphical
 **                     diff. If undefined, text diff will be used.
 */
 void setting_cmd(void){
   static const char *azName[] = {
     "autosync",
-    "clearsign",
+    "pgp-command",
     "editor",
     "localauth",
     "omitsign",
-    "safemerge",
     "diff-command",
     "gdiff-command",
   };
   int i;
   int globalFlag = find_option("global","g",0)!=0;

Modified src/update.c from [c2214489e0] to [c02445cfca].

@@ -36,24 +36,20 @@
 }
 
 /*
 ** COMMAND: update
 **
-** Usage: %fossil update ?VERSION? ?--force? ?--latest?
+** Usage: %fossil update ?VERSION? ?--latest?
 **
 ** The optional argument is a version that should become the current
 ** version.  If the argument is omitted, then use the leaf of the
 ** tree that begins with the current version, if there is only a
 ** single leaf.  If there are a multiple leaves, the latest is used
 ** if the --latest flag is present.
 **
 ** This command is different from the "checkout" in that edits are
 ** not overwritten.  Edits are merged into the new version.
-**
-** If there are uncommitted edits and the safemerge option is
-** enabled then no update will occur unless you provide the
-** --force flag.
 */
 void update_cmd(void){
   int vid;              /* Current version */
   int tid=0;            /* Target version - version we are changing to */
   Stmt q;
@@ -71,13 +67,17 @@
     fossil_fatal("cannot find current version");
   }
   if( db_exists("SELECT 1 FROM vmerge") ){
     fossil_fatal("cannot update an uncommitted merge");
   }
-  if( !forceFlag && db_get_int("safemerge", 0) && unsaved_changes() ){
-    fossil_fatal("there are uncommitted changes and safemerge is enabled");
-  }
+#if 0
+  /* Always do the update.  If it does not work out, the user can back out
+  ** the changes using "undo" */
+  if( !forceFlag && unsaved_changes() ){
+    fossil_fatal("uncommitted changes; use -f or --force to override");
+  }
+#endif
 
   if( g.argc==3 ){
     tid = name_to_rid(g.argv[2]);
     if( tid==0 ){
       fossil_fatal("not a version: %s", g.argv[2]);