From: Simon Hausmann <hausmann@kde.org>
Date: Fri, 16 Mar 2007 12:47:46 +0000 (+0100)
Subject: Default to interactive syncing
X-Git-Tag: v1.5.3-rc0~65^2^2~179
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=228d36c92b022ae7941b542731c89db5d9de3eac;p=git.git

Default to interactive syncing

Signed-off-by: Simon Hausmann <hausmann@kde.org>
---

diff --git a/contrib/fast-import/p4-git-sync.py b/contrib/fast-import/p4-git-sync.py
index e07fcee42..ed88debd4 100755
--- a/contrib/fast-import/p4-git-sync.py
+++ b/contrib/fast-import/p4-git-sync.py
@@ -39,7 +39,7 @@ def die(msg):
 
 try:
     opts, args = getopt.getopt(sys.argv[1:], "", [ "continue", "git-dir=", "origin=", "reset", "master=",
-                                                   "submit-log-subst=", "log-substitutions=", "interactive",
+                                                   "submit-log-subst=", "log-substitutions=", "noninteractive",
                                                    "dry-run" ])
 except getopt.GetoptError:
     print "fixme, syntax error"
@@ -53,7 +53,7 @@ origin = "origin"
 master = ""
 firstTime = True
 reset = False
-interactive = False
+interactive = True
 dryRun = False
 
 for o, a in opts:
@@ -76,8 +76,8 @@ for o, a in opts:
         for line in open(a, "r").readlines():
             tokens = line[:-1].split("=")
             logSubstitutions[tokens[0]] = tokens[1]
-    elif o == "--interactive":
-        interactive = True
+    elif o == "--noninteractive":
+        interactive = False
     elif o == "--dry-run":
         dryRun = True