From: Simon Hausmann <shausman@rhea.troll.no>
Date: Thu, 7 Jun 2007 07:41:53 +0000 (+0200)
Subject: Hack to make the multi-branch import work again with self.depotPaths now that
X-Git-Url: http://crossforests.com/gitweb?a=commitdiff_plain;h=94d5e2bc8404515ac344aca467a596221deb2780;p=python%2Ffast-export.git

Hack to make the multi-branch import work again with self.depotPaths now that
self.depotPath is gone
---

diff --git a/git-p4 b/git-p4
index ff737d7..ececc44 100755
--- a/git-p4
+++ b/git-p4
@@ -909,9 +909,10 @@ class P4Sync(Command):
                     continue
                 source = paths[0]
                 destination = paths[1]
-                if source.startswith(self.depotPath) and destination.startswith(self.depotPath):
-                    source = source[len(self.depotPath):-4]
-                    destination = destination[len(self.depotPath):-4]
+                ## HACK
+                if source.startswith(self.depotPaths[0]) and destination.startswith(self.depotPaths[0]):
+                    source = source[len(self.depotPaths[0]):-4]
+                    destination = destination[len(self.depotPaths[0]):-4]
                     if destination not in self.knownBranches:
                         self.knownBranches[destination] = source
                     if source not in self.knownBranches: