Lines ending with CR only are omitted from web interface diff (BB-13648)

Issue #11142 closed
vadmium created an issue

Compare the changes shown at https://bitbucket.org/Gfy/pyrescene/commits/3473a185f867b74a13ad0c35192249d5#comment-1768278 with the actual raw diff at https://bitbucket.org/Gfy/pyrescene/commits/3473a185f867b74a13ad0c35192249d5655f237c/raw/. It looks like some lines have been omitted from the Bitbucket diff. The side-by-side diff is screwed up too.

Looking at the raw diff more closely, with “cat -A” under Linux, shows that most of the file has CRLF line endings (^M$ at the end of the line), but the troublesome lines only have CR line endings (^M without a line break):

 ^I^Iif not timetuple:^M$
-^I^I^Ireturn "UNKNOWN"^M$
-^I^Ireturn "%04d-%02d-%02d %02d:%02d:%02d" % timetuple^M$
-^I^M$
+^I^I^Ireturn "UNKNOWN"^M^I^Iseconds = timetuple[5]^M^I^Iif int(seconds) != seconds:^M$
+^I^I^I# sub second precision^M^I^I^Ireturn "%04d-%02d-%02d %02d:%02d:%02.7f" % timetuple^M^I^Ielse:^M$
+^I^I^Ireturn "%04d-%02d-%02d %02d:%02d:%02d" % timetuple^M$
+^M$
 ^Idef get_compression_name(self):^M$

Comments (1)

  1. Atlassian Bitbucket

    This issue has been closed due to inactivity. If you continue to see problems, please reopen or create a new issue.

  2. Log in to comment