Re: [Python-Dev] Mercurial conversion repositories

2011-02-28 Thread Barry Warsaw
On Feb 27, 2011, at 05:38 PM, Georg Brandl wrote:

While I understand the usefulness of the diff feature, it is not useful to
everyone, e.g. those using almost exclusively ``commit -m message``.

The editor window doesn't pop up when you provide the -m flag, so the diff
output is not relevant.

Of course it would be nice if hg made it easier (a hgrc option, for example)
to do this.

Sure.

BTW, I had not heard of hgeditor before, and wrote a small hg extension to
do what you want (with HG: prefix :) before I saw that others had already
replied with hgeditor.  The extension had 10 lines of code.

We should find a place (i.e. repository) to stash these useful add-ons and
hacks so that all Python developers can find them.

-Barry



signature.asc
Description: PGP signature
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] Mercurial conversion repositories

2011-02-28 Thread Antoine Pitrou
On Mon, 28 Feb 2011 10:08:26 -0500
Barry Warsaw ba...@python.org wrote:
 
 BTW, I had not heard of hgeditor before, and wrote a small hg extension to
 do what you want (with HG: prefix :) before I saw that others had already
 replied with hgeditor.  The extension had 10 lines of code.
 
 We should find a place (i.e. repository) to stash these useful add-ons and
 hacks so that all Python developers can find them.

I think you can simply add them somewhere on the hg wiki:
http://mercurial.selenic.com/wiki/
and then link to the pages from our own wiki, or the developer's FAQ.

Regards

Antoine.


___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] devguide (hg_transition): Advertise hg import over patch.

2011-02-28 Thread Antoine Pitrou
On Mon, 28 Feb 2011 00:10:10 +0100
Adrian Buehlmann adr...@cadifra.com wrote:
 
 Here, the Workbench window [1] starts in under 2s (Windows 7 x64 on
 Intel Core2 Quad). As installed with the x64 msi (installs true 64 bit
 exe's, including 64 bit command line hg).
 
 There's quite a lot of demand loading behind the scenes. So it's fast
 even for repos with many changesets.
 
 [1] http://tortoisehg.bitbucket.org/manual/2.0/workbench.html

I have to say the TortoiseHg manual looks impressively comprehensive!

Regards

Antoine.


___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


[Python-Dev] Please sync your feature branches

2011-02-28 Thread Antoine Pitrou

Hello,

In preparation for the hg switch, I would recommend that, if you have
any feature branches managed with svnmerge, you sync them with the py3k
branch before we switch. That way, it will make it easier to bridge
the gap when you create a new repository for your work after the
switch (the svnmerge information isn't retained in the converted repo).

For the record, and as mentioned in the updated PEP 385, we plan to do
the final conversion on the 5th (that is next Saturday).

Regards

Antoine.


___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] Please sync your feature branches

2011-02-28 Thread Georg Brandl
On 28.02.2011 19:15, Antoine Pitrou wrote:
 
 Hello,
 
 In preparation for the hg switch, I would recommend that, if you have
 any feature branches managed with svnmerge, you sync them with the py3k
 branch before we switch. That way, it will make it easier to bridge
 the gap when you create a new repository for your work after the
 switch (the svnmerge information isn't retained in the converted repo).
 
 For the record, and as mentioned in the updated PEP 385, we plan to do
 the final conversion on the 5th (that is next Saturday).

And similarly, please backport any pending changesets (using svnmerge or
not), so that we're prepared for the new workflow.

Georg

___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] r88676 - peps/trunk/pep-0385.txt

2011-02-28 Thread Antoine Pitrou
On Mon, 28 Feb 2011 13:36:11 -0500
Terry Reedy tjre...@udel.edu wrote:
 
  +  an existing branch.  The pusher then has to merge the superfetatory heads
 
 'superfetatory'? I have no idea of what this is, neither does 
 merriam-webster.com ;-).

There are some Google hits, though... Not sure if they are of people
making the same mistakes as I do ;)

Regards

Antoine.



___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] r88676 - peps/trunk/pep-0385.txt

2011-02-28 Thread Benjamin Peterson
2011/2/28 Antoine Pitrou solip...@pitrou.net:
 On Mon, 28 Feb 2011 13:36:11 -0500
 Terry Reedy tjre...@udel.edu wrote:

  +  an existing branch.  The pusher then has to merge the superfetatory 
  heads

 'superfetatory'? I have no idea of what this is, neither does
 merriam-webster.com ;-).

 There are some Google hits, though... Not sure if they are of people
 making the same mistakes as I do ;)

Endly, perhaps it will be adopted. Did you mean superfluous though?



-- 
Regards,
Benjamin
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] r88676 - peps/trunk/pep-0385.txt

2011-02-28 Thread Antoine Pitrou
Le lundi 28 février 2011 à 13:56 -0600, Benjamin Peterson a écrit :
 2011/2/28 Antoine Pitrou solip...@pitrou.net:
  On Mon, 28 Feb 2011 13:36:11 -0500
  Terry Reedy tjre...@udel.edu wrote:
 
   +  an existing branch.  The pusher then has to merge the superfetatory 
   heads
 
  'superfetatory'? I have no idea of what this is, neither does
  merriam-webster.com ;-).
 
  There are some Google hits, though... Not sure if they are of people
  making the same mistakes as I do ;)
 
 Endly, perhaps it will be adopted. Did you mean superfluous though?

I really meant superfetatory (it's slightly different: superfluous is
simply useless, while superfetatory implies that it's in excess).


___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] r88676 - peps/trunk/pep-0385.txt

2011-02-28 Thread Benjamin Peterson
2011/2/28 Antoine Pitrou solip...@pitrou.net:
 Le lundi 28 février 2011 à 13:56 -0600, Benjamin Peterson a écrit :
 2011/2/28 Antoine Pitrou solip...@pitrou.net:
  On Mon, 28 Feb 2011 13:36:11 -0500
  Terry Reedy tjre...@udel.edu wrote:
 
   +  an existing branch.  The pusher then has to merge the superfetatory 
   heads
 
  'superfetatory'? I have no idea of what this is, neither does
  merriam-webster.com ;-).
 
  There are some Google hits, though... Not sure if they are of people
  making the same mistakes as I do ;)

 Endly, perhaps it will be adopted. Did you mean superfluous though?

 I really meant superfetatory (it's slightly different: superfluous is
 simply useless, while superfetatory implies that it's in excess).

superfluous - in excess of what is required or sufficient



-- 
Regards,
Benjamin
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] r88676 - peps/trunk/pep-0385.txt

2011-02-28 Thread Georg Brandl
On 28.02.2011 20:58, Antoine Pitrou wrote:
 Le lundi 28 février 2011 à 13:56 -0600, Benjamin Peterson a écrit :
 2011/2/28 Antoine Pitrou solip...@pitrou.net:
  On Mon, 28 Feb 2011 13:36:11 -0500
  Terry Reedy tjre...@udel.edu wrote:
 
   +  an existing branch.  The pusher then has to merge the superfetatory 
   heads
 
  'superfetatory'? I have no idea of what this is, neither does
  merriam-webster.com ;-).
 
  There are some Google hits, though... Not sure if they are of people
  making the same mistakes as I do ;)
 
 Endly, perhaps it will be adopted. Did you mean superfluous though?
 
 I really meant superfetatory (it's slightly different: superfluous is
 simply useless, while superfetatory implies that it's in excess).

Maybe supernumerary serves?

Georg

___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] r88676 - peps/trunk/pep-0385.txt

2011-02-28 Thread Raymond Hettinger

On Feb 28, 2011, at 12:07 PM, Georg Brandl wrote:

 On 28.02.2011 20:58, Antoine Pitrou wrote:
 Le lundi 28 février 2011 à 13:56 -0600, Benjamin Peterson a écrit :
 2011/2/28 Antoine Pitrou solip...@pitrou.net:
 On Mon, 28 Feb 2011 13:36:11 -0500
 Terry Reedy tjre...@udel.edu wrote:
 
 +  an existing branch.  The pusher then has to merge the superfetatory 
 heads
 
 'superfetatory'? I have no idea of what this is, neither does
 merriam-webster.com ;-).
 
 There are some Google hits, though... Not sure if they are of people
 making the same mistakes as I do ;)
 
 Endly, perhaps it will be adopted. Did you mean superfluous though?
 
 I really meant superfetatory (it's slightly different: superfluous is
 simply useless, while superfetatory implies that it's in excess).
 
 Maybe supernumerary serves?


Plain, everyday English would serve better than using words which people need 
to look-up.

How about:   The pusher should the merge extra, unused heads or somesuch.


Raymond

___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] Mercurial conversion repositories

2011-02-28 Thread Barry Warsaw
On Feb 28, 2011, at 04:15 PM, Antoine Pitrou wrote:

On Mon, 28 Feb 2011 10:08:26 -0500
Barry Warsaw ba...@python.org wrote:
 
 BTW, I had not heard of hgeditor before, and wrote a small hg extension to
 do what you want (with HG: prefix :) before I saw that others had already
 replied with hgeditor.  The extension had 10 lines of code.
 
 We should find a place (i.e. repository) to stash these useful add-ons and
 hacks so that all Python developers can find them.

I think you can simply add them somewhere on the hg wiki:
http://mercurial.selenic.com/wiki/
and then link to the pages from our own wiki, or the developer's FAQ.

If they're of general use to the hg community, sure.  Otherwise, it might be
good to have a place of our own for our own repository tools.

-Barry



signature.asc
Description: PGP signature
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] Mercurial conversion repositories

2011-02-28 Thread Antoine Pitrou
On Mon, 28 Feb 2011 16:07:48 -0500
Barry Warsaw ba...@python.org wrote:
 On Feb 28, 2011, at 04:15 PM, Antoine Pitrou wrote:
 
 On Mon, 28 Feb 2011 10:08:26 -0500
 Barry Warsaw ba...@python.org wrote:
  
  BTW, I had not heard of hgeditor before, and wrote a small hg extension to
  do what you want (with HG: prefix :) before I saw that others had already
  replied with hgeditor.  The extension had 10 lines of code.
  
  We should find a place (i.e. repository) to stash these useful add-ons and
  hacks so that all Python developers can find them.
 
 I think you can simply add them somewhere on the hg wiki:
 http://mercurial.selenic.com/wiki/
 and then link to the pages from our own wiki, or the developer's FAQ.
 
 If they're of general use to the hg community, sure.  Otherwise, it might be
 good to have a place of our own for our own repository tools.

Well, your diff-in-the-commit-editor-window is certainly not
CPython-specific ;)

Regards

Antoine.


___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] Finding buildbot failures

2011-02-28 Thread Martin v. Löwis
 That's one of the big advantages that Jenkins (nee Hudson) has over
 buildbot - drilling down into individual test failures through the
 web ui. Your test run needs to generate appropriate xml for that to
 work though.

 Buildbot can do this too.  It can even do it without xml, although it
 does need *some* parseable format, which I think the Python test suite
 is a long way from.

 
 That would be a great improvement to the Python buildbot infrastructure.

So would you be willing to contribute the necessary changes?

Regards,
Martin
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] Please sync your feature branches

2011-02-28 Thread Martin v. Löwis
 In preparation for the hg switch, I would recommend that, if you have
 any feature branches managed with svnmerge, you sync them with the py3k
 branch before we switch. That way, it will make it easier to bridge
 the gap when you create a new repository for your work after the
 switch (the svnmerge information isn't retained in the converted repo).

Is that really going to work? I.e. will Mercurial be able to merge from
default to one of the feature branches? If so, what will be the
procedure? What would be the exact steps to try this out on the PEP 382
branch (say)?

Regards,
Martin
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] Please sync your feature branches

