Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Split up the cache commandline options into (command) cache and data cache.
author
Simon Hausmann
<hausmann@kde.org>
Sat, 10 Mar 2007 20:30:24 +0000
(21:30 +0100)
committer
Simon Hausmann
<hausmann@kde.org>
Sat, 10 Mar 2007 20:30:24 +0000
(21:30 +0100)
Signed-off-by: Simon Hausmann <hausmann@kde.org>
contrib/fast-import/p4-fast-export.py
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
dd87020
)
diff --git
a/contrib/fast-import/p4-fast-export.py
b/contrib/fast-import/p4-fast-export.py
index a45068d362df70de0d3ebe45a6111ac7696dee31..26cd648ef7fb302f76637a2e5fc19fa678e9aef6 100755
(executable)
--- a/
contrib/fast-import/p4-fast-export.py
+++ b/
contrib/fast-import/p4-fast-export.py
@@
-15,7
+15,8
@@
import marshal, popen2, getopt, sha
from sets import Set;
import marshal, popen2, getopt, sha
from sets import Set;
-cacheDebug = False
+dataCache = False
+commandCache = False
silent = False
knownBranches = Set()
silent = False
knownBranches = Set()
@@
-30,7
+31,7
@@
try:
opts, args = getopt.getopt(sys.argv[1:], "", [ "branch=", "detect-branches", "changesfile=", "silent", "known-branches=",
try:
opts, args = getopt.getopt(sys.argv[1:], "", [ "branch=", "detect-branches", "changesfile=", "silent", "known-branches=",
- "cache
-debug
" ])
+ "cache
", "command-cache
" ])
except getopt.GetoptError:
print "fixme, syntax error"
sys.exit(1)
except getopt.GetoptError:
print "fixme, syntax error"
sys.exit(1)
@@
-47,8
+48,11
@@
elif o == "--known-branches":
for branch in open(a).readlines():
knownBranches.add(branch[:-1])
elif o == "--known-branches":
for branch in open(a).readlines():
knownBranches.add(branch[:-1])
- elif o == "--cache-debug":
- cacheDebug = True
+ elif o == "--cache":
+ dataCache = True
+ commandCache = True
+ elif o == "--command-cache":
+ commandCache = True
if len(args) == 0 and len(globalPrefix) != 0:
if not silent:
if len(args) == 0 and len(globalPrefix) != 0:
if not silent:
@@
-103,12
+107,12
@@
def p4File(depotPath):
data = 0
try:
data = 0
try:
- if not
cacheDebug
:
+ if not
dataCache
:
raise
data = open(cacheKey, "rb").read()
except:
data = os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
raise
data = open(cacheKey, "rb").read()
except:
data = os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
- if
cacheDebug
:
+ if
dataCache
:
open(cacheKey, "wb").write(data)
return data
open(cacheKey, "wb").write(data)
return data
@@
-122,7
+126,7
@@
def p4CmdList(cmd):
cached = True
pipe = 0
try:
cached = True
pipe = 0
try:
- if not c
acheDebug
:
+ if not c
ommandCache
:
raise
pipe = open(cacheKey, "rb")
except:
raise
pipe = open(cacheKey, "rb")
except:
@@
-138,7
+142,7
@@
def p4CmdList(cmd):
pass
pipe.close()
pass
pipe.close()
- if not cached and c
acheDebug
:
+ if not cached and c
ommandCache
:
pipe = open(cacheKey, "wb")
for r in result:
marshal.dump(r, pipe)
pipe = open(cacheKey, "wb")
for r in result:
marshal.dump(r, pipe)