Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-3270

The diff view does not handle CR line endings in files gracefully

    XMLWordPrintable

Details

    Description

      The diff view lets git itself decide on the correct line endings to use, but the lines can themselves contain line endings of a different format leading to multi-line lines which the UI displays badly.

      We should either escape the other line endings or let the UI handle multi-line lines.

      An example

      Line 1: some text <mac line ending> some more text <mac line ending><linux line ending>
Line 2: some text <mac line ending> some more text <mac line ending><linux line ending>

      The above would currently be displayed with "some more text" from line 1 on top of "some text" from line 2

      This could be displayed as:

      Line 1: some text ^M some more text ^M
Line 2: some text ^M some more text ^M

      or 

      Line 1: some text
Line 1: some more text
Line 2: some text
Line 2: some more text

      Attachments

        1. diff-view.png
          diff-view.png
          9 kB
        2. image-2017-04-18-15-10-54-473.png
          image-2017-04-18-15-10-54-473.png
          57 kB
        3. source-view.png
          source-view.png
          4 kB

        Issue Links

          is duplicated by

          Bug - A problem which impairs or prevents the functions of the product. BSERV-7286 Source view does not properly display files with mixed line endings

          • Low - Low priority issues
          • Closed
          is superseded by

          Bug - A problem which impairs or prevents the functions of the product. BSERV-8428 Harden diff parsing for files with CR (^M) line endings that "git diff" does not support

          • Medium - Medium priority issues
          • Closed
          relates to

          Bug - A problem which impairs or prevents the functions of the product. BSERV-3982 Diff of files is impossible to read when Ctrl+M is used as line separator

          • Low - Low priority issues
          • Closed

          Activity

            People

              mszczepanski Marcin
              tbright ThomasA
              Votes:
              3 Vote for this issue
              Watchers:
              18 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: