Re: [Python-Dev] Generating patch files

2011-03-18 Thread Martin v. Löwis
I get unknown revision (listing the full expression text) when using Mercurial 1.6.3 (default version in Ubuntu 10.10). Based on Baptiste's approach, I propose the script below to compute a patch. Please report whether it works for you. Regards, Martin #!/bin/sh base=`hg log --template

Re: [Python-Dev] Generating patch files

2011-03-17 Thread Baptiste Carvello
Le 16/03/2011 18:49, Martin v. Löwis a écrit : Having the revision of cpython to compare against is the difficult part; how about: 'max( ancestors(default) and not outgoing() )' ? ___ Python-Dev mailing list Python-Dev@python.org

Re: [Python-Dev] Generating patch files

2011-03-17 Thread Martin v. Löwis
Am 17.03.11 07:30, schrieb Baptiste Carvello: Le 16/03/2011 18:49, Martin v. Löwis a écrit : Having the revision of cpython to compare against is the difficult part; how about: 'max( ancestors(default) and not outgoing() )' ? That fails if there have been later merges with default.

Re: [Python-Dev] Generating patch files

2011-03-17 Thread Martin v. Löwis
Am 17.03.11 07:30, schrieb Baptiste Carvello: Le 16/03/2011 18:49, Martin v. Löwis a écrit : Having the revision of cpython to compare against is the difficult part; how about: 'max( ancestors(default) and not outgoing() )' ? I take back what I just said: it looks good. Regards, Martin

[Python-Dev] Generating patch files

2011-03-16 Thread Martin v. Löwis
I think I figured out how to generate a single patch for a clone that has all its changes on the default branch, comparing it with cpython's default branch. The command to generate the patch is hg diff -r'max(p1(min(outgoing())) or p2(max(merge() and branch(default' -r default If it's a

Re: [Python-Dev] Generating patch files

2011-03-16 Thread Nick Coghlan
On Wed, Mar 16, 2011 at 1:49 PM, Martin v. Löwis mar...@v.loewis.de wrote: I think I figured out how to generate a single patch for a clone that has all its changes on the default branch, comparing it with cpython's default branch. The command to generate the patch is hg diff

Re: [Python-Dev] Generating patch files

2011-03-16 Thread Martin v. Löwis
I get unknown revision (listing the full expression text) when using Mercurial 1.6.3 (default version in Ubuntu 10.10). That version apparently supports revsets, but I'm not sure when the runtime evaluation of the command line arguments was added. Apparently shortly after Debian/Ubuntu

Re: [Python-Dev] Generating patch files

2011-03-16 Thread Martin v. Löwis
Am 16.03.11 15:20, schrieb Martin v. Löwis: I get unknown revision (listing the full expression text) when using Mercurial 1.6.3 (default version in Ubuntu 10.10). That version apparently supports revsets, but I'm not sure when the runtime evaluation of the command line arguments was added.

Re: [Python-Dev] Generating patch files

2011-03-16 Thread Ned Deily
In article 4d810f84.5060...@v.loewis.de, Martin v. Löwis mar...@v.loewis.de wrote: Before you upgrade: give me some time to come up with a script that uses Mercurial API instead to compute the revset and then invoke the diff command. We must get something out of using a Python-based DVCS...

Re: [Python-Dev] Generating patch files

2011-03-16 Thread Martin v. Löwis
Note the Mercurial project warns that use of the Mercurial API 'is a strong indication that you're creating a derived work subject to the GPL.' http://mercurial.selenic.com/wiki/MercurialApi http://mercurial.selenic.com/wiki/License Would distributing a script that called the API in any way

Re: [Python-Dev] Generating patch files

2011-03-16 Thread Stephen J. Turnbull
On Thu, Mar 17, 2011 at 5:00 AM, Ned Deily n...@acm.org wrote: In article 4d810f84.5060...@v.loewis.de,  Martin v. Löwis mar...@v.loewis.de wrote: Before you upgrade: give me some time to come up with a script that uses Mercurial API instead to compute the revset and then invoke the diff

Re: [Python-Dev] Generating patch files

2011-03-16 Thread Martin v. Löwis
Am 16.03.11 15:29, schrieb Martin v. Löwis: Am 16.03.11 15:20, schrieb Martin v. Löwis: I get unknown revision (listing the full expression text) when using Mercurial 1.6.3 (default version in Ubuntu 10.10). That version apparently supports revsets, but I'm not sure when the runtime evaluation

Re: [Python-Dev] Generating patch files

2011-03-16 Thread R. David Murray
On Wed, 16 Mar 2011 20:47:10 -0400, =?ISO-8859-1?Q?=22Martin_v=2E_L=F6wis=22?= mar...@v.loewis.de wrote: Note the Mercurial project warns that use of the Mercurial API 'is a strong indication that you're creating a derived work subject to the GPL.'

Re: [Python-Dev] Generating patch files

2011-03-16 Thread Jesus Cea
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 16/03/11 20:29, Martin v. Löwis wrote: Before you upgrade: give me some time to come up with a script that uses Mercurial API instead to compute the revset and then invoke the diff command. We must get something out of using a Python-based