Login | Register For Free | Help
Search for: (Advanced)

Mailing List Archive: Python: Dev

Mercurial migration: progress report (PEP 385)

 

 

First page Previous page 1 2 3 4 Next page Last page  View All Python dev RSS feed   Index | Next | Previous | View Threaded


dirkjan at ochtman

Jul 4, 2009, 1:18 AM

Post #51 of 83 (1252 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

On Sat, Jul 4, 2009 at 00:09, "Martin v. Löwis"<martin [at] v> wrote:
> I would drop the roundup integration from the things that need to
> be done pre-migration - there currently is no svn integration, so
> not having it for hg is not a step backwards.

Yeah, I mean just the linking here.

> In the first sentence, you say that it can't actually work - so I
> think we should drop the test.

Okay.

> I would like to see this well before the switch also. It could be
> a patch (unified diff) stored in the tracker, or it could be an actual
> branch that then needs to get merged with all active branches (IIUC).

Yeah. Some help here would be welcome, too, as C is not a language I use often.

Cheers,

Dirkjan
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


dirkjan at ochtman

Jul 4, 2009, 1:20 AM

Post #52 of 83 (1251 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

On Sat, Jul 4, 2009 at 00:37, Barry Warsaw<barry [at] python> wrote:
> Doesn't Mercurial support an Subversion bridge?  Would it be possible to
> provide a /read-only/ copy of the hg branches for 2.4 (maybe), 2.5, 2.6, and
> 3.1?  If so, then the release managers would simply have to cut their
> releases from the svn copy instead of the hg master.  /All/ other work would
> be done from the hg master.  This shouldn't be too much of a burden since
> it's done so rarely and would end with the EOL of each of those branches.

There is some push support in hgsubversion, but it doesn't do tags at
this time, for example. I think this setup would be needlessly
complicated (and tools will need to learn the new revision specifier
anyway, so why not have it learn them sooner rather than later)?

Cheers,

Dirkjan
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


tjreedy at udel

Jul 4, 2009, 1:55 AM

Post #53 of 83 (1248 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Brett Cannon wrote:

> I would very much like the 'k' dropped from the py3 name. It was a
> funny joke when py3 was vaporware, now it is excess baggage which
> only puzzles non-insiders and newcomers.
>
>
> Is it really that confusing? I have never heard of anyone asking "what
> is py3k?"

Do you read python-list? It has been asked. Also, some people seem to
think that py3k is different from python 3.

tjr

_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


martin at v

Jul 4, 2009, 2:28 AM

Post #54 of 83 (1251 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

> I see that George Brandl and Martin van Loewis seem to be accomodating
> your viewpoint, but I don't get the impression that either you (as the
> hg migration proponent) nor they (as core committers) realize how far
> apart your assumptions are.

Actually, I (probably) don't agree to a merge flow different from the
one that we currently have.

All I asked that *if* Dirkjan is in favor of a change, he should propose
it explicitly, and fleshed-out, in the PEP, so that people can tear it
down.

I know that several committers are unhappy with the current merge flow
(Georg in particular), so this is important to discuss.

Regards,
Martin
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


ncoghlan at gmail

Jul 4, 2009, 3:36 AM

Post #55 of 83 (1247 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Dirkjan Ochtman wrote:
> On Sat, Jul 4, 2009 at 07:13, Nick Coghlan<ncoghlan [at] gmail> wrote:
>> I'd guess that the only way to keep those functional is to keep
>> svn.python.org around in read-only mode.
>
> No, actually: the idea (I think I floated it in the PEP, as well), is
> that I can write a simple extension for hgweb that knows the mapping
> of SVN rev to hg rev and so can make
> hg.python.org/python/2.x/rev/r32542 come out to the changeset that
> resulted from converting that revision.

Ah, that's an excellent solution - good to hear it :)

Cheers,
Nick.


--
Nick Coghlan | ncoghlan [at] gmail | Brisbane, Australia
---------------------------------------------------------------
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


brett at python

Jul 4, 2009, 12:28 PM

Post #56 of 83 (1249 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

On Sat, Jul 4, 2009 at 01:03, Dirkjan Ochtman <dirkjan [at] ochtman> wrote:

> On Fri, Jul 3, 2009 at 20:04, Brett Cannon<brett [at] python> wrote:
> > Fine by me as long as people realize that if anything is questionable
> then
> > the switch will not happen. Getting this right takes precedence over any
> > deadline. And obviously we will need to do at least one live conversion
> on
> > python.org hardware to make sure everything will work smoothly.
>
> I'm not sure I see the need to do a (live? what does that mean in this
> context) on python.org hardware.


"Live" as in run through all the steps on python.org hardware w/o hitting
any final switch that turns off svn.


> Why exactly is that better than me
> doing it on one of my boxes, as long as all the necessary tools and an
> idea of how to do it are publically available (from the pymigr repo,
> for example)?


Because there are different OSs, installed software, etc. Basically because
you just never know. =) Plus it will make Martin sleep better.


>
>
> > And will make the idea of splitting out the standard library and tests a
> > reasonable thing to do.
>
> In due time, yes.
>
> > While I really like the idea of using named branches for each release so
> > that there is a single py3k branch that contains all relevant history for
> > every release, I think we should start simple and go with cloned
> branches.
> > That way the workflow does not radically shift from what we do now for
> svn
> > to start. Once the conversion is done and people are comfortable with hg
> we
> > can then discuss moving towards a named branch approach.
>
> I don't think the cloned branches is much simpler than the named
> branches approach, in several ways. For example, populating the branch
> part of a sys.whatever value is significantly harder. Also, if you
> follow a useful tagging approach, doing cloned branches means that
> release tags aren't available on trunk/main/default. That seems like a
> step backwards.
>

I personally prefer named branches, but that's just me and I am not about to
force my preferences on everyone. Guess we just have to see if others have
opinions against named branches.


>
> > Sounds reasonable to me. We can just make a list and send it to
> > python-committers to make final decisions of what should stick around.
>
> This list exists and has been referenced in my email a few times.
>

Sure, but as inlining the PEP in this email thread has shown, not making
people click a link helps. =) Plus a separate email makes it very obvious
that people need to check their email instead of making it a bullet point in
a much larger email.


>
> > I don't use tags so I don't really care, but in the name of easy
> transition
> > I say we don't change the naming scheme (although I have no issue
> dropping
> > obscure tags).
>
> The current proposal is to clean up old tags to agree with the current
> naming scheme (and dropping obscure and partial tags).
>

Fine by me.


>
> > Something else that can go out to python-committers before the switch.
>
> This should just be done ASAP, it helps with a smooth conversion process.
>
> > I don't think there is a single project we host -- all two of them --
> that
> > have not said they want to convert. So I say convert everything and let's
> > turn off the svn server by the end of the year.
>
> I say we tackle each one as we go. I say doing a good conversion job
> is valuable, and we should take as much time as we need (though not
> more). You advocate something similar below for the Python conversion.
>

I am not suggesting we do all conversions on the same day, just that
everything should eventually be converted.


>
> > Can we check these scripts into the repository itself? That way there is
> a
> > chance of reuse as hg commands, e.g. ``hg pydev-ci`` as a replacement for
> > ``make patchcheck``.
>
> I'm not sure there's an easy way to make them into commands (although
> I guess you could make an extension to that effect), but hooks would
> be very easy.
>

OK. I was just hoping we could factor the code in such a way as to share the
basic steps the hooks were checking so as to reuse them in a command.


>
> > How about hg.python.org for the official branches and we keep
> > code.python.org for personal branches of the developers like we have
> done
> > with the bzr experiments?
>
> I think that's just confusing. Most people seem to like hg.python.org,
> and it's obvious that hg goes to hg.p.o. Dividing up the namespace
> only makes it harder to find things.
>

Yeah, I realize I have lost this battle.


>
> > As I have said, we should change our workflow habits after the switch and
> > people are comfortable with hg.
>
> Well, not everyone agrees, and although I think it doesn't matter much
> for the conversion itself, it may affect the branching strategy
> discussion.
>

Sure, to an extent.


>
> (sys.revision discussion elided because some others have already been
> bikeshedding on it.)


I think it has been answered; sys.subversion goes away and sys.mercurial or
sys.mercurial_revision comes into existence.

-Brett


brett at python

Jul 4, 2009, 12:29 PM

Post #57 of 83 (1238 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

On Sat, Jul 4, 2009 at 01:55, Terry Reedy <tjreedy [at] udel> wrote:

> Brett Cannon wrote:
>
> I would very much like the 'k' dropped from the py3 name. It was a
>> funny joke when py3 was vaporware, now it is excess baggage which
>> only puzzles non-insiders and newcomers.
>>
>>
>> Is it really that confusing? I have never heard of anyone asking "what is
>> py3k?"
>>
>
> Do you read python-list?


No as it would take up so much of my Python time I wouldn't be able to code
anymore.


> It has been asked. Also, some people seem to think that py3k is different
> from python 3.
>

Well, I still would not like to lose the py3k label. But if we do I still
say 2.x/3.x instead of py2/py3.

-Brett



>
> tjr
>
>
> _______________________________________________
> Python-Dev mailing list
> Python-Dev [at] python
> http://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe:
> http://mail.python.org/mailman/options/python-dev/brett%40python.org
>


rdmurray at bitdance

Jul 4, 2009, 2:05 PM

Post #58 of 83 (1241 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

On Sat, 4 Jul 2009 at 12:28, Brett Cannon wrote:
> On Sat, Jul 4, 2009 at 01:03, Dirkjan Ochtman <dirkjan [at] ochtman> wrote:
>
>> On Fri, Jul 3, 2009 at 20:04, Brett Cannon<brett [at] python> wrote:
>>> Fine by me as long as people realize that if anything is questionable
>> then
>>> the switch will not happen. Getting this right takes precedence over any
>>> deadline. And obviously we will need to do at least one live conversion
>> on
>>> python.org hardware to make sure everything will work smoothly.
>>
>> I'm not sure I see the need to do a (live? what does that mean in this
>> context) on python.org hardware.
>
>
> "Live" as in run through all the steps on python.org hardware w/o hitting
> any final switch that turns off svn.

"Live" should also (and I think this is critical) include a period of at
least a week where we tell python-dev/python-committers "hg.python.org
looks like it is going to look at cutover, please try out the workflow".
The idea would be to have committers actually exercise the workflow on
their platform for at least one patch, including whatever replaces
the svnmerge step.

I can almost guarantee we will find some issues that need to be resolved,
and that people won't try it out thoroughly until it is "live".

--David
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


g.brandl at gmx

Jul 5, 2009, 4:10 AM

Post #59 of 83 (1228 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Martin v. Löwis schrieb:
>> We could add another value in the tuple that specifies the VCS:
>> ('CPython', 'branches/release25-maint', '61464', 'svn'). I agree that
>> VCSs are not universally the same, but the concept of a revision is
>> universal.
>
> Actually, I think that's not the case. For bzr, the usual way of
> identifying a revision is by revision number, which, however, is not
> unique within a project, as each branch will use contiguous integers
> for numbers. There are also unique identifications - so a bzr revision
> has actually two numbers.
>
> More general, in a DVCS, it is not possible to access the revision being
> referred to by such a tuple. For sys.subversion, if [0]=='CPython', then
> you could go to svn.python.org. For a DVCS, the revision being
> identified may not be publically available, or may not live on a host
> that you can infer from your proposed sys.revision.

At least you can tell that if the given hash is not present in the mainline
repo, the build contains something that doesn't come from python.org.

Georg

--
Thus spake the Lord: Thou shalt indent with four spaces. No more, no less.
Four shall be the number of spaces thou shalt indent, and the number of thy
indenting shall be four. Eight shalt thou not indent, nor either indent thou
two, excepting that thou then proceed to four. Tabs are right out.

_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


g.brandl at gmx

Jul 5, 2009, 4:17 AM

Post #60 of 83 (1226 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Martin v. Löwis schrieb:
>> It will handle it, for sure, but I think it would all go easier if we
>> could work with stricter subset branches (and leave the effective
>> cherrypicking for the occasional problem).
>
> So I think the PEP should propose a workflow (or: merge flow) if you
> think we would be better off with a different one.
>
> In proposing such a workflow, consider these requirements:
> - we current have four active "maintenance" branches (i.e. where
> the entire code basis evolves): trunk, 3k, 2.6, and 3.1 (3.0
> also until this morning).

