Issue961

Title cant import patch generated by mq
Priority bug Status resolved
Superseder Nosy List AlexRayne, SergeG, abuehl, cgudrian, djc, lcantey, martinoconnor, pmezard, sborho
Assigned To djc Topics windows

Created on 2008-02-01.08:35:44 by AlexRayne, last changed 2008-08-11.09:07:10 by djc.

Files
File name Uploaded Type Edit Remove
hgpatchbug.zip AlexRayne, 2008-02-01.08:35:44 application/zip
Messages
msg6749 (view) Author: djc Date: 2008-08-11.09:07:10
This was fixed in c1c202e2d45d, which has been in main for a while now.
msg6485 (view) Author: SergeG Date: 2008-07-08.03:58:31
Fwiw,
on my Windows 2000,

|version 1.0.1+20080525| (Mercurial-1.0.1.exe)
has this bug, importing a patch generated by 'hg export'.

|version 626cb86a6523+tortoisehg| (TortoiseHg 0.4rc2 (installer))
(which includes a much older Hg version) works fine.
msg6454 (view) Author: martinoconnor Date: 2008-06-30.20:53:52
Just to clarify, the problem exists in the release installed by the Installer,
_NOT_ in a release that is built locally.

Problem is that demandimport cannot find walk in the canned build (py2exe).
msg6453 (view) Author: djc Date: 2008-06-30.20:48:18
Hmm, I think I ran into the same problem with a locally compiled hg, on Windows
with 2.5. Did you indeed try exactly the same patch? Kind of weird.
msg6452 (view) Author: martinoconnor Date: 2008-06-30.20:39:22
I was able to locally compile the sources at rev 1.0.1 on windows with python2.5
and -c mingw32

This version applied the patch successfully. I think therefore we should turn
our attention to the installer and the bundled python and/or modules.
msg6449 (view) Author: martinoconnor Date: 2008-06-30.08:13:15
from issue1206

My patch was created by hg export, so the issue is not just limited to mq patches.
msg6444 (view) Author: djc Date: 2008-06-30.04:59:13
Oh, and the workaround would be to use bundle/unbundle rather than import/export.
msg6443 (view) Author: djc Date: 2008-06-30.04:58:49
Adding nosy from issue1206.

I should add that someone had this problem in IRC last night as well, so it
seems this is getting more common (I don't think the reporter for 1206 and the
IRC person were the same, but not sure).

The solution might be to disable demandimport for email, since email has it's
own form of lazy importing, IIRC.
msg6137 (view) Author: djc Date: 2008-06-02.12:07:11
Copying a traceback from duplicate issue1150 for reference:

D:\dsh_bcb>hg import change.patch
applying change.patch
** unknown exception encountered, details follow
** report bug details to http://www.selenic.com/mercurial/bts
** or mercurial@selenic.com
** Mercurial Distributed SCM (version 1.0.1+20080525)
Traceback (most recent call last):
  File "hg", line 20, in <module>
  File "mercurial\dispatch.pyc", line 20, in run
  File "mercurial\dispatch.pyc", line 29, in dispatch
  File "mercurial\dispatch.pyc", line 45, in _runcatch
  File "mercurial\dispatch.pyc", line 364, in _dispatch
  File "mercurial\dispatch.pyc", line 417, in _runcommand
  File "mercurial\dispatch.pyc", line 373, in checkargs
  File "mercurial\dispatch.pyc", line 356, in <lambda>
  File "mercurial\commands.pyc", line 1513, in import_
  File "mercurial\patch.pyc", line 81, in extract
  File "mercurial\demandimport.pyc", line 70, in __call__
TypeError: <unloaded module 'walk'> object is not callable
msg5304 (view) Author: djc Date: 2008-02-16.10:08:02
This isn't really a Windows issue in the sense that it probably happens on other
OSes as well, if they used Mercurial's internal patch code.
msg5261 (view) Author: pmezard Date: 2008-02-13.21:46:03
Adding Steve and Lee in nosy list
msg5076 (view) Author: djc Date: 2008-02-01.09:58:59
This is a problem with demandimport. email.message.Message() has "from
email.Iterators import walk" in it's class definition, which is apparently
something demandimport cannot handle. I don't know enough about demandimport yet
to fix this, but I'll look into it tonight.
msg5075 (view) Author: djc Date: 2008-02-01.09:45:07
This error is still in crew. Trying to see if I can fix it.
msg5074 (view) Author: AlexRayne Date: 2008-02-01.08:35:44
i worn in hg 0.9.5 win32 with win extras installer
using mq i have crate an patch? and try to import and commit it in main pero.
tryint to acces by ./.hg/patches/xxxx was failed, and i copy this patch in parent
dir and try again. this failed too. log and repo attached.
History
Date User Action Args
2008-08-11 09:07:10djcsetstatus: chatting -> resolved
nosy: sborho, lcantey, pmezard, AlexRayne, djc, abuehl, cgudrian, martinoconnor, SergeG
messages: + msg6749
2008-07-08 03:58:33SergeGsetnosy: + SergeG
messages: + msg6485
2008-06-30 20:53:52martinoconnorsetnosy: sborho, lcantey, pmezard, AlexRayne, djc, abuehl, cgudrian, martinoconnor
messages: + msg6454
2008-06-30 20:48:19djcsetnosy: sborho, lcantey, pmezard, AlexRayne, djc, abuehl, cgudrian, martinoconnor
messages: + msg6453
2008-06-30 20:39:23martinoconnorsetnosy: sborho, lcantey, pmezard, AlexRayne, djc, abuehl, cgudrian, martinoconnor
messages: + msg6452
2008-06-30 08:13:16martinoconnorsetnosy: sborho, lcantey, pmezard, AlexRayne, djc, abuehl, cgudrian, martinoconnor
messages: + msg6449
2008-06-30 04:59:13djcsetnosy: sborho, lcantey, pmezard, AlexRayne, djc, abuehl, cgudrian, martinoconnor
messages: + msg6444
2008-06-30 04:58:49djcsetnosy: + martinoconnor
messages: + msg6443
2008-06-30 04:56:54djclinkissue1206 superseder
2008-06-02 12:07:14djcsetnosy: + cgudrian, abuehl
messages: + msg6137
2008-06-02 12:06:06djclinkissue1150 superseder
2008-02-16 10:08:02djcsetnosy: sborho, lcantey, pmezard, AlexRayne, djc
messages: + msg5304
2008-02-13 21:46:03pmezardsettopic: + windows
nosy: + lcantey, sborho, pmezard
messages: + msg5261
2008-02-11 13:16:03djcsetassignedto: djc
2008-02-11 13:15:52djcsettopic: - mq, patch
2008-02-01 09:58:59djcsetmessages: + msg5076
2008-02-01 09:45:07djcsetstatus: unread -> chatting
nosy: + djc
messages: + msg5075
2008-02-01 08:35:44AlexRaynecreate