From: Simon Hausmann <hausmann@kde.org>
Date: Thu, 8 Mar 2007 20:34:40 +0000 (+0100)
Subject: Changed --known-branches to take a file as argument instead of a comma separated... 
X-Git-Tag: v1.5.3-rc0~65^2^2~195
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=934371385c6e2e26132190542f4082c1655587e7;p=git.git

Changed --known-branches to take a file as argument instead of a comma separated list.

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

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index a2cca3117..5d4ed5cf9 100755
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -44,8 +44,8 @@ for o, a in opts:
     elif o == "--silent":
         silent= True
     elif o == "--known-branches":
-        for branch in o.split(","):
-            knownBranches.add(branch)
+        for branch in open(a).readlines():
+            knownBranches.add(branch[:-1])
 
 if len(args) == 0 and len(globalPrefix) != 0:
     if not silent: