<div>yeah, its tricky.</div><div><br></div><div>i think it depends on how closely the project tracks cpython.</div><div><br></div><div>to minimize the stackless/cpython diff and to use mercurial to help with merging in both directions it would probably be easier to base a new stackless mercurial repository on the current cpython repository.</div>
<div><br></div><div>preserving the complete history of the stackless repository in a clone of the cpython repository would take some effort but it may be possible.</div><div><br></div><div>i'm willing to spend some time on either this approach or a clean slate if everyone is interested in moving to mercurial.</div>
<div><br></div><div>thanks,</div><div><br></div><div>gene<br><br><div class="gmail_quote">On Tue, Mar 29, 2011 at 9:28 AM, Jeff Senn <span dir="ltr"><<a href="mailto:senn@maya.com">senn@maya.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><div style="word-wrap:break-word">Thanks for the explanation!<div><br><div><div class="im"><div>On Mar 29, 2011, at 10:16 AM, Kristján Valur Jónsson wrote:</div>
<br><blockquote type="cite"><span style="border-collapse:separate;font-family:'Lucida Grande';font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;font-size:medium"><div lang="EN-US" link="blue" vlink="purple">
<div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">Well, we have the permission to host stackless at<span> </span><a href="http://hg.python.org/" style="color:blue;text-decoration:underline" target="_blank" class="vt-p">hg.python.org</a>.  The question is just how.</span></div>
<div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">It will be a new project and the question is whether we should try to recreate the svn history in hg, (complicated, apparently) or just start afresh with a clear slate and a few branches.</span></div>
</div></div></span></blockquote><div><br></div></div>Though the historian in me cringes horribly ... *practically* speaking the latter is probably sufficient (given that there probably aren't too many</div><div>projects around stuck in particular branches of stackless which will later need carefully tended paths forward).</div>
<div><br></div><div>Perhaps more significantly how will it be represented? as a branch from the particular python version? or completely separate code that shares</div><div>a lot of similar pieces?  I'm not sure I understand enough about merging in this new world to know how to think about it...  I just hope it's not</div>
<div>any *worse* than svnmerge :-)</div><div><br><blockquote type="cite"><span style="border-collapse:separate;font-family:'Lucida Grande';font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;line-height:normal;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;font-size:medium"><div lang="EN-US" link="blue" vlink="purple">
<div><div></div><div class="h5"><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)"></span></div>
<div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">As for Nagare:</span></div>
<div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">At pycon, we were sprinting on adding picking for (vanilla) python’s built in iterators.  This would reduce the diff between Stackless and CPython.</span></div>
<div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">We have a clone of<span> </span><a href="http://hg.python.org/cpython" style="color:blue;text-decoration:underline" target="_blank" class="vt-p">hg.python.org/cpython</a><span> </span>sitting at<span> </span><a href="http://nagare.org:8000/cpython" style="color:blue;text-decoration:underline" target="_blank" class="vt-p">http://nagare.org:8000/cpython</a><span> </span>and this is the repository that we used to synchronize our work.</span></div>
<div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">It’s just a temporary one, for this particular code sprint.</span></div>
<div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)"> </span></div>
<div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">K</span></div>
<div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)"> </span></div>
<div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)"> </span></div>
<div style="border-top-style:none;border-right-style:none;border-bottom-style:none;border-width:initial;border-color:initial;border-left-style:solid;border-left-color:blue;border-left-width:1.5pt;padding-top:0cm;padding-right:0cm;padding-bottom:0cm;padding-left:4pt">
<div><div style="border-right-style:none;border-bottom-style:none;border-left-style:none;border-width:initial;border-color:initial;border-top-style:solid;border-top-color:rgb(181, 196, 223);border-top-width:1pt;padding-top:3pt;padding-right:0cm;padding-bottom:0cm;padding-left:0cm">
<div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><b><span style="font-size:10pt;font-family:Tahoma, sans-serif">From:</span></b><span style="font-size:10pt;font-family:Tahoma, sans-serif"><span> </span><a href="mailto:stackless-bounces@stackless.com" style="color:blue;text-decoration:underline" target="_blank" class="vt-p">stackless-bounces@stackless.com</a><span> </span>[mailto:<a href="mailto:stackless-bounces@stackless.com" target="_blank" class="vt-p">stackless-bounces@stackless.com</a>]<span> </span><b>On Behalf Of<span> </span></b>Jeff Senn<br>
<b>Sent:</b><span> </span>29. mars 2011 14:01<br><b>To:</b><span> </span>The Stackless Python Mailing List<br><b>Subject:</b><span> </span>Re: [Stackless] Me Bad Re: Stackless sprint at PyCon</span></div></div></div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif">
 </div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif">So what is the plan for a source repository for stackless? (now that python proper is moving/has moved to<span> </span><a href="http://hg.python.org/" style="color:blue;text-decoration:underline" target="_blank" class="vt-p">hg.python.org</a>)</div>
<div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"> </div></div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif">
K, you mentioned Nagare.... is there one in the Nagare repos somewhere?  Is that going to be "official"?  Should this:</div></div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif">
<a href="http://zope.stackless.com/svn/sdocument_view" style="color:blue;text-decoration:underline" target="_blank" class="vt-p">http://zope.stackless.com/svn/sdocument_view</a>  get updated?</div></div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif">
 </div></div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"> </div></div><div><div><div><div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif">
On Mar 29, 2011, at 9:44 AM, Kristján Valur Jónsson wrote:</div></div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><br><br>
</div><div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">I just uploaded my most recent changes.  I think we have all of the iterators covered in cpython now, apart from “generators”</span></div>
</div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">Please take a look.</span></div>
</div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">The next step is to get this stuff into cpython proper, I´ll start the process for that.</span></div>
</div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)"> </span></div>
</div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">K</span></div>
</div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)"> </span></div>
</div><div style="border-top-style:none;border-right-style:none;border-bottom-style:none;border-width:initial;border-color:initial;border-left-style:solid;padding-top:0cm;padding-right:0cm;padding-bottom:0cm;padding-left:4pt;border-width:initial;border-color:initial">
<div><div style="border-right-style:none;border-bottom-style:none;border-left-style:none;border-width:initial;border-color:initial;border-top-style:solid;padding-top:3pt;padding-right:0cm;padding-bottom:0cm;padding-left:0cm;border-width:initial;border-color:initial">
<div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><b><span style="font-size:10pt;font-family:Tahoma, sans-serif">From:</span></b><span><span style="font-size:10pt;font-family:Tahoma, sans-serif"> </span></span><span style="font-size:10pt;font-family:Tahoma, sans-serif"><a href="mailto:stackless-bounces@stackless.com" style="color:blue;text-decoration:underline" target="_blank" class="vt-p">stackless-bounces@stackless.com</a><span> </span>[mailto:<a href="mailto:stackless-bounces@stackless.com" target="_blank" class="vt-p">stackless-bounces@stackless.com</a>]<span> </span><b>On Behalf Of<span> </span></b>Kristján Valur Jónsson<br>
<b>Sent:</b><span> </span>23. mars 2011 09:16<br><b>To:</b><span> </span>The Stackless Python Mailing List<br><b>Cc:</b><span> </span>Andrew Francis<br><b>Subject:</b><span> </span>Re: [Stackless] Me Bad Re: Stackless sprint at PyCon</span></div>
</div></div></div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"> </div></div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif">
<span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">I’m doing some review and cleanup of your contributions and uploading it back to the nagare HG host.</span></div></div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif">
<span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">I think all of you did a great job getting your hands dirty with the C python api, but there are still some reference counting errors (mostly leaks) in there and also potential crash cases with some of the __setstate__ things.  Mostly we have to be vigilant in error checking so that unpicling bad data cannot crash the interpreter.+</span></div>
</div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)"> </span></div>
</div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">Cheers,</span></div>
</div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)"> </span></div>
</div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)">K</span></div>
</div><div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"><span style="font-size:11pt;font-family:Calibri, sans-serif;color:rgb(31, 73, 125)"> ...</span></div>
</div></div></div></div><div style="margin-top:0cm;margin-right:0cm;margin-bottom:0.0001pt;margin-left:0cm;font-size:12pt;font-family:'Times New Roman', serif"> </div></div></div></div></div></div></div></div><div class="im">
_______________________________________________<br>Stackless mailing list<br><a href="mailto:Stackless@stackless.com" style="color:blue;text-decoration:underline" target="_blank" class="vt-p">Stackless@stackless.com</a><br>
<a href="http://www.stackless.com/mailman/listinfo/stackless" style="color:blue;text-decoration:underline" target="_blank" class="vt-p">http://www.stackless.com/mailman/listinfo/stackless</a></div></div></span></blockquote>
</div><br></div></div><br>_______________________________________________<br>
Stackless mailing list<br>
<a href="mailto:Stackless@stackless.com" class="vt-p">Stackless@stackless.com</a><br>
<a href="http://www.stackless.com/mailman/listinfo/stackless" target="_blank" class="vt-p">http://www.stackless.com/mailman/listinfo/stackless</a><br></blockquote></div><br></div>