Summary

Add support for -X to the Bazaar SCM Client.

Review Request #6349 — Created Sept. 20, 2014 and submitted Sept. 22, 2014, 4:21 p.m.

Information

Owner

brennie

Repository

RBTools

Branch

release-0.6.x

Bugs

Depends On

~~6357~~

Blocks

6358

Commit

cc6e620...

Reviewers

Groups

rbtools, students

People

Description

Bazaar now supports excluding files from diffs and posts via
rbtools.utils.diffs.filter_diff, which looks through the
output of bzr diff for lines indicating the start of a file's
diff. If the file specified matches any pattern, that file's
diff is excluded from the resulting diff or post.

Add a test for checking the result of the BazaarClient's diff
with file exclusion.

Testing Done

Unit tests pass.

Ran rbt dff -X .. in a Bazaar repository and got the specified file was
not included.

Issues

Description	From	Last Updated
If there's a diff but no exclude_patterns, I think this would end up calling join() and passing in a single …	david	Sept. 21, 2014, 6:47 a.m.
This isn't aligned properly. The result... is a parameter to filter(), not len()	david	Sept. 21, 2014, 8:54 a.m.
This is very minor, but there's an extra blank line here.	anselina	Sept. 21, 2014, 6:48 a.m.
'fnmatch' imported but unused	reviewbot	Sept. 21, 2014, 2:04 p.m.
'fnmatch' imported but unused	reviewbot	Sept. 21, 2014, 2:04 p.m.

Tool: Pyflakes
Processed Files:
    rbtools/clients/tests.py
    rbtools/clients/bazaar.py



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

Change Summary:: Added students group
Groups:: students

Change Summary:

Update docs to reflect that Bazaar supports -X.

Commit:

90181785819b5f37a3493df9f1bda38312f61c4d

03f32f1c465e4636d3baa5bc953218626cf6ba1c

Diff:

Revision 2 (+67 -7)

Show changes

	docs/rbtools/rbt/commands/diff.rst
	docs/rbtools/rbt/commands/post.rst
	rbtools/clients/bazaar.py
	rbtools/clients/tests.py

Tool: Pyflakes
Processed Files:
    rbtools/clients/tests.py
    rbtools/clients/bazaar.py

Ignored Files:
    docs/rbtools/rbt/commands/post.rst
    docs/rbtools/rbt/commands/diff.rst



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

Ignored Files:
    docs/rbtools/rbt/commands/post.rst
    docs/rbtools/rbt/commands/diff.rst

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

The issue has been dropped. Show all issues

If there's a diff but no exclude_patterns, I think this would end up calling join() and passing in a single string (which probably works since strings are iterable but could be very inefficient). How about something like this:

if exclude_patterns:
    return ''.join(self._filter_diff(diff, exclude_patterns))
else:
    return diff

brennie Sept. 21, 2014, 6:47 a.m.

The execute call has split_lines=True set, so this will return an array of strings.

rbtools/clients/tests.py (Diff revision 2)
The issue has been resolved. Show all issues
```
This is very minor, but there's an extra blank line here.
```

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

The issue has been resolved. Show all issues

This isn't aligned properly. The result... is a parameter to filter(), not len()

Change Summary:

Refactor to use a util function instead of methods in the individual classes.

Description:

		Bazaar now supports excluding files from diffs and posts via
~		`_filter_diff`, which looks through the output of bzr diff for lines
~		indicating the start of a file's diff. If the file specified matches any
~		pattern, that file's diff is excluded from the resulting diff or post.
	~	`rbtools.utils.diffs.filter_diff`, which looks through the
	~	output of bzr diff for lines indicating the start of a file's
	~	diff. If the file specified matches any pattern, that file's
	+	diff is excluded from the resulting diff or post.

~		Add a test for checking the result of the BazaarClient's diff with file
~		exclusion.
	~	Add a test for checking the result of the BazaarClient's diff
	~	with file exclusion.
	+
	+	The SVN support for -X has been refactored to use
	+	`rbtools.utils.diffs.filter_diff` instead of a method.

Commit:

03f32f1c465e4636d3baa5bc953218626cf6ba1c

4904293342305d865124818351880c2ff002540d

Diff:

Revision 3 (+70 -36)

Show changes

	docs/rbtools/rbt/commands/diff.rst
	docs/rbtools/rbt/commands/post.rst
	rbtools/clients/bazaar.py
	rbtools/clients/svn.py
	rbtools/clients/tests.py
	rbtools/utils/diffs.py

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

Ignored Files:
    docs/rbtools/rbt/commands/post.rst
    docs/rbtools/rbt/commands/diff.rst



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

Ignored Files:
    docs/rbtools/rbt/commands/post.rst
    docs/rbtools/rbt/commands/diff.rst

rbtools/clients/bazaar.py (Diff revision 3)
The issue has been resolved. Show all issues
```
 'fnmatch' imported but unused
```
rbtools/clients/svn.py (Diff revision 3)
The issue has been resolved. Show all issues
```
 'fnmatch' imported but unused
```

Change Summary:

Remove unnecessary imports.

Commit:

4904293342305d865124818351880c2ff002540d

df4c04dde65eb476d09eef7268490186b92dd38d

Diff:

Revision 4 (+69 -37)

Show changes

	docs/rbtools/rbt/commands/diff.rst
	docs/rbtools/rbt/commands/post.rst
	rbtools/clients/bazaar.py
	rbtools/clients/svn.py
	rbtools/clients/tests.py
	rbtools/utils/diffs.py

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

Ignored Files:
    docs/rbtools/rbt/commands/post.rst
    docs/rbtools/rbt/commands/diff.rst



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

Ignored Files:
    docs/rbtools/rbt/commands/post.rst
    docs/rbtools/rbt/commands/diff.rst

Can you separate this into two changes? One for bzr and the other for svn?

brennie Sept. 22, 2014, 3:28 p.m.

The refactoring of _filter_diff into rbtools.utils.diffs.filter_diff is now in review request 6357

Change Summary:

Depend on the SVN refactor review request.

Description:

		Bazaar now supports excluding files from diffs and posts via
		`rbtools.utils.diffs.filter_diff`, which looks through the
		output of bzr diff for lines indicating the start of a file's
		diff. If the file specified matches any pattern, that file's
		diff is excluded from the resulting diff or post.

		Add a test for checking the result of the BazaarClient's diff
		with file exclusion.
-
-		The SVN support for -X has been refactored to use
-		`rbtools.utils.diffs.filter_diff` instead of a method.

Depends On:

~~6357 - Refactor SVN's filter diff into a utility function~~

Commit:

df4c04dde65eb476d09eef7268490186b92dd38d

cc6e62090fb8e3bc6528def1066ad119b8524050

Diff:

Revision 5 (+41 -7)

Show changes

	docs/rbtools/rbt/commands/diff.rst
	docs/rbtools/rbt/commands/post.rst
	rbtools/clients/bazaar.py
	rbtools/clients/tests.py

Tool: Pyflakes
Processed Files:
    rbtools/clients/tests.py
    rbtools/clients/bazaar.py

Ignored Files:
    docs/rbtools/rbt/commands/post.rst
    docs/rbtools/rbt/commands/diff.rst



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

Ignored Files:
    docs/rbtools/rbt/commands/post.rst
    docs/rbtools/rbt/commands/diff.rst

Ship it!

```
Ship It!
```

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