Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Utilise the new 'p4_read_pipe_lines' command
author
Anand Kumria
<wildfire@progsoc.org>
Sun, 10 Aug 2008 18:26:25 +0000
(19:26 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 12 Aug 2008 01:57:03 +0000
(18:57 -0700)
Now that we have the new command, we can utilise it and then
eventually, isolate any changes required to the one place.
Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/fast-import/git-p4
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
2318121
)
diff --git
a/contrib/fast-import/git-p4
b/contrib/fast-import/git-p4
index fc2a60dfee4e59587e269476ce0ae349d20c03c2..3deaa42559c38484395a81d9ac0963e279878a84 100755
(executable)
--- a/
contrib/fast-import/git-p4
+++ b/
contrib/fast-import/git-p4
@@
-371,7
+371,7
@@
def originP4BranchesExist():
def p4ChangesForPaths(depotPaths, changeRange):
assert depotPaths
def p4ChangesForPaths(depotPaths, changeRange):
assert depotPaths
- output =
read_pipe_lines("p4
changes " + ' '.join (["%s...%s" % (p, changeRange)
+ output =
p4_read_pipe_lines("
changes " + ' '.join (["%s...%s" % (p, changeRange)
for p in depotPaths]))
changes = []
for p in depotPaths]))
changes = []
@@
-519,7
+519,7
@@
class P4Submit(Command):
# remove lines in the Files section that show changes to files outside the depot path we're committing into
template = ""
inFilesSection = False
# remove lines in the Files section that show changes to files outside the depot path we're committing into
template = ""
inFilesSection = False
- for line in
read_pipe_lines("p4
change -o"):
+ for line in
p4_read_pipe_lines("
change -o"):
if line.endswith("\r\n"):
line = line[:-2] + "\n"
if inFilesSection:
if line.endswith("\r\n"):
line = line[:-2] + "\n"
if inFilesSection: