Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: make lockfile parser tolerant to CRLF #4495

Merged
merged 5 commits into from
Sep 19, 2017
Merged

Fix: make lockfile parser tolerant to CRLF #4495

merged 5 commits into from
Sep 19, 2017

Commits on Sep 18, 2017

  1. Fix: make lockfile parser tolerant to CRLF 

    **Summary**

Lockfile parser fails when the lockfile had Windows-style line
endings with an "Invalid token" error. This is default on Windows
and, say when editing the file using vim, it is not obvious or
trivial that the file endings are in Windows-style. This patch
makes the parser tolareate potential "\r" chars before "\n" while
keeping the existing parsing logic the same.

**Test plan**

Added two new unit tests.
    @BYK
    BYK committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    3fa3091 View commit details
    Browse the repository at this point in the history

  2. Moar precision & support CRLF in auto merge

    @BYK
    BYK committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    70f5769 View commit details
    Browse the repository at this point in the history

  3. Fix lint

    @BYK
    BYK committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    ed2bbb5 View commit details
    Browse the repository at this point in the history

  4. Remove forgotten console statement

    @BYK
    BYK committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    6d7e4d3 View commit details
    Browse the repository at this point in the history

  5. Fix lint

    @BYK
    BYK committed Sep 18, 2017
    Configuration menu
    Copy the full SHA
    6b35b1e View commit details
    Browse the repository at this point in the history