It seems that there is a consensus to separate the 2.x and 3.x repos,
and that also makes sense to me.

Using named branches for the maintenance branches should be possible,
but I'm not opposed to using cloned branches either. What I really
want to see is the common-subset approach for maintenance branches.

Changesets still have to be transplanted from 2.x to 3.x or the other
way round.

> - in addition, we have two security branches currently: 2.4 and
> 2.5, although 2.4 will be closed soon.
> - our committers consistently refuse to merge changes across
> branches themselves, and likely continue to do so unless there
> is some feature of hg that I missed (e.g. one were merging
> would happen without any user specifically asking for it)

If the checkin is done in the proper (the maint) branch, at least merging
of that change is automatic whenever someone does a hg merge.

Georg


--
Thus spake the Lord: Thou shalt indent with four spaces. No more, no less.
Four shall be the number of spaces thou shalt indent, and the number of thy
indenting shall be four. Eight shalt thou not indent, nor either indent thou
two, excepting that thou then proceed to four. Tabs are right out.

_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


stephen at xemacs

Jul 5, 2009, 7:42 AM

Post #61 of 83 (1222 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Georg Brandl writes:

> What I really want to see is the common-subset approach for
> maintenance branches.

IMO, this unfortunately unlikely to work as you seem to expect, for a
two technical reasons and for a social reason. The first technical
reason is that a maintenance branch really is a branch, not a subset.
The fix that is appropriate for a maintenance branch is often
inappropriate in detail for the mainline, and vice versa. But
Mercurial doesn't care about "in detail" vs. "in design"; both will
result in a conflict the first time that branch is merged.

Second, some fixes for the maintenance branch will simply not be
appropriate for the development branch, as the problem has already
been fixed "en passant" by some other change. This can probably be
handled by doing what git calls an "ours" merge to make it look like
the unnecessary patch is an ancestor of the tip, even though no code
was actually applied to the mainline. However, this kind of operation
is some what delicate, and even if it's mostly scripted, it's likely
to be somewhat unreliable for people who don't use the script very
often ... which leads to the social problem:

> > - our committers consistently refuse to merge changes across
> > branches themselves, and likely continue to do so unless there
> > is some feature of hg that I missed (e.g. one were merging
> > would happen without any user specifically asking for it)
>
> If the checkin is done in the proper (the maint) branch, at least merging
> of that change is automatic whenever someone does a hg merge.

Maybe. But I see two problematic sides to this from the social point
of view, which is the same old problem really.

First, to the extent that it doesn't run into the technical problems,
it encourages people to *not* review patches for each branch they are
committed to. "It will get automerged anyway." Anything that
discourages review is a bad thing. It will cause the development
branch to "age" faster because of accumulation of crufty patches that
are good enough as minimally invasive fixes for bugs in a maintenance
branch, but which should be more robust for the development branch.

I think you will also find that some people are not particularly
interested in fixing the maintenance branch for some of their patches
for exactly the same reasons they currently don't, and they will
continue to refuse to do the work to commit in the maintenance branch
first. Especially after the first time they run into one of the
technical problems described above.

In the end, any policy to encourage a "subset" policy is likely to end
up as a burden on the same people who currently do the cross branch
merging.


_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


martin at v

Jul 5, 2009, 11:00 AM

Post #62 of 83 (1211 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

>> In proposing such a workflow, consider these requirements:
>
> It seems that there is a consensus to separate the 2.x and 3.x repos,
> and that also makes sense to me.

(I think) I wasn't primarily talking about the representation of
branches in hg - to that, I fully trust recommendations from hg users
and experts.

What will need debate and discussion in the PEP is the workflow, ie.
the order in which changes should be applied to the branches.

> If the checkin is done in the proper (the maint) branch, at least merging
> of that change is automatic whenever someone does a hg merge.

I probably don't fully understand, but that seems to imply a workflow
were all changes made to one branch should also automatically be
integrated into a different branch. I'm curious as to how such a
mechanism can apply to Python.

Regards,
Martin
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


dreamingforward at gmail

