1. Marcus Lindblom Sonestedt
  2. ml-hgext

Commits

Vsevolod Parfenov  committed c8201b8

checkfiles: trailingwhitespace will always contain '\r' on Windows

  • Participants
  • Parent commits 509751b
  • Branches default

Comments (0)

Files changed (1)

File checkfiles.py

View file
                             file = None
                     elif label == 'diff.hunk':
                         hunk = chunk
-                    elif file and label == 'diff.trailingwhitespace' and lastlabel == 'diff.inserted':
+                    elif file and label == 'diff.trailingwhitespace' and lastlabel == 'diff.inserted' and chunk != '\r':
                         state.found_ws()
                         self.ui.note('%s: trailing whitespace in %s\n' % (file, hunk))
                     elif file and label == 'diff.inserted' and '\t' in chunk: