##// END OF EJS Templates
scmutil: use util.queue/util.empty for py3 compat
timeless -
r28819:826d457d default
parent child Browse files
Show More
@@ -7,7 +7,6 b''
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import Queue
11 import contextlib
10 import contextlib
12 import errno
11 import errno
13 import glob
12 import glob
@@ -1320,7 +1319,7 b' class backgroundfilecloser(object):'
1320 ui.debug('starting %d threads for background file closing\n' %
1319 ui.debug('starting %d threads for background file closing\n' %
1321 threadcount)
1320 threadcount)
1322
1321
1323 self._queue = Queue.Queue(maxsize=maxqueue)
1322 self._queue = util.queue(maxsize=maxqueue)
1324 self._running = True
1323 self._running = True
1325
1324
1326 for i in range(threadcount):
1325 for i in range(threadcount):
@@ -1352,7 +1351,7 b' class backgroundfilecloser(object):'
1352 except Exception as e:
1351 except Exception as e:
1353 # Stash so can re-raise from main thread later.
1352 # Stash so can re-raise from main thread later.
1354 self._threadexception = e
1353 self._threadexception = e
1355 except Queue.Empty:
1354 except util.empty:
1356 if not self._running:
1355 if not self._running:
1357 break
1356 break
1358
1357
@@ -137,11 +137,11 b''
137 hgext/win*text.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
137 hgext/win*text.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
138 mercurial/archival.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
138 mercurial/archival.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
139 mercurial/bookmarks.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
139 mercurial/bookmarks.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
140 mercurial/branchmap.py: error importing: <ImportError> No module named 'Queue' (error at scmutil.py:*) (glob)
140 mercurial/branchmap.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
141 mercurial/bundle*.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
141 mercurial/bundle*.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
142 mercurial/bundlerepo.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob)
142 mercurial/bundlerepo.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob)
143 mercurial/byterange.py: error importing module: <ImportError> No module named 'urllib2' (line *) (glob)
143 mercurial/byterange.py: error importing module: <ImportError> No module named 'urllib2' (line *) (glob)
144 mercurial/changegroup.py: error importing: <ImportError> No module named 'Queue' (error at scmutil.py:*) (glob)
144 mercurial/changegroup.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
145 mercurial/changelog.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
145 mercurial/changelog.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
146 mercurial/cmdutil.py: error importing module: <ImportError> No module named 'cStringIO' (line *) (glob)
146 mercurial/cmdutil.py: error importing module: <ImportError> No module named 'cStringIO' (line *) (glob)
147 mercurial/commands.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
147 mercurial/commands.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
@@ -199,7 +199,7 b''
199 mercurial/repoview.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
199 mercurial/repoview.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
200 mercurial/revlog.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
200 mercurial/revlog.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
201 mercurial/revset.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
201 mercurial/revset.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
202 mercurial/scmutil.py: error importing module: <ImportError> No module named 'Queue' (line *) (glob)
202 mercurial/scmutil.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
203 mercurial/scmwindows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob)
203 mercurial/scmwindows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob)
204 mercurial/similar.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
204 mercurial/similar.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
205 mercurial/simplemerge.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
205 mercurial/simplemerge.py: error importing: <ImportError> No module named 'cStringIO' (error at mpatch.py:*) (glob)
@@ -208,7 +208,7 b''
208 mercurial/sslutil.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
208 mercurial/sslutil.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
209 mercurial/statichttprepo.py: error importing module: <ImportError> No module named 'urllib2' (line *) (glob)
209 mercurial/statichttprepo.py: error importing module: <ImportError> No module named 'urllib2' (line *) (glob)
210 mercurial/store.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
210 mercurial/store.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
211 mercurial/streamclone.py: error importing: <ImportError> No module named 'Queue' (error at scmutil.py:*) (glob)
211 mercurial/streamclone.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
212 mercurial/subrepo.py: error importing: <ImportError> No module named 'cStringIO' (error at cmdutil.py:*) (glob)
212 mercurial/subrepo.py: error importing: <ImportError> No module named 'cStringIO' (error at cmdutil.py:*) (glob)
213 mercurial/tagmerge.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
213 mercurial/tagmerge.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
214 mercurial/tags.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
214 mercurial/tags.py: error importing: <ImportError> No module named 'cStringIO' (error at parsers.py:*) (glob)
General Comments 0
You need to be logged in to leave comments. Login now