Jul 5, 2009, 12:36 PM

Post #63 of 83 (1214 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

>> Is it really that confusing? I have never heard of anyone asking "what
>> is py3k?"
>
> Do you read python-list? It has been asked. Also, some people seem to
> think that py3k is different from python 3.

Personally, I vote for keeping the "3k" for 3000 (or is it 3072?). I
believe that py3k represents a ideal that hasn't been reached, despite
being hoped for in python3. By keeping it, it confers the idea
continual evolution *within* the language until that hypothetical
ideal is reached. Clearly, there are times when a language reaches
only a local maximum, and must depart from itself to arrive at a more
global optimum (an annealing problem in the minimization of
frustration energy). If py3k wasn't kept, another term would
eventually need to be invented.

marcos
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


benjamin at python

Jul 5, 2009, 12:48 PM

Post #64 of 83 (1211 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

2009/7/5 average <dreamingforward [at] gmail>:
>>> Is it really that confusing? I have never heard of anyone asking "what
>>> is py3k?"
>>
>> Do you read python-list? It has been asked. Also, some people seem to
>> think that py3k is different from python 3.
>
> Personally, I vote for keeping the "3k" for 3000 (or is it 3072?).  I
> believe that py3k represents a ideal that hasn't been reached, despite
> being hoped for in python3.  By keeping it, it confers the idea
> continual evolution *within* the language until that hypothetical
> ideal is reached.  Clearly, there are times when a language reaches
> only a local maximum, and must depart from itself to arrive at a more
> global optimum (an annealing problem in the minimization of
> frustration energy).  If py3k wasn't kept, another term would
> eventually need to be invented.

And that's why we're already fantasizing about Py4k. :)



--
Regards,
Benjamin
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


ncoghlan at gmail

Jul 5, 2009, 1:58 PM

Post #65 of 83 (1211 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Martin v. Löwis wrote:
> What will need debate and discussion in the PEP is the workflow, ie.
> the order in which changes should be applied to the branches.

Particularly since there isn't even "one true workflow" *now*. I see
three main variants go by on Python-checkins:

- svnmerge based
- commit to 2.x
- backport to 2.6 with svnmerge
- forward port to 3.x with svnmerge
- backport to 3.0 (now 3.1) with svnmerge

- manual port based
- as above, but without using svnmerge

- Py3k focused
- commit to 3.x
- manual backport to 2.x
- possible svnmerge block of the backported 2.x commit
- possible svnmerge based or manual backport to 2.6/3.1

While it would obviously be *nice* if every committer maintained 4
checkouts and either blocked or committed each change on the appropriate
branches, I think actually *requiring* a specific workflow has the
potential to cost us commits. Even if one workflow is designated the
'preferred' approach, the others still need to be supported to handle
various possibilities for the "first" commit for a given change:

- forward port only
- commit to 2.6
- forward port to 2.x
- forward port to 3.1
- forward port to 3.x

- backport only
- commit to 3.x
- backport to 3.1
- backport to 2.x
- backport to 2.6

- mixed, starting with 2.x (aka current svnmerge workflow)
- commit to 2.x
- backport to 2.6
- forward port to 3.x
- backport to 3.1

- mixed, starting with 3.1
- commit to 3.1
- forward port to 3.x
- backport to 2.6
- forward port or backport to 2.x

Note that there are actual multiple variations even of the above
workflows, based on the *source* of the various forward ports and
backports. Also, each "forward port" or "backport" can be replaced by
blocking the merge rather than applying it.

Cheers,
Nick.

--
Nick Coghlan | ncoghlan [at] gmail | Brisbane, Australia
---------------------------------------------------------------
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


mal at egenix

Jul 6, 2009, 7:51 AM

Post #66 of 83 (1206 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Dirkjan Ochtman wrote:
> In response to some rumblings on python-committers and just to request
> more feedback, a progress report. I know it's long, I've tried to put
> to keep it concise and chunked, though.

Two things:

* We need some form of documentation of how committers are expected
to work with the hg repo. (This is also missing for the Subversion
repo, which due to the 3.x branch has gotten somewhat unclear - at
least for me)

It is currently not clear where to check in patches, whether and
where to backport or forward-patch, which branches to consider
closed, etc.

