Split up the cache commandline options into (command) cache and data cache.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
This commit is contained in:
parent
dd87020bd3
commit
4fe2ca17f7
@ -15,7 +15,8 @@
|
|||||||
import marshal, popen2, getopt, sha
|
import marshal, popen2, getopt, sha
|
||||||
from sets import Set;
|
from sets import Set;
|
||||||
|
|
||||||
cacheDebug = False
|
dataCache = False
|
||||||
|
commandCache = False
|
||||||
|
|
||||||
silent = False
|
silent = False
|
||||||
knownBranches = Set()
|
knownBranches = Set()
|
||||||
@ -30,7 +31,7 @@
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
opts, args = getopt.getopt(sys.argv[1:], "", [ "branch=", "detect-branches", "changesfile=", "silent", "known-branches=",
|
opts, args = getopt.getopt(sys.argv[1:], "", [ "branch=", "detect-branches", "changesfile=", "silent", "known-branches=",
|
||||||
"cache-debug" ])
|
"cache", "command-cache" ])
|
||||||
except getopt.GetoptError:
|
except getopt.GetoptError:
|
||||||
print "fixme, syntax error"
|
print "fixme, syntax error"
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
@ -47,8 +48,11 @@
|
|||||||
elif o == "--known-branches":
|
elif o == "--known-branches":
|
||||||
for branch in open(a).readlines():
|
for branch in open(a).readlines():
|
||||||
knownBranches.add(branch[:-1])
|
knownBranches.add(branch[:-1])
|
||||||
elif o == "--cache-debug":
|
elif o == "--cache":
|
||||||
cacheDebug = True
|
dataCache = True
|
||||||
|
commandCache = True
|
||||||
|
elif o == "--command-cache":
|
||||||
|
commandCache = True
|
||||||
|
|
||||||
if len(args) == 0 and len(globalPrefix) != 0:
|
if len(args) == 0 and len(globalPrefix) != 0:
|
||||||
if not silent:
|
if not silent:
|
||||||
@ -103,12 +107,12 @@ def p4File(depotPath):
|
|||||||
|
|
||||||
data = 0
|
data = 0
|
||||||
try:
|
try:
|
||||||
if not cacheDebug:
|
if not dataCache:
|
||||||
raise
|
raise
|
||||||
data = open(cacheKey, "rb").read()
|
data = open(cacheKey, "rb").read()
|
||||||
except:
|
except:
|
||||||
data = os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
|
data = os.popen("p4 print -q \"%s\"" % depotPath, "rb").read()
|
||||||
if cacheDebug:
|
if dataCache:
|
||||||
open(cacheKey, "wb").write(data)
|
open(cacheKey, "wb").write(data)
|
||||||
|
|
||||||
return data
|
return data
|
||||||
@ -122,7 +126,7 @@ def p4CmdList(cmd):
|
|||||||
cached = True
|
cached = True
|
||||||
pipe = 0
|
pipe = 0
|
||||||
try:
|
try:
|
||||||
if not cacheDebug:
|
if not commandCache:
|
||||||
raise
|
raise
|
||||||
pipe = open(cacheKey, "rb")
|
pipe = open(cacheKey, "rb")
|
||||||
except:
|
except:
|
||||||
@ -138,7 +142,7 @@ def p4CmdList(cmd):
|
|||||||
pass
|
pass
|
||||||
pipe.close()
|
pipe.close()
|
||||||
|
|
||||||
if not cached and cacheDebug:
|
if not cached and commandCache:
|
||||||
pipe = open(cacheKey, "wb")
|
pipe = open(cacheKey, "wb")
|
||||||
for r in result:
|
for r in result:
|
||||||
marshal.dump(r, pipe)
|
marshal.dump(r, pipe)
|
||||||
|
Loading…
Reference in New Issue
Block a user