diff options
| author | Anand Kumria <wildfire@progsoc.org> | 2008-08-14 23:40:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-14 18:14:24 -0700 |
| commit | a7d3ef9d099ab00a19595bc3ca8abdc1fc6ff35d (patch) | |
| tree | 1975ee8782ee13305f55c8927e490a6bb5e94c44 /contrib/fast-import | |
| parent | d9429194f6e30e1f6f46a286217cd88972e1c83b (diff) | |
| download | git-a7d3ef9d099ab00a19595bc3ca8abdc1fc6ff35d.tar.gz | |
Utilise our new p4_read_pipe and p4_write_pipe wrappers
Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 3e9df70f29..12fa9d3fd8 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -141,7 +141,7 @@ def setP4ExecBit(file, mode): def getP4OpenedType(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) if match: return match.group(1) @@ -681,7 +681,7 @@ class P4Submit(Command): submitTemplate = self.prepareLogMessage(template, logMessage) if os.environ.has_key("P4DIFF"): del(os.environ["P4DIFF"]) - diff = read_pipe("p4 diff -du ...") + diff = p4_read_pipe("diff -du ...") newdiff = "" for newFile in filesToAdd: @@ -719,7 +719,7 @@ class P4Submit(Command): if self.isWindows: submitTemplate = submitTemplate.replace("\r\n", "\n") - write_pipe("p4 submit -i", submitTemplate) + p4_write_pipe("submit -i", submitTemplate) else: fileName = "submit.txt" file = open(fileName, "w+") |