Summary

Collapse CVS/RCS keywords for diffs and files in CVS.

Review Request #6702 — Created Dec. 18, 2014 and submitted Dec. 31, 2014, 5:46 p.m.

Information

Owner

chipx86

Repository

Review Board

Branch

release-2.0.x

Bugs

Depends On

Commit

d003b97...

Reviewers

Groups

reviewboard

People

Description

CVS suffered from the same problems as Subversion when it came to
handling keywords in fetched files or diffs, resulting in failed
patches.

We now pass -kk when fetching a file, which will tell CVS to collapse
all keywords. This gives us a sane diff we can apply a patch to.

We then collapse keywords in CVS diffs, similarly to how we handle it
with Subversion. It's a bit simpler in CVS, though, since there are a
set of pre-defined keywords, and they're in a specific format, with no
aliases.

Unit tests were added to ensure that keywords were collapsed when
fetching files, and that collapsing keywords in diffs works fine.

Testing Done

Unit tests pass.

Prior to the fix, both unit tests failed in the expected ways.

Issues

Description	From	Last Updated
local variable 'keywords' is assigned to but never used	reviewbot	Dec. 18, 2014, 1:39 p.m.
Can you use single-quotes here?	david	Dec. 31, 2014, 5:40 p.m.

Tool: Pyflakes
Processed Files:
    reviewboard/scmtools/cvs.py
    reviewboard/scmtools/tests.py

Ignored Files:
    reviewboard/scmtools/testdata/cvs_repo/CVSROOT/history
    reviewboard/scmtools/testdata/cvs_repo/test/testfile,v



Tool: PEP8 Style Checker
Processed Files:
    reviewboard/scmtools/cvs.py
    reviewboard/scmtools/tests.py

Ignored Files:
    reviewboard/scmtools/testdata/cvs_repo/CVSROOT/history
    reviewboard/scmtools/testdata/cvs_repo/test/testfile,v

reviewboard/scmtools/cvs.py (Diff revision 1)
The issue has been resolved. Show all issues
```
 local variable 'keywords' is assigned to but never used
```

Change Summary:

Removed some leftover code.

Commit:

2d4b1b26c747be50feec4a209ec66c53432eb75d

d003b97ea0664a5fc1f51d9eac4d0ee78345da9e

Diff:

Revision 2 (+139 -14)

Show changes

	reviewboard/scmtools/cvs.py
	reviewboard/scmtools/tests.py
	reviewboard/scmtools/testdata/cvs_repo/CVSROOT/history
	reviewboard/scmtools/testdata/cvs_repo/test/testfile,v

Tool: Pyflakes
Processed Files:
    reviewboard/scmtools/cvs.py
    reviewboard/scmtools/tests.py

Ignored Files:
    reviewboard/scmtools/testdata/cvs_repo/CVSROOT/history
    reviewboard/scmtools/testdata/cvs_repo/test/testfile,v



Tool: PEP8 Style Checker
Processed Files:
    reviewboard/scmtools/cvs.py
    reviewboard/scmtools/tests.py

Ignored Files:
    reviewboard/scmtools/testdata/cvs_repo/CVSROOT/history
    reviewboard/scmtools/testdata/cvs_repo/test/testfile,v

Ship it!

```
Was there an associated bug?
```
reviewboard/scmtools/cvs.py (Diff revision 2)
The issue has been resolved. Show all issues
```
Can you use single-quotes here?
```

Status:: Completed
Change Summary:: Pushed to release-2.0.x (647afed)

reviewboard/scmtools/cvs.py (Diff revision 1)

reviewboard/scmtools/cvs.py (Diff revision 2)