mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-21 16:16:20 +02:00
Code

Cleanups 

- don't use dir (python builtin)
- use re for munging depotPath into destination

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
This commit is contained in:
Han-Wen Nienhuys 2007-05-23 16:46:29 -03:00 committed by Simon Hausmann
parent a3c55c09ec
commit ce6f33c835
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
contrib/fast-import/git-p4
View File

@ -10,6 +10,7 @@
import optparse, sys, os, marshal, popen2, subprocess, shelve
import tempfile, getopt, sha, os.path, time, platform
import re
from sets import Set;
gitdir = os.environ.get("GIT_DIR", "")
@ -842,6 +843,7 @@ class P4Sync(Command):
self.changeRange = ""
self.initialParent = ""
self.previousDepotPath = ""
# map from branch depot path to parent branch
self.knownBranches = {}
self.initialParents = {}
@ -1145,37 +1147,26 @@ class P4Clone(P4Sync):
if len(args) < 1:
return False
depotPath = args[0]
dir = ""
destination = ""
if len(args) == 2:
dir = args[1]
destination = args[1]
elif len(args) > 2:
return False
if not depotPath.startswith("//"):
return False
if len(dir) == 0:
dir = depotPath
atPos = dir.rfind("@")
if atPos != -1:
dir = dir[0:atPos]
hashPos = dir.rfind("#")
if hashPos != -1:
dir = dir[0:hashPos]
depotDir = re.sub("(@[^@]*)$", "", depotPath)
depotDir = re.sub("(#[^#]*)$", "", depotDir)
depotDir = re.sub(r"\.\.\.$,", "", depotDir)
depotDir = re.sub(r"/$", "", depotDir)
if dir.endswith("..."):
dir = dir[:-3]
if not destination:
destination = os.path.split(depotDir)[-1]
if dir.endswith("/"):
dir = dir[:-1]
slashPos = dir.rfind("/")
if slashPos != -1:
dir = dir[slashPos + 1:]
print "Importing from %s into %s" % (depotPath, dir)
os.makedirs(dir)
os.chdir(dir)
print "Importing from %s into %s" % (depotPath, destination)
os.makedirs(destination)
os.chdir(destination)
system("git init")
gitdir = os.getcwd() + "/.git"
if not P4Sync.run(self, [depotPath]):