E.g. if I check in something in trunk/ (Python 2.7), do I have to
forward patch this change to the 3.0 branch (guess not), the py3k/
branch (Python 3.1), or will someone else take care of this, so that
it's better not to interfere by doing it myself ?

* Our tracker, checkin messages, online documentation and lots of
Python resources on the web are full of references to the
Subversion rXYZ notation of changesets.

The PEP has to provide some way to gracefully provide a redirect
from those URLs to the new ones (both for the source code browser
and the bug search tool on python.org).

The PEP will also have to address the same issue for checkin
messages. Perhaps by converting the rXYZ notation to the hash
based values during migration or by adding the has value after
the rXYZ value in parens ?!

--
Marc-Andre Lemburg
eGenix.com

Professional Python Services directly from the Source (#1, Jul 06 2009)
>>> Python/Zope Consulting and Support ... http://www.egenix.com/
>>> mxODBC.Zope.Database.Adapter ... http://zope.egenix.com/
>>> mxODBC, mxDateTime, mxTextTools ... http://python.egenix.com/
________________________________________________________________________

::: Try our new mxODBC.Connect Python Database Interface for free ! ::::


eGenix.com Software, Skills and Services GmbH Pastor-Loeh-Str.48
D-40764 Langenfeld, Germany. CEO Dipl.-Math. Marc-Andre Lemburg
Registered at Amtsgericht Duesseldorf: HRB 46611
http://www.egenix.com/company/contact/
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


brett at python

Jul 6, 2009, 10:49 AM

Post #67 of 83 (1185 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

On Mon, Jul 6, 2009 at 07:51, M.-A. Lemburg <mal [at] egenix> wrote:

> Dirkjan Ochtman wrote:
> > In response to some rumblings on python-committers and just to request
> > more feedback, a progress report. I know it's long, I've tried to put
> > to keep it concise and chunked, though.
>
> Two things:
>
> * We need some form of documentation of how committers are expected
> to work with the hg repo. (This is also missing for the Subversion
> repo, which due to the 3.x branch has gotten somewhat unclear - at
> least for me)
>

I am planning to get a version of the dev FAQ written up that covers most of
what it already does now for svn.


>
> It is currently not clear where to check in patches, whether and
> where to backport or forward-patch, which branches to consider
> closed, etc.
>
> E.g. if I check in something in trunk/ (Python 2.7), do I have to
> forward patch this change to the 3.0 branch (guess not), the py3k/
> branch (Python 3.1), or will someone else take care of this, so that
> it's better not to interfere by doing it myself ?
>

This question is partially answered by
http://www.python.org/dev/faq/#how-do-i-merge-between-branches, but I agree
that we should have either this spelled out in the FAQ or a
committer-specific doc at www.python.org/dev/ that makes this all very
obvious.

-Brett


ncoghlan at gmail

Jul 6, 2009, 2:22 PM

Post #68 of 83 (1188 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

M.-A. Lemburg wrote:
> Dirkjan Ochtman wrote:
> * Our tracker, checkin messages, online documentation and lots of
> Python resources on the web are full of references to the
> Subversion rXYZ notation of changesets.
>
> The PEP has to provide some way to gracefully provide a redirect
> from those URLs to the new ones (both for the source code browser
> and the bug search tool on python.org).
>
> The PEP will also have to address the same issue for checkin
> messages. Perhaps by converting the rXYZ notation to the hash
> based values during migration or by adding the has value after
> the rXYZ value in parens ?!

I've asked this question before: Dirkjan indicated that he will be
writing a web redirection filter that translates from the SVN rXYZ
revision numbers to the Hg hash value that corresponds to that revision
in the history conversion.

I suggest that we also run a version of that redirection filter to remap
the old svn.python.org links in addition to making them accessible
through hg.python.org as Dirkjan proposed.

Cheers,
Nick.

[1] http://mail.python.org/pipermail/python-dev/2009-July/090397.html

--
Nick Coghlan | ncoghlan [at] gmail | Brisbane, Australia
---------------------------------------------------------------
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


martin at v

Jul 6, 2009, 2:57 PM

Post #69 of 83 (1185 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

> I suggest that we also run a version of that redirection filter to remap
> the old svn.python.org links in addition to making them accessible
> through hg.python.org as Dirkjan proposed.

Not sure what links you are talking about, but we also need to keep the
current svn.python.org up as-is, for all the stuff that won't be migrated.

Regards,
Martin
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


ncoghlan at gmail

Jul 6, 2009, 3:05 PM

Post #70 of 83 (1188 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Martin v. Löwis wrote:
>> I suggest that we also run a version of that redirection filter to remap
>> the old svn.python.org links in addition to making them accessible
>> through hg.python.org as Dirkjan proposed.
>
> Not sure what links you are talking about, but we also need to keep the
> current svn.python.org up as-is, for all the stuff that won't be migrated.

In that case, no need to redirect anything (although it will still be
possible to look up the old SVN revisions in the Hg web view).

The previous discussion was based on the assumption that it was going to
be possible to switch the SVN server off at some point rather than just
disallowing commits to the projects that had migrated to Mercurial.

Cheers,
Nick.

--
Nick Coghlan | ncoghlan [at] gmail | Brisbane, Australia
---------------------------------------------------------------
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


mal at egenix

Jul 7, 2009, 1:16 AM

Post #71 of 83 (1178 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Nick Coghlan wrote:
> Martin v. Löwis wrote:
>>> I suggest that we also run a version of that redirection filter to remap
>>> the old svn.python.org links in addition to making them accessible
>>> through hg.python.org as Dirkjan proposed.
>> Not sure what links you are talking about, but we also need to keep the
>> current svn.python.org up as-is, for all the stuff that won't be migrated.

Good point. So the old svn revision links will continue to work.

> In that case, no need to redirect anything (although it will still be
> possible to look up the old SVN revisions in the Hg web view).
>
> The previous discussion was based on the assumption that it was going to
> be possible to switch the SVN server off at some point rather than just
> disallowing commits to the projects that had migrated to Mercurial.

Is there a standard notation for hg revisions that roundup could
detect and turn into links (much like it does for svn) ?

--
Marc-Andre Lemburg
eGenix.com

Professional Python Services directly from the Source (#1, Jul 07 2009)
>>> Python/Zope Consulting and Support ... http://www.egenix.com/
>>> mxODBC.Zope.Database.Adapter ... http://zope.egenix.com/
>>> mxODBC, mxDateTime, mxTextTools ... http://python.egenix.com/
________________________________________________________________________

::: Try our new mxODBC.Connect Python Database Interface for free ! ::::


eGenix.com Software, Skills and Services GmbH Pastor-Loeh-Str.48
D-40764 Langenfeld, Germany. CEO Dipl.-Math. Marc-Andre Lemburg
Registered at Amtsgericht Duesseldorf: HRB 46611
http://www.egenix.com/company/contact/
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


dirkjan at ochtman

Jul 7, 2009, 1:30 AM

Post #72 of 83 (1179 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

On Tue, Jul 7, 2009 at 10:16, M.-A. Lemburg<mal [at] egenix> wrote:
> Is there a standard notation for hg revisions that roundup could
> detect and turn into links (much like it does for svn) ?

[a-f0-9]{12} should mostly do.

(Sorry for my absence from the discussion for some time. I'll try to
update the PEP and summarize ongoing discussions here soon.)

Cheers,

Dirkjan
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


mal at egenix

Jul 7, 2009, 6:26 AM

Post #73 of 83 (1173 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Brett Cannon wrote:
> On Mon, Jul 6, 2009 at 07:51, M.-A. Lemburg <mal [at] egenix> wrote:
>
>> Dirkjan Ochtman wrote:
>>> In response to some rumblings on python-committers and just to request
>>> more feedback, a progress report. I know it's long, I've tried to put
>>> to keep it concise and chunked, though.
>> Two things:
>>
>> * We need some form of documentation of how committers are expected
>> to work with the hg repo. (This is also missing for the Subversion
>> repo, which due to the 3.x branch has gotten somewhat unclear - at
>> least for me)
>>
>
> I am planning to get a version of the dev FAQ written up that covers most of
> what it already does now for svn.
>
>
>> It is currently not clear where to check in patches, whether and
>> where to backport or forward-patch, which branches to consider
>> closed, etc.
>>
>> E.g. if I check in something in trunk/ (Python 2.7), do I have to
>> forward patch this change to the 3.0 branch (guess not), the py3k/
>> branch (Python 3.1), or will someone else take care of this, so that
>> it's better not to interfere by doing it myself ?
>>
>
> This question is partially answered by
> http://www.python.org/dev/faq/#how-do-i-merge-between-branches, but I agree
> that we should have either this spelled out in the FAQ or a
> committer-specific doc at www.python.org/dev/ that makes this all very
> obvious.

The merge process itself is more or less clear. What I'm missing
is the agreed upon strategy for applying the patches to the various
branches.

I've seen a few discussions about this, but no final statement
of what strategy to follow and whether hg makes this easier (AFAIR,
that was the main argument for switching to hg).

--
Marc-Andre Lemburg
eGenix.com

Professional Python Services directly from the Source (#1, Jul 07 2009)
>>> Python/Zope Consulting and Support ... http://www.egenix.com/
>>> mxODBC.Zope.Database.Adapter ... http://zope.egenix.com/
>>> mxODBC, mxDateTime, mxTextTools ... http://python.egenix.com/
________________________________________________________________________

::: Try our new mxODBC.Connect Python Database Interface for free ! ::::


eGenix.com Software, Skills and Services GmbH Pastor-Loeh-Str.48
D-40764 Langenfeld, Germany. CEO Dipl.-Math. Marc-Andre Lemburg
Registered at Amtsgericht Duesseldorf: HRB 46611
http://www.egenix.com/company/contact/
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


mal at egenix

Jul 7, 2009, 6:32 AM

Post #74 of 83 (1163 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

Dirkjan Ochtman wrote:
> On Tue, Jul 7, 2009 at 10:16, M.-A. Lemburg<mal [at] egenix> wrote:
>> Is there a standard notation for hg revisions that roundup could
>> detect and turn into links (much like it does for svn) ?
>
> [a-f0-9]{12} should mostly do.

Hmm, no prefix or suffix ?

So we'll always have to write "see deadbeefdeadbeefff for details"
or "Reverting f00fl33df00fl33d00 after problems on Pentium CPUs" ?!

Cheers,
--
Marc-Andre Lemburg
eGenix.com

Professional Python Services directly from the Source (#1, Jul 07 2009)
>>> Python/Zope Consulting and Support ... http://www.egenix.com/
>>> mxODBC.Zope.Database.Adapter ... http://zope.egenix.com/
>>> mxODBC, mxDateTime, mxTextTools ... http://python.egenix.com/
________________________________________________________________________

::: Try our new mxODBC.Connect Python Database Interface for free ! ::::


eGenix.com Software, Skills and Services GmbH Pastor-Loeh-Str.48
D-40764 Langenfeld, Germany. CEO Dipl.-Math. Marc-Andre Lemburg
Registered at Amtsgericht Duesseldorf: HRB 46611
http://www.egenix.com/company/contact/
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com


dirkjan at ochtman

Jul 7, 2009, 6:40 AM

Post #75 of 83 (1167 views)
Permalink
Re: Mercurial migration: progress report (PEP 385) [In reply to]

On Tue, Jul 7, 2009 at 15:32, M.-A. Lemburg<mal [at] egenix> wrote:
> Hmm, no prefix or suffix ?

No, not really. hg often shows revision integers as well, but as they
aren't globally consistent, they're of little value in communicating
changeset pointers.

> So we'll always have to write "see deadbeefdeadbeefff for details"
> or "Reverting f00fl33df00fl33d00 after problems on Pentium CPUs" ?!

Yes. And it's really not that bad.

Cheers,

Dirkjan
_______________________________________________
Python-Dev mailing list
Python-Dev [at] python
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: http://mail.python.org/mailman/options/python-dev/list-python-dev%40lists.gossamer-threads.com

First page Previous page 1 2 3 4 Next page Last page  View All Python dev RSS feed   Index | Next | Previous | View Threaded
 
 


Interested in having your list archived? Contact Gossamer Threads
 
  Web Applications & Managed Hosting Powered by Gossamer Threads Inc.