Default to interactive syncing
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann committed
Mar 16, 2007 at 13:47 UTC
228d36c92b022ae7941b542731c89db5d9de3eac
1 file changed
+4
-4
contrib/fast-import/p4-git-sync.py
+4
-4
@@ -39,7 +39,7 @@ def die(msg):
39
40
try:
41
opts, args = getopt.getopt(sys.argv[1:], "", [ "continue", "git-dir=", "origin=", "reset", "master=",
42
- "submit-log-subst=", "log-substitutions=", "interactive",
42
+ "submit-log-subst=", "log-substitutions=", "noninteractive",
43
"dry-run" ])
44
except getopt.GetoptError:
45
print "fixme, syntax error"
@@ -53,7 +53,7 @@ origin = "origin"
53
master = ""
54
firstTime = True
55
reset = False
56
-interactive = False
56
+interactive = True
57
dryRun = False
58
59
for o, a in opts:
@@ -76,8 +76,8 @@ for o, a in opts:
76
for line in open(a, "r").readlines():
77
tokens = line[:-1].split("=")
78
logSubstitutions[tokens[0]] = tokens[1]
79
- elif o == "--interactive":
80
- interactive = True
79
+ elif o == "--noninteractive":
80
+ interactive = False
81
elif o == "--dry-run":
82
dryRun = True
83