← Back to branch summary

~ubuntu-branches/debian/jessie/bzr-xmloutput/jessie

« back to all changes in this revision

Viewing changes to debian/patches/2.6_compat

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij
  • Date: 2012-03-22 13:25:18 UTC
  • Revision ID: package-import@ubuntu.com-20120322132518-56toir97hji3x165
Tags: 0.8.8+bzr162-2
http://bugs.debian.org/666630
Add workaround to avoid bzrlib.tree.tree_files, which has disappeared in
bzr 2.6. Closes: #666630

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/2.6_compat
 
1
Description: Avoid using removed builtins.tree_files.
 
2
Origin: commit, revision id: jelmer@samba.org-20120322122317-s4w1qotbysg7sgxg
 
3
Author: Jelmer Vernooij <jelmer@samba.org>
 
4
Last-Update: 2012-03-22
 
5
Applied-Upstream: no
 
6
X-Bzr-Revision-Id: jelmer@samba.org-20120322122317-s4w1qotbysg7sgxg
 
7
 
 
8
=== modified file 'cmds.py'
 
9
--- old/cmds.py 2012-02-21 10:05:57 +0000
 
10
+++ new/cmds.py 2012-03-22 12:23:17 +0000
 
11
@@ -109,7 +109,8 @@
 
12
     @handle_error_xml
 
13
     def run(self, file_list=None, revision=None, versioned=False, null=False):
 
14
         from statusxml import show_tree_status_xml
 
15
-        tree, file_list = builtins.tree_files(file_list)
 
16
+        from bzrlib.workingtree import WorkingTree
 
17
+        tree, file_list = WorkingTree.open_containing_paths(file_list)
 
18
         to_file = self.outf
 
19
         if to_file is None:
 
20
             to_file = sys.stdout
 
21