Bazaar

Merge lp:~vila/bzr/filtre-tree-bug into lp:bzr

  1. filtre-tree-bug
  2. Merge into bzr.dev
Proposed by Vincent Ladeuil
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: 6551
Proposed branch: lp:~vila/bzr/filtre-tree-bug
Merge into: lp:bzr
Diff against target: 14 lines (+1/-1)
1 file modified
bzrlib/filter_tree.py (+1/-1)
To merge this branch: bzr merge lp:~vila/bzr/filtre-tree-bug
Reviewer Review Type Date Requested Status
John A Meinel Approve
Jelmer Vernooij (community) Approve
Review via email: mp+117900@code.launchpad.net

Commit message

Fix bug in filter_tree.ContentFilterTree.get_file_text

Description of the change

This is one of the uncommitted patches I've carrying in my local bzr.dev for
ages.

The issue was in my way while I was toying around with filters. I fixed it
without writing a test first. Bad vila.

Since I've never found the time to come back to it, better have it out than
hidden.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

On Thu, Aug 02, 2012 at 02:19:23PM -0000, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/filtre-tree-bug into lp:bzr.

> Requested reviews:
> bzr-core (bzr-core)

> For more details, see:
> https://code.launchpad.net/~vila/bzr/filtre-tree-bug/+merge/117900

> This is one of the uncommitted patches I've carrying in my local bzr.dev for
> ages.

> The issue was in my way while I was toying around with filters. I fixed it
> without writing a test first. Bad vila.

  review approve

Cheers,

Jelmer

review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/2/2012 4:19 PM, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/filtre-tree-bug
> into lp:bzr.
>
> Requested reviews: bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~vila/bzr/filtre-tree-bug/+merge/117900
>
> This is one of the uncommitted patches I've carrying in my local
> bzr.dev for ages.
>
> The issue was in my way while I was toying around with filters. I
> fixed it without writing a test first. Bad vila.
>
> Since I've never found the time to come back to it, better have it
> out than hidden.
>

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAlAajeoACgkQJdeBCYSNAAM1cwCeLHZg3KxGTw64grK5M6d/03xQ
1u4AnRCkoQq08Tj/cGMiFClbP++hyTeP
=Z4tw
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/filter_tree.py'
2--- bzrlib/filter_tree.py 2011-12-19 13:23:58 +0000
3+++ bzrlib/filter_tree.py 2012-08-02 14:21:33 +0000
4@@ -46,9 +46,9 @@
5
6 def get_file_text(self, file_id, path=None):
7 chunks = self.backing_tree.get_file_lines(file_id, path)
8- filters = self.filter_stack_callback(path)
9 if path is None:
10 path = self.backing_tree.id2path(file_id)
11+ filters = self.filter_stack_callback(path)
12 context = ContentFilterContext(path, self, None)
13 contents = filtered_output_bytes(chunks, filters, context)
14 content = ''.join(contents)