Browse Source

Default to interactive syncing

Signed-off-by: Simon Hausmann <hausmann@kde.org>
maint
Simon Hausmann 18 years ago
parent
commit
228d36c92b
  1. 8
      contrib/fast-import/p4-git-sync.py

8
contrib/fast-import/p4-git-sync.py

@ -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



Loading…
Cancel
Save