Re: [Python-Dev] Hg: inter-branch workflow

On Tue, 22 Mar 2011 15:42:27 -0700, Glenn Linderman wrote: > I don't recall 5-12 step sequences in the DVCS PEP when I read it once, > for any of the tools, but things progressed from the time I read it, so > maybe they would all have longer sequences. > > Back when I used non-distributed VCS

Re: [Python-Dev] Workflow proposal

On Wed, Mar 23, 2011 at 1:43 PM, wrote: > >    Nick> 7. Merge the heads on the oldest branch that now has multiple heads > > Two more stupid questions: > > 1.  Don't all branches have multiple heads?  Every time I execute hg heads I >    see many. The branches we mainly care about should general

Re: [Python-Dev] crosses branches?

> They differ, how? Well, they’re not the same commands at all. Revert changes the contents of one or more files; backout renders a changeset moot by creating a new changeset with the reverse diff. Regards ___ Python-Dev mailing list Python-Dev@python.

Re: [Python-Dev] crosses branches?

>> hg revert -r 68263 Python/sysmodule.c >> >> Was that the right thing to do? merwok> Use hg backout, not revert. They differ, how? S ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-de

Re: [Python-Dev] Workflow proposal

Nick> 7. Merge the heads on the oldest branch that now has multiple heads Two more stupid questions: 1. Don't all branches have multiple heads? Every time I execute hg heads I see many. 2. Oldest in what way? Pythonically (2.6 is older than 2.7 though it might have more recent c

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

Dirkjan> The right solution here is to use different clones for Dirkjan> different projects/areas. The proposed interpreter/stdlib Dirkjan> split, for example, might reduce contention (although I imagine Dirkjan> it would reduce it only by a little bit?). How about splitting the

Re: [Python-Dev] Workflow proposal

> So what you're saying is that Mercurial by itself can't support the > recommended workflow, because any "collapsing" of commits requires > stripping, whether done by hg strip or implicitly by some other > "non-average" hg command. Pretty average: http://mercurial.selenic.com/wiki/PruningDeadBran

Re: [Python-Dev] Submitting changes through Mercurial

Senthil> You will have to 'push' your changes to those so that they are Senthil> publicly visible and then point that url in the bug-tracker. >> >> I can see this turning into a giant bowl of spaghetti. How in the >> world are people supposed to understand how all these repos

Re: [Python-Dev] Workflow proposal

Antoine Pitrou writes: > Now, "hg strip" should definitely be absent of any recommended or even > suggested workflow. It's a power user tool for the experimented > developer/admin. Not the average hg command. So what you're saying is that Mercurial by itself can't support the recommended workf

Re: [Python-Dev] Hg: inter-branch workflow

Daniel> On Mon, Mar 21, 2011 at 8:02 PM, Stephen J. Turnbull wrote: >> ... because I commit with *every* save ... Effectively, I use git as >> an extension to XEmacs's undo/redo mechanism. Daniel> I, too, commit using git with every save (which I do early and Daniel> often).

Re: [Python-Dev] Submitting changes through Mercurial

Am 23.03.2011 03:47, schrieb Terry Reedy: > On 3/22/2011 9:51 PM, "Martin v. Löwis" wrote: >>> Pressing that button seems to create a duplicate patch, which is not >>> good. Given that there is no connection between the repository names >>> (which seem to be duplicated) and the resulting file name,

Re: [Python-Dev] Submitting changes through Mercurial

On 3/22/2011 9:51 PM, "Martin v. Löwis" wrote: Pressing that button seems to create a duplicate patch, which is not good. Given that there is no connection between the repository names (which seem to be duplicated) and the resulting file name, there is no way to tell whether to press the button o

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

s...@pobox.com writes: > > Stephen> This won't be pleasant if people are sprinting and lots of > Stephen> commits are coming, because you're likely to repeatedly lose > Stephen> the push race. But in those conditions, nothing is guaranteed > Stephen> to work in decentralized

Re: [Python-Dev] Workflow proposal

On Wed, 23 Mar 2011 10:39:01 +0900 "Stephen J. Turnbull" wrote: > Executive summary: > > If we're really serious about serializing the public branches, mq > seems to be the way to go. I really think that at this point we should continue practicing with the current setup before deciding on refine

[Python-Dev] Workflow proposal

Executive summary: If we're really serious about serializing the public branches, mq seems to be the way to go. Jesus Cea writes: > 6. Use "hg strip" (dangerous!) to delete the local merges to 3.2 and > "default". Leave the original commit in "3.1" alone. I would suggest "hg strip --keep" whi

Re: [Python-Dev] Submitting changes through Mercurial

> Pressing that button seems to create a duplicate patch, which is not > good. Given that there is no connection between the repository names > (which seem to be duplicated) and the resulting file name, there is no > way to tell whether to press the button or what the result will be. Don't worry a

Re: [Python-Dev] Second draft: PEP397: Python launcher for Windows

On 23/03/2011 6:12 AM, Michael Foord wrote: On 22/03/2011 07:21, Mark Hammond wrote: Hi all, I've made some changes to the draft PEP and checked it into the PEP repository as PEP397. The reference implementation is currently being tracked at http://bugs.python.org/issue11629. Hey Mark, One w

Re: [Python-Dev] Submitting changes through Mercurial

On 3/22/2011 8:53 AM, Éric Araujo wrote: I still don't understand what that's supposed to look like. Is it supposed to be a URL which refers to my local repository? No, to a repository published somewhere (hg.python.org, bitbucket (make a server-side clone of mirror/cpython), any other hosting

Re: [Python-Dev] Hg: inter-branch workflow

>>> I'm curious: what are the benefits of the Mercurial model? >> Simplicity. > > That's an amusing response, after reading hundreds of emails on this > list I think the great number of messages is caused by incomplete learning, confusion caused by familiarity with other tools, FUD and anxiety.

Re: [Python-Dev] Hg: inter-branch workflow

> FWIW, Mercurial's "mainline" is the branch with the name 'default'. This > branch name is reserved, and it implies that the head with the highest > revision number from that branch will be checked out on 'hg clone'. This does not fully maps to Bazaar’s concept of mainline, though. An aside for

Re: [Python-Dev] crosses branches?

Hi, >> I have to admit I don't know how to read this output or what I should look >> for in the way of conflicts. Are these resources helpful? (You don’t have to read them all, but if the first doesn’t work, try the following one.) About log: http://mercurial.selenic.com/wiki/TutorialHistory htt

Re: [Python-Dev] [Python-checkins] cpython (2.7): Issue 10787: Document the probability density function for random.gammavariate.

Raymond, The Doc/reference/datamodel.rst change appears unrelated and wasn't in the 3.x version of this commit. Was the change intentional? On Tue, Mar 22, 2011 at 3:52 PM, raymond.hettinger < python-check...@python.org> wrote: > http://hg.python.org/cpython/rev/42816be02b9b > changeset: 6884

Re: [Python-Dev] Hg: inter-branch workflow

On Tue, Mar 22, 2011 at 03:42:27PM -0700, Glenn Linderman wrote: > and didn't figure I had time to learn both. I haven't read the new devguide > yet, but from the activity on the list, it would seem that either no one else I think, it is a good idea to read that. You might find that many discussio

Re: [Python-Dev] Python3: speed efficiency vs user friendliness (my first experience)

Steven D'Aprano wrote: The main one that comes to my mind is that other than looping, any time I want to process dict.items() etc I often need to call list() first. I don't think that's such a bad thing. It makes it clear that you're performing a more expensive operation than just looking at t

Re: [Python-Dev] crosses branches?

On 2011-03-22 22:53, s...@pobox.com wrote: > > Sjoerd> Perhaps looking at the glog output will shed some light. If you > Sjoerd> don't have it yet, enable the graphlog extension, after which > Sjoerd> you can use hg glog to look at your clone. Look in particular > Sjoerd> at the

Re: [Python-Dev] Hg: inter-branch workflow

On 3/22/2011 2:43 PM, Éric Araujo wrote: Bazaar apparently has a notion of mainline whereas Mercurial believes that all changesets are created equal. The tools are different. I'm curious: what are the benefits of the Mercurial model? Simplicity. That's an amusing response, after reading hund

Re: [Python-Dev] Submitting changes through Mercurial

On Wed, Mar 23, 2011 at 1:37 AM, wrote: > Doesn't that just complicate my setup?  Let's just consider the cpython repo > (is that the right term? maybe branch instead?).  Today, I have a local > repository named "cpython" which refers to ssh://h...@hg.python.org/cpython as > its default.  Now you

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

On Mar 23, 2011, at 07:31 AM, Nick Coghlan wrote: >On Wed, Mar 23, 2011 at 4:25 AM, Barry Warsaw wrote: >> It probably wouldn't be a bad idea to add a very fast "smoke test" for the >> case where you get tripped up on the merge dance floor.  When that happens, >> you could run your localized test

Re: [Python-Dev] Module version variable

On Mar 22, 2011, at 02:38 PM, Guido van Rossum wrote: >All trails eventually lead to Ken! :-) Indeed! -Barry signature.asc Description: PGP signature ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev

Re: [Python-Dev] crosses branches?

> I think that would make my local change unnecessary. So, my next project is > to try and figure out how to undo my change. This seemed to work: > > hg revert -r 68263 Python/sysmodule.c > > Was that the right thing to do? Use hg backout, not revert. __

Re: [Python-Dev] Workflow proposal

On 3/22/2011 1:38 PM, Jesus Cea wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Most of our problems are related to trying to keep a lineal history, and races with pull-patch-commit-push cycle. I propose the following workflow. All branches (except 2.7) MUST be merged to default, all the t

Re: [Python-Dev] crosses branches?

Sjoerd> Perhaps looking at the glog output will shed some light. If you Sjoerd> don't have it yet, enable the graphlog extension, after which Sjoerd> you can use hg glog to look at your clone. Look in particular Sjoerd> at the changeset which is marked with an @ sign instead of a

Re: [Python-Dev] Submitting changes through Mercurial

On Tue, Mar 22, 2011 at 10:53 PM, Éric Araujo wrote: > You have to use one public repo per bug, as roundup will only use the > default branch to compute the diff.  Maybe adding support for named > branches so that you can have one repo used for many bug reports would > be useful. Since I run my s

Re: [Python-Dev] Hg: inter-branch workflow

>> Bazaar apparently has a notion of mainline whereas Mercurial believes >> that all changesets are created equal. The tools are different. > I'm curious: what are the benefits of the Mercurial model? Simplicity. ___ Python-Dev mailing list Python-Dev@p

Re: [Python-Dev] Module version variable

On Tue, Mar 22, 2011 at 05:30:09PM -0400, Barry Warsaw wrote: > a file called subproc.py posted to comp.lang.python > by Ken Manheimer. Can you believe - I still use the module?! (-: Oleg. -- Oleg Broytmanhttp://phdru.name/p...@phdru.name Programmers do

Re: [Python-Dev] Hg: inter-branch workflow

On Wed, Mar 23, 2011 at 12:28 AM, Barry Warsaw wrote: >>Ah. We don't support this kind of development - no new named branches >>are allowed in the central repository. > > It does sound like that restriction is a source of friction for us. I'd like to hold off on abandoning it, though. All the iss

Re: [Python-Dev] Module version variable

All trails eventually lead to Ken! :-) On Tue, Mar 22, 2011 at 2:30 PM, Barry Warsaw wrote: > On Mar 18, 2011, at 08:50 PM, Guido van Rossum wrote: > >>I do distinctly recall __version__ being standardized for other >>purposes too, but I have no idea how to find that reference... It >>probably wa

Re: [Python-Dev] Hg: inter-branch workflow

On Wed, Mar 23, 2011 at 12:22 AM, Barry Warsaw wrote: > I think that's different than what John was describing, or perhaps Python's > use of it has the effect of being different.  IIUC, in Mercurial, within the > default branch there's no clear "main line" of development assigned to a path > withi

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

On Wed, Mar 23, 2011 at 4:25 AM, Barry Warsaw wrote: > It probably wouldn't be a bad idea to add a very fast "smoke test" for the > case where you get tripped up on the merge dance floor.  When that happens, > you could run your localized tests, and then a set of tests that run in just a > minute

Re: [Python-Dev] Module version variable

On Mar 18, 2011, at 08:50 PM, Guido van Rossum wrote: >I do distinctly recall __version__ being standardized for other >purposes too, but I have no idea how to find that reference... It >probably was well before 2000. FWIW, I went spelunking in my email archives and the earliest reference to __ve

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

On Wed, Mar 23, 2011 at 6:59 AM, Dirkjan Ochtman wrote: > Probably not really. In particular, since many changes are > forward-ported across branches, you'll still need to push to each of > the release branches... I'm not sure what the ratio for pure-feature > vs. bugfix is; if there is a signific

[Python-Dev] "Meet the Team" on Python Insider

We would like to run a series of interviews with the Python developers to get the new blog going. There is a short list of questions below this message. If you would like to be included in the series, please reply directly to me with your answers. We will be doing one or two posts per day, depe

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

On Wed, Mar 23, 2011 at 6:44 AM, Dirkjan Ochtman wrote: > This is something that Mozilla has been doing, for example, their JS > interpreter is now developed in a separate clone. It might also be a > good match for sprints, where one room could have its own repo and the > other room has a differen

Re: [Python-Dev] Workflow proposal

On Wed, Mar 23, 2011 at 3:38 AM, Jesus Cea wrote: > Now we have two options. > > The easier and "mercurial" way would be: > > 6. Pull. > 7. Merge the two heads. > 8. Merge that merge to the other branches, as necessary. Since the two > heads were already merged to other branches, this merge should

Re: [Python-Dev] Python3: speed efficiency vs user friendliness (my first experience)

anatoly techtonik wrote: I didn't touch Python3 until PyCon, and my first user experience is not really good. I've got a feeling that Python3 became more ugly, because it doesn't allow me to think about the logic anymore, and requires more low-level workarounds even for basic user input/output.

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

On Tue, Mar 22, 2011 at 21:56, Paul Moore wrote: > On 22 March 2011 20:44, Dirkjan Ochtman wrote: >> The right solution here is to use different clones for different >> projects/areas. > > I'm not trolling here, just trying to learn something about Mercurial. > Would having separate clones for th

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

On 22 March 2011 20:44, Dirkjan Ochtman wrote: > The right solution here is to use different clones for different > projects/areas. I'm not trolling here, just trying to learn something about Mercurial. Would having separate clones for the various releases (2.7, 3.1, 3.2, ...) rather than named b

Re: [Python-Dev] Useful "hg log" trick to only see revisions in the current branch

On Tue, Mar 22, 2011 at 10:49 PM, R. David Murray wrote: > So: there is completion support for hg update for both bash and zsh. > Not sure about other shells. Thanks for clarifying that, I've long been hazy on the details of how completion works across various utilities (it also clears up why the

Re: [Python-Dev] [GSoC] Porting on RPM3

On Tue, Mar 22, 2011 at 7:29 PM, Panu Matilainen wrote: > The bindings cannot go changing header contents to their liking, so any > canonicalization would have to go into rpm proper, the build-side of things > to be exact so the runtime doesn't have to care. Requiring rpm to fiddle > with encoding

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

On Tue, Mar 22, 2011 at 19:29, R. David Murray wrote: > Note that svnmerge broke at exactly the same scale point, for exactly the > same reason:  every svnmerge touched root properties, thereby effectively > serializing access to the tree.  There were lots of curses from people > trying to svnmerg

Re: [Python-Dev] Submitting changes through Mercurial

> Senthil> You will have to 'push' your changes to those so that they are > Senthil> publicly visible and then point that url in the bug-tracker. > > I can see this turning into a giant bowl of spaghetti. How in the world are > people supposed to understand how all these repositories are

Re: [Python-Dev] Second draft: PEP397: Python launcher for Windows

On 22/03/2011 07:21, Mark Hammond wrote: Hi all, I've made some changes to the draft PEP and checked it into the PEP repository as PEP397. The reference implementation is currently being tracked at http://bugs.python.org/issue11629. Hey Mark, One way of supporting alternative implementa

Re: [Python-Dev] Hg: inter-branch workflow

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 22/03/11 11:19, John Arbash Meinel wrote: > And suddenly the revision which was an "important" C change is now gone > on the mainline, and your personal "and I did D" is now a primary > revision. It doesn't matter much for a single revision D and C,

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

On Tue, 22 Mar 2011 07:21:24 -0500, s...@pobox.com wrote: > > Stephen> This won't be pleasant if people are sprinting and lots of > Stephen> commits are coming, because you're likely to repeatedly lose > Stephen> the push race. But in those conditions, nothing is guaranteed > Step

Re: [Python-Dev] crosses branches?

On Tue, 22 Mar 2011 15:39:55 +0100, Sjoerd Mullender wrote: > On 2011-03-22 15:11, s...@pobox.com wrote: > > I see lots of heads, but that never prevented an update before. How do I > > tell which two heads are key to this case? For completeness, here's the > > output of hg heads in my 2.5 repos

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On Mar 22, 2011, at 10:45 AM, John Arbash Meinel wrote: >I'm personally a huge fan of 2(multi)-tier testing. So you have a basic >(and fast) test suite that runs across all your modules before every >commit in your mainline. Then a much larger (and

[Python-Dev] Workflow proposal

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Most of our problems are related to trying to keep a lineal history, and races with pull-patch-commit-push cycle. I propose the following workflow. All branches (except 2.7) MUST be merged to default, all the time. This must be enforced by the push ho

Re: [Python-Dev] Hg: inter-branch workflow

On Mon, Mar 21, 2011 at 8:02 PM, Stephen J. Turnbull wrote: > Speaking for myself, I rewrite my git history because it is *not* > useful to me as is. Almost all of my git commits have a informational > half-life measured in hours once they're off tip, because I commit > with *every* save (I have

Re: [Python-Dev] crosses branches?

On 2011-03-22 15:11, s...@pobox.com wrote: I realized I didn't answer this: > Looking here at the Common Cases section: > > http://mercurial.selenic.com/wiki/RebaseProject > > I can see how I have now apparently got this situation: > > C1 --> C2 --> S1 > \ > \

Re: [Python-Dev] crosses branches?

On 2011-03-22 16:56, s...@pobox.com wrote: > > Sjoerd> Are you sure the hg pull part worked? > > Pretty sure: > > 2.7% hg pull > Enter passphrase for key '/Users/skip/.ssh/id_rsa': > pulling from ssh://h...@hg.python.org/cpython > searching for changes > no changes found

Re: [Python-Dev] crosses branches?

Sjoerd> Are you sure the hg pull part worked? Pretty sure: 2.7% hg pull Enter passphrase for key '/Users/skip/.ssh/id_rsa': pulling from ssh://h...@hg.python.org/cpython searching for changes no changes found 2.7% cd ../2.6 2.6% hg pull pulling from /Users/ski

Re: [Python-Dev] Submitting changes through Mercurial

>> I still don't understand what that's supposed to look like. Is it >> supposed to be a URL which refers to my local repository? Senthil> No, it is the "Remote Repository". It could be one at Senthil> bitbucket.org or code.google.com, both of which support Senthil> creating

Re: [Python-Dev] Hg: inter-branch workflow

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 3/22/2011 3:25 PM, Barry Warsaw wrote: > On Mar 22, 2011, at 12:52 AM, Éric Araujo wrote: > >> Bazaar apparently has a notion of mainline whereas Mercurial believes >> that all changesets are created equal. The tools are different. > > I'm curiou

Re: [Python-Dev] Hg: inter-branch workflow

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 3/22/2011 3:22 PM, Barry Warsaw wrote: > On Mar 22, 2011, at 12:07 PM, Adrian Buehlmann wrote: > >> FWIW, Mercurial's "mainline" is the branch with the name 'default'. This >> branch name is reserved, and it implies that the head with the highest >

Re: [Python-Dev] crosses branches?

On 2011-03-22 15:11, s...@pobox.com wrote: > > Sjoerd> Since you have a local change, you cannot use hg pull -u (or > Sjoerd> rather, hg update). Hg wouldn't know where to update to since > Sjoerd> there are 2 heads in the branch you're on: the new head from the > Sjoerd> server a

Re: [Python-Dev] Submitting changes through Mercurial

On 22 March 2011 12:53, Éric Araujo wrote: >> I still don't understand what that's supposed to look like.  Is it supposed >> to be a URL which refers to my local repository? > No, to a repository published somewhere (hg.python.org, bitbucket (make > a server-side clone of mirror/cpython), any othe

Re: [Python-Dev] Hg: inter-branch workflow

On Tue, Mar 22, 2011 at 10:25 AM, Barry Warsaw wrote: > I'm curious: what are the benefits of the Mercurial model? If we're all left confused and unable to use the tools to change the software, we won't break things. This is good. :-)   -Fred -- Fred L. Drake, Jr.    "A storm broke loose in

Re: [Python-Dev] Hg: inter-branch workflow

On Mar 22, 2011, at 07:51 AM, Martin v. Löwis wrote: >Am 22.03.2011 02:02, schrieb Eugene Toder: >>> Not if the changes you want to suppress are actually also on the same >>> branch as the one whose mainline you are trying to see (which they >>> typically are, with the branch typically being "defa

Re: [Python-Dev] Hg: inter-branch workflow

On Mar 22, 2011, at 12:52 AM, Éric Araujo wrote: >Bazaar apparently has a notion of mainline whereas Mercurial believes >that all changesets are created equal. The tools are different. I'm curious: what are the benefits of the Mercurial model? -Barry signature.asc Description: PGP signature _

Re: [Python-Dev] Hg: inter-branch workflow

On Mar 22, 2011, at 12:07 PM, Adrian Buehlmann wrote: >FWIW, Mercurial's "mainline" is the branch with the name 'default'. This >branch name is reserved, and it implies that the head with the highest >revision number from that branch will be checked out on 'hg clone'. I think that's different tha

Re: [Python-Dev] Hg: inter-branch workflow

On Mar 21, 2011, at 11:09 PM, Martin v. Löwis wrote: >However, what some of us requesting is that the "SHOULD collapse" >in the devguide is changed to a "MAY collapse", making it strictly >an option of the committer. +1 -Barry signature.asc Description: PGP signature __

Re: [Python-Dev] crosses branches?

Sjoerd> Since you have a local change, you cannot use hg pull -u (or Sjoerd> rather, hg update). Hg wouldn't know where to update to since Sjoerd> there are 2 heads in the branch you're on: the new head from the Sjoerd> server and your own head with your change. I see lots of hea

Re: [Python-Dev] blogroll for the new blog

Well I've created a python-dev category under my usual blog so if you wouldn't mind adding that: http://ramblings.timgolden.me.uk/category/tech/python/python-dev/ TJG Tim Golden Senior Analyst Programmer CBS Outdoor UK Camden Wharf 28 Jamestown Road London NW1 7BY T: 020 7482 3000 F: 020 7267

Re: [Python-Dev] Submitting changes through Mercurial

> I still don't understand what that's supposed to look like. Is it supposed > to be a URL which refers to my local repository? No, to a repository published somewhere (hg.python.org, bitbucket (make a server-side clone of mirror/cpython), any other hosting service). You have to use one public re

Re: [Python-Dev] Submitting changes through Mercurial

On Tue, Mar 22, 2011 at 07:26:25AM -0500, s...@pobox.com wrote: > > Senthil> The magical UI is the FORM textbox element "Remote hg repo:" > Senthil> where the user provided his bitbucket URL for the path he was > Senthil> working on. > > I still don't understand what that's supposed t

Re: [Python-Dev] Useful "hg log" trick to only see revisions in the current branch

On Tue, 22 Mar 2011 21:11:42 +1000, Nick Coghlan wrote: > Also, for anyone that wasn't already aware, "hg update" supports tab > completion when switching branches, which can make life a bit easier > when working with named branches. You are the second person I've heard say this, and it is a litt

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

Hrvoje> If you are not familiar with other DVCS workflows, take a look Hrvoje> at, for example, chapter 5 of the "Pro Git" book, which Hrvoje> describes the alternatives such as integrator-manager and Hrvoje> dictator-lieutenant workflows: http://progit.org/book/ch5-1.html Thanks.

Re: [Python-Dev] Submitting changes through Mercurial

Senthil> Have a look at this issue: Senthil> http://bugs.python.org/issue11591 Senthil> The magical UI is the FORM textbox element "Remote hg repo:" Senthil> where the user provided his bitbucket URL for the path he was Senthil> working on. I still don't understand what that'

Re: [Python-Dev] Python3: speed efficiency vs user friendliness (my first experience)

On Mar 22, 2011, at 7:57 AM, anatoly techtonik wrote: > For example, now I need to remember that on Windows I need to flush > output every time when I want the result of print() with end!='\n' to > appear on the screen immediately. And for the most of my legacy > scripts I used end='\n' when I want

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

Stephen> This won't be pleasant if people are sprinting and lots of Stephen> commits are coming, because you're likely to repeatedly lose Stephen> the push race. But in those conditions, nothing is guaranteed Stephen> to work in decentralized fashion (that's one reason why the

Re: [Python-Dev] [GSoC] Porting on RPM3

On 03/22/2011 03:06 AM, David Malcolm wrote: [CCing Panu Matilainen, the maintainer of rpm, or, at least rpm 4.*, which is what all major distributions are using AIUI] On Mon, 2011-03-21 at 10:50 +0100, "Martin v. Löwis" wrote: Am 21.03.2011 07:37, schrieb Prashant Kumar: Hello, My name i

Re: [Python-Dev] crosses branches?

On 2011-03-22 11:54, s...@pobox.com wrote: > I came across a new message I neither understood before or after searching > for it on Google (and thus the documentation): > > % hg pull -u > pulling from /Users/skip/src/hgpython/2.6 > searching for changes > adding changesets > ad

Re: [Python-Dev] Let's get PEP 380 into Python 3.3

On Tue, Mar 22, 2011 at 10:06 PM, rndblnch wrote: > Sorry to have done that, once again, I was not expecting to actually have the > rights to cause any side-effect on . I guess that it > may > not be desirable to allow anyone do such server-side clone. Unmodified clones do

Re: [Python-Dev] Let's get PEP 380 into Python 3.3

Nick Coghlan gmail.com> writes: > On Tue, Mar 22, 2011 at 9:21 AM, Guido van Rossum python.org> wrote: > > In the light of the recent discussion about Hg clones, perhaps you > > could make this a server-side clone so it's easier for others to play > > along? I don't have push rights so I can no

[Python-Dev] Python3: speed efficiency vs user friendliness (my first experience)

I didn't touch Python3 until PyCon, and my first user experience is not really good. I've got a feeling that Python3 became more ugly, because it doesn't allow me to think about the logic anymore, and requires more low-level workarounds even for basic user input/output. For example, now I need to

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

On Tue, Mar 22, 2011 at 7:58 AM, Antoine Pitrou wrote: > On Tue, 22 Mar 2011 07:32:33 +1000 > Nick Coghlan wrote: >> >> As far as the second point goes, I'm coming to the view that we should >> avoid rebase/strip/rollback when intending to push to the main >> repository, and do long term work in

[Python-Dev] Useful "hg log" trick to only see revisions in the current branch

"hg log -b ." restricts the hg log output to the changesets in the currently active branch. Other commands (such as "hg outgoing") similarly accept "-b ." to request restricting their operation to the current branch. Also, for anyone that wasn't already aware, "hg update" supports tab completion

Re: [Python-Dev] Hg: inter-branch workflow

On 2011-03-22 11:19, John Arbash Meinel wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > On 3/21/2011 9:19 PM, Barry Warsaw wrote: >> On Mar 21, 2011, at 11:56 AM, Daniel Stutzbach wrote: >> >>> Keeping the repository clean makes it easier to use a bisection search to >>> hunt down the

[Python-Dev] crosses branches?

I came across a new message I neither understood before or after searching for it on Google (and thus the documentation): % hg pull -u pulling from /Users/skip/src/hgpython/2.6 searching for changes adding changesets adding manifests adding file changes added 242 change

Re: [Python-Dev] Hg: inter-branch workflow

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 3/21/2011 9:19 PM, Barry Warsaw wrote: > On Mar 21, 2011, at 11:56 AM, Daniel Stutzbach wrote: > >> Keeping the repository clean makes it easier to use a bisection search to >> hunt down the introduction of a bug. If every developer's intermediat

Re: [Python-Dev] Hg: inter-branch workflow

On Tue, Mar 22, 2011 at 8:35 AM, "Martin v. Löwis" wrote: >> Well, it's "should", not "must" ;) >> When writing this, I had in mind that other projects have different >> workflows, where indeed people never collapse and many tiny changesets >> (which are only significant as part of a bigger work)

Re: [Python-Dev] Let's get PEP 380 into Python 3.3

On Tue, Mar 22, 2011 at 9:21 AM, Guido van Rossum wrote: > In the light of the recent discussion about Hg clones, perhaps you > could make this a server-side clone so it's easier for others to play > along? Anyone without push rights for hg.python.org may want to fork the mirror the bitbucket fol

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 3/21/2011 6:53 PM, Barry Warsaw wrote: > On Mar 21, 2011, at 01:19 PM, R. David Murray wrote: > >> So you are worried about the small window between me doing an 'svn up', >> seeing no changes, and doing an 'svn ci'? I suppose that is a legitimate

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 3/21/2011 10:32 PM, Nick Coghlan wrote: > On Tue, Mar 22, 2011 at 3:16 AM, Raymond Hettinger > wrote: >> I don't think that is the main source of complexity. >> The more difficult and fragile part of the workflows are: >> * requiring commits to be

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 3/22/2011 2:05 AM, Terry Reedy wrote: > On 3/21/2011 7:14 AM, Nick Coghlan wrote: > >> hg broadens the check and complains if *any* files are not up to date >> on any of the branches being pushed, thus making it a requirement to >> do a hg pull and

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 3/21/2011 10:48 PM, "Martin v. Löwis" wrote: >> It does so at the *tree* level, not at an individual file level. > > Thanks - I stand corrected. I was thinking about the file level only (at > which it doesn't do server-side merging - right?). > >

Re: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

On 03/21/2011 05:44 PM, s...@pobox.com wrote: Thanks for the example, Hrvoje. Hrvoje> This automatic merging often causes people who migrate to a DVCS Hrvoje> to feel that they have to go through an unnecessary extra step Hrvoje> in their workflows. But once you grasp the "ho

Re: [Python-Dev] Hg: inter-branch workflow

"Martin v. Löwis" writes: > Am 22.03.2011 02:02, schrieb Eugene Toder: > >> Not if the changes you want to suppress are actually also on the same > >> branch as the one whose mainline you are trying to see (which they > >> typically are, with the branch typically being "default"). > > > > Rig

[Python-Dev] Second draft: PEP397: Python launcher for Windows

Hi all, I've made some changes to the draft PEP and checked it into the PEP repository as PEP397. The reference implementation is currently being tracked at http://bugs.python.org/issue11629. Most of the changes should not be too controversial, but of note: * I've added lots of discussion

Re: [Python-Dev] Module version variable

On 22/03/2011 8:09 AM, Barry Warsaw wrote: I started an Informational PEP on this at Pycon, and will try to finish a draft of it this week. (I'm claiming 396 for it.) We nearly had a race for that number! FYI, I just checked in pep-0397 leaving 396 for you :) Cheers, Mark _

  1   2   >