Merge lp:~gz/bzr-update-copyright/tree_files_rename into lp:bzr-update-copyright

Proposed by Martin Packman
Status: Merged
Approved by: John A Meinel
Approved revision: 12
Merged at revision: 12
Proposed branch: lp:~gz/bzr-update-copyright/tree_files_rename
Merge into: lp:bzr-update-copyright
Diff against target: 18 lines (+4/-2)
1 file modified
__init__.py (+4/-2)
To merge this branch: bzr merge lp:~gz/bzr-update-copyright/tree_files_rename
Reviewer Review Type Date Requested Status
John A Meinel Approve
Jelmer Vernooij (community) Approve
Review via email: mp+162143@code.launchpad.net

Description of the change

The function builts.tree_files() has been moved in newer versions of bzr, to being a static method on WorkingTree. With this update the plugin works and tests pass with current bzr.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

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

On 05/02/2013 11:42 AM, Jelmer Vernooij wrote:
> Review: Approve
>
>

 merge: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iEYEARECAAYFAlGJIfUACgkQJdeBCYSNAANlrwCbBX7Y1lpQK4xCCr8wPy0nLWIc
PW0An21260N25udIyNvgWbdE+anRjYs/
=E8oE
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2010-01-11 18:18:39 +0000
3+++ __init__.py 2013-05-02 16:24:49 +0000
4@@ -62,10 +62,12 @@
5 ]
6
7 def run(self, path_list=None, only_changed=False):
8- from bzrlib import builtins, osutils
9+ from bzrlib import osutils, workingtree
10 import update_copyright
11
12- tree, relpaths = builtins.tree_files(path_list)
13+ tree, relpaths = workingtree.WorkingTree.open_containing_paths(
14+ path_list)
15+
16 if relpaths == ['']:
17 # Selecting just the root selects everything
18 relpaths = None

Subscribers

People subscribed via source and target branches