Summary

Use `diff` command for TFS.

Review Request #7450 — Created June 24, 2015 and submitted July 1, 2015, 4:19 p.m.

Information

Owner

david

Repository

RBTools

Branch

release-0.7.x

Bugs

Depends On

Commit

c990bc2...

Reviewers

Groups

rbtools

People

Description

It turns out that difflib's unified diff implementation, while seemingly okay,
chokes pretty badly with files that don't end in newlines, or start with
byte-order markers. After piling workaround on top of workaround, I've decided
to rip it out and just use the diffutils diff command.

Testing Done

Posted some changes containing previously problematic files. Saw that they all
worked.

Issues

Description	From	Last Updated
Shouldn't this use b'..'?	chipx86	June 25, 2015, 2:11 p.m.
What happens here if old_label and new_label are bytestrings, since they're then mixing with Unicode strings?	chipx86	June 25, 2015, 2:11 p.m.
Change this comment to reflect that we're no longer using difflib.	brennie	June 25, 2015, 2:21 p.m.

Tool: Pyflakes
Processed Files:
    rbtools/clients/tfs.py



Tool: PEP8 Style Checker
Processed Files:
    rbtools/clients/tfs.py

rbtools/clients/tfs.py (Diff revision 1)
The issue has been resolved. Show all issues
```
Shouldn't this use b'..'?
```

rbtools/clients/tfs.py (Diff revision 1)

The issue has been resolved. Show all issues

What happens here if old_label and new_label are bytestrings, since they're then mixing with Unicode strings?

Commit:

aced203bc7f1bba6d801d7f631b89b1088759331

55ea683fbd627130f87ece50bc3142bf0e88365e

Diff:

Revision 2 (+27 -13)

Show changes

rbtools/clients/tfs.py

Tool: Pyflakes
Processed Files:
    rbtools/clients/tfs.py



Tool: PEP8 Style Checker
Processed Files:
    rbtools/clients/tfs.py

Ship it!

rbtools/clients/tfs.py (Diff revision 2)
The issue has been resolved. Show all issues
```
Change this comment to reflect that we're no longer using difflib.
```

Commit:

55ea683fbd627130f87ece50bc3142bf0e88365e

c990bc21a5e8a7e6755bd55b9deda5562cfedb18

Diff:

Revision 3 (+28 -15)

Show changes

rbtools/clients/tfs.py

Tool: Pyflakes
Processed Files:
    rbtools/clients/tfs.py



Tool: PEP8 Style Checker
Processed Files:
    rbtools/clients/tfs.py

Status:: Completed
Change Summary:: Pushed to release-0.7.x (03b42f1)