[Gnu-arch-users] patch: make -S the default for import and tag

[Derek Zhou]

This patch make -S "Use `archive-setup' if necessary" default on for
the command tag and import. I think it is a good convenient feature in
baz. I also added a "--no-setup" switch to go back to the old
behaviour. Diffed against tla

Derek

* looking for address@hidden/tla--derek--1.3--base-0 to compare with
* comparing to address@hidden/tla--derek--1.3--base-0
M  libarch/cmd-import.c
M  libarch/cmd-tag.c

* modified files

--- orig/libarch/cmd-import.c
+++ mod/libarch/cmd-import.c
@@ -57,7 +57,9 @@
   OP (opt_log_msg, "L", "log-message TEXT", 1, \
       "log with TEXT") \
   OP (opt_setup, "S", "setup", 0, \
-      "Use `archive-setup' if necessary.") \
+      "Use `archive-setup' if necessary; implied by default.") \
+  OP (opt_no_setup, 0, "no-setup", 0, \
+      "Do not use `archive-setup' even if necessary.") \
   OP (opt_unescaped, 0, "unescaped", 0, \
       "show filenames in unescaped form")
 
@@ -92,7 +94,7 @@
   t_uchar * log_file = 0;
   t_uchar * log_text = 0;
   t_uchar * summary = 0;
-  int setup = 0;
+  int setup = 1;
   int escape_classes = arch_escape_classes;
 
   dir = str_save (0, ".");
@@ -156,9 +158,9 @@
             break;
           }
 
-        case opt_setup:
+        case opt_no_setup:
           {
-            setup = 1;
+            setup = 0;
             break;
           }
 


--- orig/libarch/cmd-tag.c
+++ mod/libarch/cmd-tag.c
@@ -61,7 +61,9 @@
   OP (opt_fix, 0, "fix", 0, \
       "create a versionfix revision") \
   OP (opt_setup, "S", "setup", 0, \
-      "use `archive-setup' if necessary.")
+      "Use `archive-setup' if necessary; implied by default.") \
+  OP (opt_no_setup, 0, "no-setup", 0, \
+      "Do not use `archive-setup' even if necessary.")
 
 t_uchar arch_cmd_tag_help[] = ("create a continuation revision (aka tag or 
branch)\n"
                               "Create the continuation revision TAG-VERSION 
(branch point or tag)\n"
@@ -92,7 +94,7 @@
   int do_cacherev = 1;
   int seal = 0;
   int fix = 0;
-  int setup = 0;
+  int setup = 1;
 
   safe_buffer_fd (1, 0, O_WRONLY, 0);
 
@@ -147,9 +149,9 @@
             break;
           }
 
-       case opt_setup:
+       case opt_no_setup:
          {
-           setup = 1;
+           setup = 0;
            break;
          }
         }