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 e07fcee42c13e98a8a34de982eb3cc2f5bb14b60..ed88debd4599ec1ed88a7872f1aa574e454f7435 100755 (executable)
--- 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=",
 
 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"
                                                    "dry-run" ])
 except getopt.GetoptError:
     print "fixme, syntax error"


@@ -53,7 +53,7 @@ def die(msg):
 master = ""
 firstTime = True
 reset = False
 master = ""
 firstTime = True
 reset = False

-interactive = False
+interactive = True

 dryRun = False
 
 for o, a in opts:
 dryRun = False
 
 for o, a in opts:


@@ -76,8 +76,8 @@ def die(msg):
         for line in open(a, "r").readlines():
             tokens = line[:-1].split("=")
             logSubstitutions[tokens[0]] = tokens[1]
         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
 
     elif o == "--dry-run":
         dryRun = True