Mercurial > hg
annotate contrib/wix/guids.wxi @ 25329:101e84121c13
dispatch: disable demandimport for the --debugger option
Something in Python 2.7.9 or so broke the --debugger option with
ui.debugger = ipdb. I get the traceback below. There is some apparent
confusion with demandimport. This should be disabled anyway for the
--debugger option. The debugger must be imported right away, before
any other dispatch. There's no benefit in delaying the debugger
import.
This patch uses the demandimport.deactivated() context manager.
Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/mercurial/dispatch.py", line 121, in _runcatch
debugmod = __import__(debugger)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 115, in _demandimport
return _hgextimport(_import, name, globals, locals, fromlist, level)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/ipdb/__init__.py", line 16, in <module>
from ipdb.__main__ import set_trace, post_mortem, pm, run, runcall, runeval, launch_ipdb_on_exception
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 134, in _demandimport
mod = _hgextimport(_origimport, name, globals, locals)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/ipdb/__main__.py", line 29, in <module>
if IPython.__version__ > '0.10.2':
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 106, in __getattribute__
self._load()
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 78, in _load
mod = _hgextimport(_import, head, globals, locals, None, level)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/IPython/__init__.py", line 45, in <module>
from .config.loader import Config
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 132, in _demandimport
return _origimport(name, globals, locals, fromlist, level)
File "/usr/lib/python2.7/dist-packages/IPython/config/__init__.py", line 16, in <module>
from .application import *
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 115, in _demandimport
return _hgextimport(_import, name, globals, locals, fromlist, level)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/IPython/config/application.py", line 30, in <module>
from IPython.external.decorator import decorator
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 134, in _demandimport
mod = _hgextimport(_origimport, name, globals, locals)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/IPython/external/decorator/__init__.py", line 2, in <module>
from decorator import *
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 115, in _demandimport
return _hgextimport(_import, name, globals, locals, fromlist, level)
File "/usr/lib/python2.7/dist-packages/mercurial/demandimport.py", line 47, in _hgextimport
return importfunc(name, globals, *args)
File "/usr/lib/python2.7/dist-packages/decorator.py", line 240, in <module>
'ContextManager', (_GeneratorContextManager,), dict(__call__=__call__))
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Thu, 28 May 2015 16:42:21 -0400 |
parents | 3098dcd2d167 |
children | 95e042d77a5f |
rev | line source |
---|---|
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
1 <Include> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
2 <!-- These are component GUIDs used for Mercurial installers. |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
3 YOU MUST CHANGE ALL GUIDs below when copying this file |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
4 and replace 'Mercurial' in this notice with the name of |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
5 your project. Component GUIDs have global namespace! --> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
6 |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
7 <!-- contrib.wxs --> |
22445
5716d10e89e7
wix: contrib/sample.hgrc is no more
Steve Borho <steve@borho.org>
parents:
20315
diff
changeset
|
8 <?define contrib.guid = {4E11FFC2-E2F7-482A-8460-9394B5489F02} ?> |
12792
0c6c600c03fd
wix: add vim syntax file for Mercurial unit tests
Steve Borho <steve@borho.org>
parents:
12791
diff
changeset
|
9 <?define contrib.vim.guid = {BB04903A-652D-4C4F-9590-2BD07A2304F2} ?> |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
10 |
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
12830
diff
changeset
|
11 <!-- dist.wxs --> |
13375
f1fa8f481c7c
port win32.py to using the Python ctypes library
Adrian Buehlmann <adrian@cadifra.com>
parents:
13216
diff
changeset
|
12 <?define dist.guid = {C3B634A4-1B05-4A40-94A9-38EE853CF693} ?> |
13041
79388a8325dc
wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
12830
diff
changeset
|
13 |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
14 <!-- doc.wxs --> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
15 <?define doc.hg.1.html.guid = {AAAA3FDA-EDC5-4220-B59D-D342722358A2} ?> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
16 <?define doc.hgignore.5.html.guid = {AA9118C4-F3A0-4429-A5F4-5A1906B2D67F} ?> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
17 <?define doc.hgrc.5.html = {E0CEA1EB-FA01-408c-844B-EE5965165BAE} ?> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
18 <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?> |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
19 |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
20 <!-- help.wxs --> |
16220
939f043ab5ed
wix: add phases help text and two more translations (issue 3288)
Steve Borho <steve@borho.org>
parents:
15764
diff
changeset
|
21 <?define helpFolder.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?> |
19023
86531a7038ed
codingstyle: remove trailing spaces in various text files
Mads Kiilerich <madski@unity3d.com>
parents:
17420
diff
changeset
|
22 |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
23 <!-- i18n.wxs --> |
16220
939f043ab5ed
wix: add phases help text and two more translations (issue 3288)
Steve Borho <steve@borho.org>
parents:
15764
diff
changeset
|
24 <?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?> |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
25 |
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
26 <!-- templates.wxs --> |
20315 | 27 <?define templates.root.guid = {437FD55C-7756-4EA0-87E5-FDBE75DC8595} ?> |
28 <?define templates.atom.guid = {D30E14A5-8AF0-4268-8B00-00BEE9E09E39} ?> | |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
29 <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?> |
17420
d79df9fd5374
wix: pick up new template files
Steve Borho <steve@borho.org>
parents:
16220
diff
changeset
|
30 <?define templates.gitweb.guid = {827334AF-1EFD-421B-962C-5660A068F612} ?> |
24989
3098dcd2d167
wix: add new json templates folder to MSI installers
Steve Borho <steve@borho.org>
parents:
24839
diff
changeset
|
31 <?define templates.json.guid = {F535BE7A-EC34-46E0-B9BE-013F3DBAFB19} ?> |
17420
d79df9fd5374
wix: pick up new template files
Steve Borho <steve@borho.org>
parents:
16220
diff
changeset
|
32 <?define templates.monoblue.guid = {8060A1E4-BD4C-453E-92CB-9536DC44A9E3} ?> |
d79df9fd5374
wix: pick up new template files
Steve Borho <steve@borho.org>
parents:
16220
diff
changeset
|
33 <?define templates.paper.guid = {61AB1DE9-645F-46ED-8AF8-0CF02267FFBB} ?> |
20315 | 34 <?define templates.raw.guid = {834DF8D7-9784-43A6-851D-A96CE1B3575B} ?> |
35 <?define templates.rss.guid = {9338FA09-E128-4B1C-B723-1142DBD09E14} ?> | |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
36 <?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?> |
20315 | 37 <?define templates.static.guid = {6B3D7C24-98DA-4B67-9F18-35F77357B0B4} ?> |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
38 |
10930 | 39 <!-- mercurial.wxs --> |
40 <?define ProductUpgradeCode = {A1CC6134-E945-4399-BE36-EB0017FDF7CF} ?> | |
41 | |
42 <?define ComponentMainExecutableGUID = {D102B8FA-059B-4ACC-9FA3-8C78C3B58EEF} ?> | |
43 | |
44 <?define ReadMe.guid = {56A8E372-991D-4DCA-B91D-93D775974CF5} ?> | |
45 <?define COPYING.guid = {B7801DBA-1C49-4BF4-91AD-33C65F5C7895} ?> | |
46 <?define mercurial.rc.guid = {1D5FAEEE-7E6E-43B1-9F7F-802714316B15} ?> | |
47 <?define mergetools.rc.guid = {E8A1DC29-FF40-4B5F-BD12-80B9F7BF0CCD} ?> | |
48 <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?> | |
49 | |
10828
1aa9464ce9ae
wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents:
diff
changeset
|
50 </Include> |