Default to interactive syncing

This commit is contained in:
Simon Hausmann
2007-03-16 13:47:46 +01:00
parent c24e9e1bf3
commit 84ca2f71c8

View File

@@ -39,7 +39,7 @@ def die(msg):
try: try:
opts, args = getopt.getopt(sys.argv[1:], "", [ "continue", "git-dir=", "origin=", "reset", "master=", 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" ]) "dry-run" ])
except getopt.GetoptError: except getopt.GetoptError:
print "fixme, syntax error" print "fixme, syntax error"
@@ -53,7 +53,7 @@ origin = "origin"
master = "" master = ""
firstTime = True firstTime = True
reset = False reset = False
interactive = False interactive = True
dryRun = False dryRun = False
for o, a in opts: for o, a in opts:
@@ -76,8 +76,8 @@ for o, a in opts:
for line in open(a, "r").readlines(): for line in open(a, "r").readlines():
tokens = line[:-1].split("=") tokens = line[:-1].split("=")
logSubstitutions[tokens[0]] = tokens[1] logSubstitutions[tokens[0]] = tokens[1]
elif o == "--interactive": elif o == "--noninteractive":
interactive = True interactive = False
elif o == "--dry-run": elif o == "--dry-run":
dryRun = True dryRun = True