frrr...@gmail.com wrote on Tue, 10 Jun 2014 13:14 +0100: > b4073bb387ef303c9ac3c044f46d6a8ae6e190f0 broke git p4 submit, here > is a proper fix, including proper handling for windows end of lines.
I guess we don't have test coverage for these cases? Is this something that should get put into a maintenance release, quickly? The fix looks good. It's surprising that none of the tests managed to add a file and trigger the failure. I'll ack this again, as it looks okay, but hope you ran all the unit tests successfully on your machine. -- Pete > Signed-off-by: Maxime Coste <frrr...@gmail.com> > --- > git-p4.py | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/git-p4.py b/git-p4.py > index 7bb0f73..ff132b2 100755 > --- a/git-p4.py > +++ b/git-p4.py > @@ -1238,7 +1238,7 @@ class P4Submit(Command, P4UserMap): > if response == 'n': > return False > > - def get_diff_description(self, editedFiles): > + def get_diff_description(self, editedFiles, filesToAdd): > # diff > if os.environ.has_key("P4DIFF"): > del(os.environ["P4DIFF"]) > @@ -1258,7 +1258,7 @@ class P4Submit(Command, P4UserMap): > newdiff += "+" + line > f.close() > > - return diff + newdiff > + return (diff + newdiff).replace('\r\n', '\n') > > def applyCommit(self, id): > """Apply one commit, return True if it succeeded.""" > @@ -1422,10 +1422,10 @@ class P4Submit(Command, P4UserMap): > separatorLine = "######## everything below this line is just the > diff #######\n" > if not self.prepare_p4_only: > submitTemplate += separatorLine > - submitTemplate += self.get_diff_description(editedFiles) > + submitTemplate += self.get_diff_description(editedFiles, > filesToAdd) > > (handle, fileName) = tempfile.mkstemp() > - tmpFile = os.fdopen(handle, "w+") > + tmpFile = os.fdopen(handle, "w+b") > if self.isWindows: > submitTemplate = submitTemplate.replace("\n", "\r\n") > tmpFile.write(submitTemplate) > @@ -1475,9 +1475,9 @@ class P4Submit(Command, P4UserMap): > tmpFile = open(fileName, "rb") > message = tmpFile.read() > tmpFile.close() > - submitTemplate = message[:message.index(separatorLine)] > if self.isWindows: > - submitTemplate = submitTemplate.replace("\r\n", "\n") > + message = message.replace("\r\n", "\n") > + submitTemplate = message[:message.index(separatorLine)] > p4_write_pipe(['submit', '-i'], submitTemplate) > > if self.preserveUser: > -- > 2.0.0 > > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html