1 |
fauli 12/11/28 19:39:00 |
2 |
|
3 |
Added: bzr-xmloutput-0.8.8_remove-relative-imports.patch |
4 |
Log: |
5 |
revision bump for runtime regression with bzr help commands, as reported by Dan Dexter in bug 418969 |
6 |
|
7 |
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 2B859DE3) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: bzr-xmloutput-0.8.8_remove-relative-imports.patch |
16 |
=================================================================== |
17 |
revno: 160 [merge] |
18 |
author: Jelmer Vernooij <jelmer@×××××.org> |
19 |
committer: Guillermo Gonzalez <guillo.gonzo@×××××.com> |
20 |
branch nick: trunk |
21 |
timestamp: Mon 2011-12-19 18:45:35 -0300 |
22 |
message: |
23 |
Removes the use of relative imports and avoids using lazy_import in a few places we're it doesn't make a difference. |
24 |
|
25 |
Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=418969 |
26 |
Upstream bug: https://bugs.launchpad.net/bzr-xmloutput/+bug/955329 |
27 |
Commit: http://bazaar.launchpad.net/~verterok/bzr-xmloutput/trunk/revision/160 |
28 |
|
29 |
--- cmds.py 2011-03-09 23:19:41 +0000 |
30 |
+++ cmds.py 2011-12-12 15:11:38 +0000 |
31 |
@@ -22,36 +22,39 @@ |
32 |
|
33 |
import info |
34 |
import bzrlib |
35 |
+from bzrlib.option import Option |
36 |
+from bzrlib.commands import ( |
37 |
+ Command, |
38 |
+ display_command, |
39 |
+ ) |
40 |
from bzrlib.lazy_import import lazy_import |
41 |
lazy_import(globals(), """ |
42 |
import sys |
43 |
from bzrlib import ( |
44 |
builtins, |
45 |
bzrdir, |
46 |
- commands, |
47 |
- option, |
48 |
log, |
49 |
workingtree, |
50 |
errors |
51 |
) |
52 |
|
53 |
-from bzrlib.option import Option, custom_help |
54 |
-from bzrlib.commands import display_command |
55 |
-import logxml |
56 |
-import service |
57 |
+from bzrlib.plugins.xmloutput import ( |
58 |
+ logxml, |
59 |
+ service, |
60 |
+ ) |
61 |
import socket |
62 |
-from xml_errors import handle_error_xml |
63 |
""") |
64 |
|
65 |
+from bzrlib.plugins.xmloutput.xml_errors import handle_error_xml |
66 |
|
67 |
version_info = info.bzr_plugin_version |
68 |
plugin_name = info.bzr_plugin_name |
69 |
|
70 |
-null_option = option.Option('null', |
71 |
- help='Write an ascii NUL (\\0) as the final char.') |
72 |
- |
73 |
- |
74 |
-class cmd_xmlstatus(commands.Command): |
75 |
+null_option = Option('null', |
76 |
+ help='Write an ascii NUL (\\0) as the final char.') |
77 |
+ |
78 |
+ |
79 |
+class cmd_xmlstatus(Command): |
80 |
"""Display status summary. |
81 |
|
82 |
This reports on versioned and unknown files, reporting them |
83 |
@@ -118,7 +121,7 @@ |
84 |
self.outf.write('\n') |
85 |
|
86 |
|
87 |
-class cmd_xmlannotate(commands.Command): |
88 |
+class cmd_xmlannotate(Command): |
89 |
"""Show the origin of each line in a file. |
90 |
|
91 |
This prints out the given file with an annotation on the left side |
92 |
@@ -176,7 +179,7 @@ |
93 |
branch.unlock() |
94 |
|
95 |
|
96 |
-class cmd_xmlmissing(commands.Command): |
97 |
+class cmd_xmlmissing(Command): |
98 |
"""Show unmerged/unpulled revisions between two branches. |
99 |
|
100 |
OTHER_BRANCH may be local or remote. |
101 |
@@ -212,7 +215,7 @@ |
102 |
self.outf.write('\n') |
103 |
|
104 |
|
105 |
-class cmd_xmlinfo(commands.Command): |
106 |
+class cmd_xmlinfo(Command): |
107 |
"""Show information about a working tree, branch or repository. |
108 |
|
109 |
This command will show all known locations and formats associated to the |
110 |
@@ -247,7 +250,7 @@ |
111 |
self.outf.write('\n') |
112 |
|
113 |
|
114 |
-class cmd_xmlplugins(commands.Command): |
115 |
+class cmd_xmlplugins(Command): |
116 |
"""List the installed plugins. |
117 |
|
118 |
This command displays the list of installed plugins including |
119 |
@@ -284,7 +287,7 @@ |
120 |
self.outf.write('\n') |
121 |
|
122 |
|
123 |
-class cmd_xmlversion(commands.Command): |
124 |
+class cmd_xmlversion(Command): |
125 |
"""Show version of bzr.""" |
126 |
hidden = True |
127 |
encoding_type = 'replace' |
128 |
@@ -383,7 +386,7 @@ |
129 |
self.outf.write('\0') |
130 |
self.outf.write('\n') |
131 |
|
132 |
-class cmd_start_xmlrpc(commands.Command): |
133 |
+class cmd_start_xmlrpc(Command): |
134 |
"""Start the xmlrpc service.""" |
135 |
|
136 |
hidden = True |
137 |
@@ -413,7 +416,7 @@ |
138 |
self.server.shutdown() |
139 |
|
140 |
|
141 |
-class cmd_stop_xmlrpc(commands.Command): |
142 |
+class cmd_stop_xmlrpc(Command): |
143 |
"""Stops a xmlrpc service.""" |
144 |
|
145 |
hidden = True |
146 |
|
147 |
--- infoxml.py 2009-07-28 03:43:56 +0000 |
148 |
+++ infoxml.py 2011-12-12 15:11:38 +0000 |
149 |
@@ -27,6 +27,7 @@ |
150 |
|
151 |
__all__ = ['show_bzrdir_info_xml'] |
152 |
|
153 |
+from bzrlib import info |
154 |
from bzrlib.lazy_import import lazy_import |
155 |
lazy_import(globals(), """ |
156 |
import os, sys, time |
157 |
@@ -36,7 +37,6 @@ |
158 |
errors, |
159 |
osutils, |
160 |
urlutils, |
161 |
- info, |
162 |
missing, |
163 |
) |
164 |
""") |
165 |
|
166 |
--- logxml.py 2010-12-15 18:27:12 +0000 |
167 |
+++ logxml.py 2011-12-12 15:11:38 +0000 |
168 |
@@ -1,14 +1,12 @@ |
169 |
# -*- encoding: utf-8 -*- |
170 |
|
171 |
-import os |
172 |
- |
173 |
+from bzrlib import log |
174 |
from bzrlib.lazy_import import lazy_import |
175 |
lazy_import(globals(), """ |
176 |
import bzrlib |
177 |
from bzrlib import ( |
178 |
debug, |
179 |
osutils, |
180 |
- log, |
181 |
) |
182 |
""") |
183 |
|
184 |
|
185 |
--- lsxml.py 2011-03-09 23:41:22 +0000 |
186 |
+++ lsxml.py 2011-12-12 15:11:38 +0000 |
187 |
@@ -19,8 +19,6 @@ |
188 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
189 |
# |
190 |
|
191 |
-import os |
192 |
- |
193 |
from bzrlib.lazy_import import lazy_import |
194 |
lazy_import(globals(), """ |
195 |
from bzrlib import bzrdir, errors, osutils |
196 |
|
197 |
--- service.py 2010-02-23 23:38:02 +0000 |
198 |
+++ service.py 2011-12-12 15:11:38 +0000 |
199 |
@@ -20,6 +20,8 @@ |
200 |
# |
201 |
""" xmlrpc service module """ |
202 |
|
203 |
+import os |
204 |
+ |
205 |
from bzrlib.lazy_import import lazy_import |
206 |
lazy_import(globals(), """ |
207 |
import bzrlib |
208 |
@@ -30,14 +32,13 @@ |
209 |
osutils |
210 |
) |
211 |
import sys |
212 |
-import os |
213 |
import codecs |
214 |
import logging |
215 |
import traceback |
216 |
from cStringIO import StringIO |
217 |
""") |
218 |
|
219 |
-from xml_errors import XMLError |
220 |
+from bzrlib.plugins.xmloutput.xml_errors import XMLError |
221 |
from xmlrpclib import Fault, Binary |
222 |
from SimpleXMLRPCServer import SimpleXMLRPCServer |
223 |
|
224 |
|
225 |
--- statusxml.py 2010-12-15 18:27:12 +0000 |
226 |
+++ statusxml.py 2011-12-12 15:11:38 +0000 |
227 |
@@ -33,7 +33,7 @@ |
228 |
trace, |
229 |
) |
230 |
|
231 |
-import logxml |
232 |
+from bzrlib.plugins.xmloutput import logxml |
233 |
""") |
234 |
|
235 |
from writer import _escape_cdata |