1. 13 10月, 2017 2 次提交
  2. 27 7月, 2017 2 次提交
  3. 18 7月, 2017 1 次提交
  4. 17 7月, 2017 1 次提交
  5. 21 6月, 2017 1 次提交
  6. 15 3月, 2017 1 次提交
    • S
      Allow resolving conflicts with non-ASCII chars · 96c77bf7
      Sean McGivern 提交于
      We wanted to check that the text could be encoded as JSON, because
      conflict resolutions are passed back and forth in that format, so the
      file itself must be UTF-8. However, all strings from the repository come
      back without an encoding from Rugged, making them ASCII_8BIT.
      
      We force to UTF-8, and reject if it's invalid. This still leaves the
      problem of a file that 'looks like' UTF-8 (contains valid UTF-8 byte
      sequences), but isn't. However:
      
      1. If the conflicts contain the problem bytes, the user will see that
         the file isn't displayed correctly.
      2. If the problem bytes are outside of the conflict area, then we will
         write back the same bytes when we resolve the conflicts, even though
         we though the encoding was UTF-8.
      96c77bf7
  7. 23 2月, 2017 2 次提交
  8. 07 9月, 2016 1 次提交
  9. 25 8月, 2016 1 次提交
    • S
      Handle non-UTF-8 conflicts gracefully · 44eb3197
      Sean McGivern 提交于
      These can't be resolved in the UI because if they aren't in a UTF-8
      compatible encoding, they can't be rendered as JSON. Even if they could,
      we would be implicitly changing the file encoding anyway, which seems
      like a bad idea.
      44eb3197
  10. 13 8月, 2016 3 次提交