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

Handle .COLOR_DIFF in the same way as .DIFF #1673

Merged
merged 6 commits into from Sep 5, 2020
Merged

Handle .COLOR_DIFF in the same way as .DIFF #1673

merged 6 commits into from Sep 5, 2020

Commits on Sep 4, 2020

  1. Add test to show differing behaviour between DIFF and COLOR_DIFF

    @tom-saunders
    tom-saunders committed Sep 4, 2020
    Copy the full SHA
    0b94919 View commit details
    Browse the repository at this point in the history

  2. Demonstrate that diff with colour doesn't lock for output. 

    This isn't _quite_ true - this demonstrates that we never get
the manager used to provide the lock, but without that we're
clearly not getting the lock.
    @tom-saunders
    tom-saunders committed Sep 4, 2020
    Copy the full SHA
    a983bda View commit details
    Browse the repository at this point in the history

  3. Check both WriteBack.DIFF and .COLORDIFF when outputting. 

    It seems that when .COLOR_DIFF is used we don't use the locks in a manner
consistent with how .DIFF is using them.
    @tom-saunders
    tom-saunders committed Sep 4, 2020
    Copy the full SHA
    5a5934e View commit details
    Browse the repository at this point in the history

  4. Modify test exit codes to stop failing in CI. 

    As modified they fail local to me, but I suspect that's a me problem :)
    @tom-saunders
    tom-saunders committed Sep 4, 2020
    Copy the full SHA
    8f70e95 View commit details
    Browse the repository at this point in the history

  5. Add changelog entry for .COLORDIFF handling

    @tom-saunders
    tom-saunders committed Sep 4, 2020
    Copy the full SHA
    405ec2a View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2020

  1. Merge remote-tracking branch 'upstream/master' into lock-colourdiff

    @tom-saunders
    tom-saunders committed Sep 5, 2020
    Copy the full SHA
    abf6596 View commit details
    Browse the repository at this point in the history