Summary

SVN and CVS no longer create diffs relative to current working directory.

Review Request #6388 — Created Oct. 1, 2014 and submitted Oct. 3, 2014, 3:17 p.m.

Information

Owner

brennie

Repository

RBTools

Branch

master

Bugs

Depends On

Commit

929f614...

Reviewers

Groups

rbtools, students

People

Description

CVS and SVN now change to the root directory of the repository for
performing diffs (before changing back).

Add the _get_repository_root method to CVSClient that determines
the root directory of the current CVS repository. It does this by
reading the CVS/Repository file in the current directory and
determining the working direcotry's depth relative to the CVSRoot;
that is the number of directories to traverse up to find the
repository root.

The base_dir parameter of all rbtools.utils.diffs method is no
longer optional because all SCMTools that utilize it require
specifying the root of the repository.

Testing Done

Unit tests pass.
The diffs are generated correctly.

Issues

Description	From	Last Updated
In order to make this exception-safe, this should probably be: try: diff = execute(...) finally: os.chdir(cwd)	david	Oct. 2, 2014, 2:18 p.m.
try/finally here, too.	david	Oct. 2, 2014, 2:18 p.m.
Don't add these lines.	david	Oct. 2, 2014, 2:17 p.m.

Tool: Pyflakes
Processed Files:
    rbtools/clients/cvs.py
    rbtools/clients/svn.py
    rbtools/utils/diffs.py



Tool: PEP8 Style Checker
Processed Files:
    rbtools/clients/cvs.py
    rbtools/clients/svn.py
    rbtools/utils/diffs.py

Change Summary:

Update docstring in CVSClient._get_repository_root

Commit:

add06c65bb4e8ee878764c6a56e8303dbb78bf43

2136ca49787165da71a7716a11007b3024e5e0b0

Groups:

students

Diff:

Revision 2 (+36 -6)

Show changes

	rbtools/clients/cvs.py
	rbtools/clients/svn.py
	rbtools/utils/diffs.py

Tool: Pyflakes
Processed Files:
    rbtools/clients/cvs.py
    rbtools/clients/svn.py
    rbtools/utils/diffs.py



Tool: PEP8 Style Checker
Processed Files:
    rbtools/clients/cvs.py
    rbtools/clients/svn.py
    rbtools/utils/diffs.py

rbtools/clients/cvs.py (Diff revision 2)

The issue has been resolved. Show all issues

In order to make this exception-safe, this should probably be:

try:
    diff = execute(...)
finally:
    os.chdir(cwd)

rbtools/clients/svn.py (Diff revision 2)
The issue has been resolved. Show all issues
```
try/finally here, too.
```
rbtools/clients/svn.py (Diff revision 2)
The issue has been resolved. Show all issues
```
Don't add these lines.
```

Change Summary:

Always return to the original CWD even if calls to execute throw an exception.
CVS SCMClient ensures that the the path that we get from CVS/Repository is a relative path.

Description:

		CVS and SVN now change to the root directory of the repository for
		performing diffs (before changing back).

		Add the `_get_repository_root` method to `CVSClient` that determines
		the root directory of the current CVS repository. It does this by
~		reading the CVS/Repository file in the current directory and counting
~		the number of path seperators in that file; that is the number of
~		directories to traverse up to find the repository root.
	~	reading the CVS/Repository file in the current directory and
	~	determining the working direcotry's depth relative to the CVSRoot;
	~	that is the number of directories to traverse up to find the
	+	repository root.

		The `base_dir` parameter of all `rbtools.utils.diffs` method is no
		longer optional because all SCMTools that utilize it require
		specifying the root of the repository.

Commit:

2136ca49787165da71a7716a11007b3024e5e0b0

bb641b5ec7fb0463d23e7ff8e34228fbd54a3d07

Diff:

Revision 3 (+56 -9)

Show changes

	rbtools/clients/cvs.py
	rbtools/clients/svn.py
	rbtools/utils/diffs.py

Tool: Pyflakes
Processed Files:
    rbtools/clients/cvs.py
    rbtools/clients/svn.py
    rbtools/utils/diffs.py



Tool: PEP8 Style Checker
Processed Files:
    rbtools/clients/cvs.py
    rbtools/clients/svn.py
    rbtools/utils/diffs.py

Change Summary:

Be careful about how we determine the CVS repository root.

Commit:

bb641b5ec7fb0463d23e7ff8e34228fbd54a3d07

929f61442ab85a5ab1695a59ef6a8c28aec1e88d

Diff:

Revision 4 (+62 -9)

Show changes

	rbtools/clients/cvs.py
	rbtools/clients/svn.py
	rbtools/utils/diffs.py

Tool: PEP8 Style Checker
Processed Files:
    rbtools/clients/cvs.py
    rbtools/clients/svn.py
    rbtools/utils/diffs.py



Tool: Pyflakes
Processed Files:
    rbtools/clients/cvs.py
    rbtools/clients/svn.py
    rbtools/utils/diffs.py

Ship it!

```
Ship It!
```

Status:: Completed
Change Summary:: Pushed to release-0.6.x (31aabc4)