2011-02-28 Thread Antoine Pitrou
Le lundi 28 février 2011 à 23:26 +0100, Martin v. Löwis a écrit :
  In preparation for the hg switch, I would recommend that, if you have
  any feature branches managed with svnmerge, you sync them with the py3k
  branch before we switch. That way, it will make it easier to bridge
  the gap when you create a new repository for your work after the
  switch (the svnmerge information isn't retained in the converted repo).
 
 Is that really going to work? I.e. will Mercurial be able to merge from
 default to one of the feature branches? If so, what will be the
 procedure? What would be the exact steps to try this out on the PEP 382
 branch (say)?

I've sketched out the steps in
http://potrou.net/hgdevguide/committing.html#long-term-development-of-features

It doesn't cover importing work from SVN, but it should be as simple as
apply your current patch where the text says You can now work on your
feature.

A caveat of these instructions is that pushing a whole cpython-based
repo will be quite slow unless you have a large upload bandwidth (most
users have asymmetric connections). So we would like to offer a special
command for committers to make a clone of a repository *from the server,
to the server*.
In my current prototype this is spelled as:

  ssh h...@hg.python.org clone srcrepo dstrepo

for example:

  ssh h...@hg.python.org clone cpython features/pep-382

where features/pep-382 will be a new repo on hg.python.org cloned from
the cpython repo on hg.python.org. Meaning no heavy network transfer
occurs. Then you clone the dest repo and the only changesets will have
to push will be those representing your own work.

If you think the remote clone trick above is good enough, I'll
publicize it in the devguide.

Regards

Antoine.


___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] r88676 - peps/trunk/pep-0385.txt

2011-02-28 Thread Steven D'Aprano

Antoine Pitrou wrote:

Le lundi 28 février 2011 à 13:56 -0600, Benjamin Peterson a écrit :

2011/2/28 Antoine Pitrou solip...@pitrou.net:

On Mon, 28 Feb 2011 13:36:11 -0500
Terry Reedy tjre...@udel.edu wrote:

+  an existing branch.  The pusher then has to merge the superfetatory heads

'superfetatory'? I have no idea of what this is, neither does
merriam-webster.com ;-).

There are some Google hits, though... Not sure if they are of people
making the same mistakes as I do ;)

Endly, perhaps it will be adopted. Did you mean superfluous though?


I really meant superfetatory (it's slightly different: superfluous is
simply useless, while superfetatory implies that it's in excess).



My wife has a copy of the shorter Oxford English dictionary, so we 
looked it up. There's no listing for superfetatory, but there is 
superfetation:


1. a second conception occurring during pregnancy; the formation of a 
second fetus in a uterus already pregnant;
1b. botany the fertilization of the same ovule by two different kinds of 
pollen;
2. (figurative) additional or super-abundant production or occurrence; 
the growth or accretion of one thing on another; and instance of this; 
an accretion; an excrescence.


She commented that sesquipedalian words like superfetation are probably 
either specialised jargon, or known by people like Clive James and very 
few others :)


I think that superfluous simply means excess to requirements but merely 
useless, while superfetatory would imply harmfully in excess. In any 
case, it's a wonderful word and I will try to casually drop it into 
conversation every now and then to annoy people *wink*




--
Steven
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] Please sync your feature branches

2011-02-28 Thread Martin v. Löwis
Am 28.02.2011 23:45, schrieb Antoine Pitrou:
 Le lundi 28 février 2011 à 23:26 +0100, Martin v. Löwis a écrit :
 In preparation for the hg switch, I would recommend that, if you have
 any feature branches managed with svnmerge, you sync them with the py3k
 branch before we switch. That way, it will make it easier to bridge
 the gap when you create a new repository for your work after the
 switch (the svnmerge information isn't retained in the converted repo).

 Is that really going to work? I.e. will Mercurial be able to merge from
 default to one of the feature branches? If so, what will be the
 procedure? What would be the exact steps to try this out on the PEP 382
 branch (say)?
 
 I've sketched out the steps in
 http://potrou.net/hgdevguide/committing.html#long-term-development-of-features
 
 It doesn't cover importing work from SVN

But that's what I was specifically asking about: if I svnmerge my
feature branch now - what specifically do I gain? Why are you asking
me to do that? Why does doing so make it easier to bridge the gap?

Regards,
Martin
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] r88676 - peps/trunk/pep-0385.txt

