|
|
@ -141,7 +141,7 @@ def setP4ExecBit(file, mode): |
|
|
|
def getP4OpenedType(file): |
|
|
|
def getP4OpenedType(file): |
|
|
|
# Returns the perforce file type for the given file. |
|
|
|
# Returns the perforce file type for the given file. |
|
|
|
|
|
|
|
|
|
|
|
result = read_pipe("p4 opened %s" % file) |
|
|
|
result = p4_read_pipe("opened %s" % file) |
|
|
|
match = re.match(".*\((.+)\)\r?$", result) |
|
|
|
match = re.match(".*\((.+)\)\r?$", result) |
|
|
|
if match: |
|
|
|
if match: |
|
|
|
return match.group(1) |
|
|
|
return match.group(1) |
|
|
@ -681,7 +681,7 @@ class P4Submit(Command): |
|
|
|
submitTemplate = self.prepareLogMessage(template, logMessage) |
|
|
|
submitTemplate = self.prepareLogMessage(template, logMessage) |
|
|
|
if os.environ.has_key("P4DIFF"): |
|
|
|
if os.environ.has_key("P4DIFF"): |
|
|
|
del(os.environ["P4DIFF"]) |
|
|
|
del(os.environ["P4DIFF"]) |
|
|
|
diff = read_pipe("p4 diff -du ...") |
|
|
|
diff = p4_read_pipe("diff -du ...") |
|
|
|
|
|
|
|
|
|
|
|
newdiff = "" |
|
|
|
newdiff = "" |
|
|
|
for newFile in filesToAdd: |
|
|
|
for newFile in filesToAdd: |
|
|
@ -719,7 +719,7 @@ class P4Submit(Command): |
|
|
|
if self.isWindows: |
|
|
|
if self.isWindows: |
|
|
|
submitTemplate = submitTemplate.replace("\r\n", "\n") |
|
|
|
submitTemplate = submitTemplate.replace("\r\n", "\n") |
|
|
|
|
|
|
|
|
|
|
|
write_pipe("p4 submit -i", submitTemplate) |
|
|
|
p4_write_pipe("submit -i", submitTemplate) |
|
|
|
else: |
|
|
|
else: |
|
|
|
fileName = "submit.txt" |
|
|
|
fileName = "submit.txt" |
|
|
|
file = open(fileName, "w+") |
|
|
|
file = open(fileName, "w+") |
|
|
|