2011-02-28 Thread Éric Araujo
 I really meant superfetatory

Those damn French people with their foreign words.
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] Please sync your feature branches

2011-02-28 Thread Antoine Pitrou
On Mon, 28 Feb 2011 23:54:46 +0100
Martin v. Löwis mar...@v.loewis.de wrote:
 Am 28.02.2011 23:45, schrieb Antoine Pitrou:
  Le lundi 28 février 2011 à 23:26 +0100, Martin v. Löwis a écrit :
  In preparation for the hg switch, I would recommend that, if you have
  any feature branches managed with svnmerge, you sync them with the py3k
  branch before we switch. That way, it will make it easier to bridge
  the gap when you create a new repository for your work after the
  switch (the svnmerge information isn't retained in the converted repo).
 
  Is that really going to work? I.e. will Mercurial be able to merge from
  default to one of the feature branches? If so, what will be the
  procedure? What would be the exact steps to try this out on the PEP 382
  branch (say)?
  
  I've sketched out the steps in
  http://potrou.net/hgdevguide/committing.html#long-term-development-of-features
  
  It doesn't cover importing work from SVN
 
 But that's what I was specifically asking about: if I svnmerge my
 feature branch now - what specifically do I gain? Why are you asking
 me to do that? Why does doing so make it easier to bridge the gap?

Because you don't have to find whichever faraway changeset on which to
base your initial changes. You can just apply your patch on the latest
default changeset in the Mercurial repository and, in all likelihood,
you won't get any conflicts.

Regards

Antoine.
___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] [Python-checkins] r88691 - python/branches/py3k/Lib/test/test_telnetlib.py

2011-02-28 Thread Jack Diederich
Much thanks.

On Mon, Feb 28, 2011 at 7:41 PM, antoine.pitrou
python-check...@python.org wrote:
 Author: antoine.pitrou
 Date: Tue Mar  1 01:41:10 2011
 New Revision: 88691

 Log:
 Endly, fix UnboundLocalError in telnetlib



 Modified:
   python/branches/py3k/Lib/test/test_telnetlib.py

 Modified: python/branches/py3k/Lib/test/test_telnetlib.py
 ==
 --- python/branches/py3k/Lib/test/test_telnetlib.py     (original)
 +++ python/branches/py3k/Lib/test/test_telnetlib.py     Tue Mar  1 01:41:10 
 2011
 @@ -17,9 +17,10 @@
         conn, addr = serv.accept()
     except socket.timeout:
         pass
 +    else:
 +        conn.close()
     finally:
         serv.close()
 -        conn.close()
         evt.set()

  class GeneralTests(TestCase):
 ___
 Python-checkins mailing list
 python-check...@python.org
 http://mail.python.org/mailman/listinfo/python-checkins

___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com


Re: [Python-Dev] devinabox: Properly clean up the 'build' directory from test runs.

2011-02-28 Thread Antoine Pitrou
On Mon, 28 Feb 2011 23:03:51 +0100
brett.cannon python-check...@python.org wrote:
 +try:
 +subprocess.call([cmd, '-W', 'default', '-bb', '-E', '-m', 'test', 
 '-r',
 + '-w', '-u', 'all', '-j',
 + str(multiprocessing.cpu_count())])
 +finally:
 +os.rmdir('build')

os.rmdir() won't work on a non-empty directory; you probably want
shutil.rmtree() instead.

Regards

Antoine.


___
Python-Dev mailing list
Python-Dev@python.org
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com