Re: [Python-Dev] PEP: Collecting information about git

*cough* Google *cough* http://stackoverflow.com/questions/5911774/git-gui-like-hg-workbench-in-ms-windows SourceTree looks quite similar. On Thu, Sep 17, 2015 at 2:07 PM, Terry Reedy wrote: > On 9/17/2015 3:17 AM, André Freitas wrote: > >> Regarding Git tools for Windows, GitHub Desktop and S

Re: [Python-Dev] PEP: Collecting information about git

On 9/17/2015 3:17 AM, André Freitas wrote: Regarding Git tools for Windows, GitHub Desktop and Sourcetree are actually very good with nice features. Do you know if either have anything like TortoiseHg Workbench? https://tortoisehg.readthedocs.org/en/latest/workbench.html (screenshot at top) --

Re: [Python-Dev] PEP: Collecting information about git

On 9/17/2015 3:09 AM, Tim Golden wrote: On 17/09/2015 02:59, Terry Reedy wrote: On 9/16/2015 5:20 AM, Oleg Broytman wrote: On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler wrote: There are a lot of reasons to prefer one tool over another. Common ones are familiarity, simplicity, and

Re: [Python-Dev] PEP: Collecting information about git

Regarding Git tools for Windows, GitHub Desktop and Sourcetree are actually very good with nice features. A Qui, 17/09/2015, 04:12, Nikolaus Rath escreveu: > On Sep 16 2015, Terry Reedy wrote: > > On 9/16/2015 5:20 AM, Oleg Broytman wrote: > > > >> On Tue, Sep 15, 2015 at 07:44:28PM +, Augi

Re: [Python-Dev] PEP: Collecting information about git

On 17/09/2015 02:59, Terry Reedy wrote: > On 9/16/2015 5:20 AM, Oleg Broytman wrote: > >> On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler >> wrote: > >>> There are a lot of reasons to prefer one tool over another. Common >>> ones are >>> familiarity, simplicity, and power. >> >> Add

Re: [Python-Dev] PEP: Collecting information about git

On Sep 16 2015, Terry Reedy wrote: > On 9/16/2015 5:20 AM, Oleg Broytman wrote: > >> On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler >> wrote: > >>> There are a lot of reasons to prefer one tool over another. Common ones are >>> familiarity, simplicity, and power. >> >> Add here docu

Re: [Python-Dev] PEP: Collecting information about git

On Sep 16 2015, Nikolaus Rath wrote: > On Sep 16 2015, "R. David Murray" wrote: >> On Wed, 16 Sep 2015 09:17:38 -0700, Nikolaus Rath wrote: >>> On Sep 16 2015, "R. David Murray" wrote: >>> > The DAG plus git branches-as-labels *fits in my head* in a way that the >>> > DAG plus named-branches-an

Re: [Python-Dev] PEP: Collecting information about git

Nikolaus Rath writes: > On Sep 17 2015, "Stephen J. Turnbull" wrote: > > Nikolaus Rath writes: > > > > > Hmm, that's odd. As far as I know, the difference between the hg and git > > > DAG model can be summarized like this: > > > > > > * In git, leaves of the DAG must be assigned a nam

Re: [Python-Dev] PEP: Collecting information about git

Nikolaus Rath writes: > >> * hg named branches have no equivalent in git. > >> > >> Does that help? > > > > Well, that last bullet kind of complicates the model, doesn't it? :) > > Not if you come from git and want to use hg. You can just ignore > bookmarks. No, you cannot just ignor

Re: [Python-Dev] PEP: Collecting information about git

On 9/16/2015 5:20 AM, Oleg Broytman wrote: On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler wrote: There are a lot of reasons to prefer one tool over another. Common ones are familiarity, simplicity, and power. Add here documentation, speed, availability of extensions and 3rd-p

Re: [Python-Dev] PEP: Collecting information about git

On 9/15/2015 10:14 PM, Augie Fackler wrote: (Note that I'm not subbed to python-devel, so you'll get faster service by leaving me cc'ed on the thread.) I am not either, because I read and post (since its beginning) via the gmane.comp.python.devel mirror at news.gmane.org. Choose newsgroup or

Re: [Python-Dev] PEP: Collecting information about git

On Sep 17 2015, "Stephen J. Turnbull" wrote: > Nikolaus Rath writes: > > > Hmm, that's odd. As far as I know, the difference between the hg and git > > DAG model can be summarized like this: > > > > * In git, leaves of the DAG must be assigned a name. If they don't have > >a name, they

Re: [Python-Dev] PEP: Collecting information about git

On Sep 16 2015, "R. David Murray" wrote: > On Wed, 16 Sep 2015 09:17:38 -0700, Nikolaus Rath wrote: >> On Sep 16 2015, "R. David Murray" wrote: >> > The DAG plus git branches-as-labels *fits in my head* in a way that the >> > DAG plus named-branches-and-other-things does not. >> >> Hmm, that's

Re: [Python-Dev] PEP: Collecting information about git

On Sep 16 2015, Paul Moore wrote: > I'm on revision X, which is at tip (master in git, the default branch > in Mercurial). I do git checkout -b foo (or hg bookmark foo). Now I > check in some changes. In git, I'm on branch foo and I can go back to > master with git checkout master. In Mercurial, I

Re: [Python-Dev] PEP: Collecting information about git

Nikolaus Rath rath.org> writes: > > On Sep 16 2015, Paul Moore gmail.com> wrote: > > On 16 September 2015 at 06:10, Stephen J. Turnbull xemacs.org> wrote: > > In general you can do that by configuring the repository with > > [phases] > publish = False > > However, I believe BitB

Re: [Python-Dev] PEP: Collecting information about git

On 09/16/2015 02:20 AM, Oleg Broytman wrote: Hi! On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler wrote: Hi! I work on Mercurial. I???ve got some inline responses, but I want to summarize and put this in context for those without much energy for the topic. Thank you! There ar

Re: [Python-Dev] PEP: Collecting information about git

(wonderfully forgot to address the point that triggered reply) On 09/16/2015 02:20 AM, Oleg Broytman wrote: Oleg Broytman phdru.name> writes: With git we can have per-directory .gitignore and .gitattributes. No per-directory .hgignore? Never? Quite useful in a big project where subprojec

Re: [Python-Dev] PEP: Collecting information about git

Nikolaus Rath rath.org> writes: > > On Sep 16 2015, Chris Angelico gmail.com> wrote: > > With git, there are infinite workflows possible - you aren't forced to > > have a concept of "central server" and "clients" the way you would > > with SVN. Mercurial's called a DVCS too, so presumably it's

Re: [Python-Dev] PEP: Collecting information about git

On 16 September 2015 at 17:10, Nikolaus Rath wrote: >> I don't know of an equivalent of remote tracking branches in >> Mercurial. Maybe bookmarks work that way by default? > > Where exactly did you run into problems? I think you should have gotten > the same result with the following hg commands (

Re: [Python-Dev] PEP: Collecting information about git

Nikolaus Rath writes: > Hmm, that's odd. As far as I know, the difference between the hg and git > DAG model can be summarized like this: > > * In git, leaves of the DAG must be assigned a name. If they don't have >a name, they will be garbage collected. You can turn off automatic garb

Re: [Python-Dev] PEP: Collecting information about git

On Wed, 16 Sep 2015 09:17:38 -0700, Nikolaus Rath wrote: > On Sep 16 2015, "R. David Murray" wrote: > > The DAG plus git branches-as-labels *fits in my head* in a way that the > > DAG plus named-branches-and-other-things does not. > > Hmm, that's odd. As far as I know, the difference between the

Re: [Python-Dev] PEP: Collecting information about git

On Sep 16 2015, "R. David Murray" wrote: > The DAG plus git branches-as-labels *fits in my head* in a way that the > DAG plus named-branches-and-other-things does not. Hmm, that's odd. As far as I know, the difference between the hg and git DAG model can be summarized like this: * In git, leave

Re: [Python-Dev] PEP: Collecting information about git

On Sep 16 2015, Chris Angelico wrote: > With git, there are infinite workflows possible - you aren't forced to > have a concept of "central server" and "clients" the way you would > with SVN. Mercurial's called a DVCS too, so presumably it's possible > to operate on a pure-peering model with no ce

Re: [Python-Dev] PEP: Collecting information about git

On Sep 16 2015, Paul Moore wrote: > On 16 September 2015 at 06:10, Stephen J. Turnbull wrote: >> The only thing that hg really lost badly on >> IMO was "named branches", and that's been fixed with bookmarks. > > FWIW, I still find bookmarks confusing to use compared to git > branches. I don't k

Re: [Python-Dev] PEP: Collecting information about git

Oleg Broytman phdru.name> writes: > > Hi! > > On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler durin42.com> wrote: > > Hi! I work on Mercurial. I???ve got some inline responses, but I want to > > summarize and put this in context for those without much energy for the topic. > >Than

Re: [Python-Dev] PEP: Collecting information about git

On Sep 16, 2015, at 09:34 AM, R. David Murray wrote: >My experience with DVCS started with bazaar, moved on to hg for the >CPython project, and finally git. Through all of that I did not >understand the DAG, and had trouble wrapping my mind around what was >going on, despite being able to get thi

Re: [Python-Dev] PEP: Collecting information about git

On Wed, 16 Sep 2015 19:59:28 +1000, Chris Angelico wrote: > On Wed, Sep 16, 2015 at 7:46 PM, Oleg Broytman wrote: > > For example, I develop > > SQLObject using two private clones (clean backup repo and dirty working > > repo) and three public clones at Gitlab, GutHub and SourceForge. They > > ar

Re: [Python-Dev] PEP: Collecting information about git

On Wed, Sep 16, 2015 at 7:46 PM, Oleg Broytman wrote: > For example, I develop > SQLObject using two private clones (clean backup repo and dirty working > repo) and three public clones at Gitlab, GutHub and SourceForge. They > are all equal, none of them is the upstream. I don't even have > ``orig

Re: [Python-Dev] PEP: Collecting information about git

On 16 Sep 2015 18:48, "Paul Moore" wrote: > > On 16 September 2015 at 06:10, Stephen J. Turnbull wrote: > > The only thing that hg really lost badly on > > IMO was "named branches", and that's been fixed with bookmarks. > > FWIW, I still find bookmarks confusing to use compared to git > branche

Re: [Python-Dev] PEP: Collecting information about git

On Wed, Sep 16, 2015 at 07:27:12PM +1000, Chris Angelico wrote: > On Wed, Sep 16, 2015 at 7:20 PM, Oleg Broytman wrote: > >Thanks. I think upstream remote-tracking branches in git are rather > > similar. If one's afraid of rewriting published history she should never > > rebase before @{u}.

Re: [Python-Dev] PEP: Collecting information about git

On Wed, Sep 16, 2015 at 7:20 PM, Oleg Broytman wrote: >Thanks. I think upstream remote-tracking branches in git are rather > similar. If one's afraid of rewriting published history she should never > rebase before @{u}. Just always using ``git rebase -i @{u}`` should be > good enough. >The

Re: [Python-Dev] PEP: Collecting information about git

Hi! On Tue, Sep 15, 2015 at 07:44:28PM +, Augie Fackler wrote: > Hi! I work on Mercurial. I???ve got some inline responses, but I want to > summarize and put this in context for those without much energy for the topic. Thank you! > There are a lot of reasons to prefer one tool over anot

Re: [Python-Dev] PEP: Collecting information about git

On 16 September 2015 at 06:10, Stephen J. Turnbull wrote: > The only thing that hg really lost badly on > IMO was "named branches", and that's been fixed with bookmarks. FWIW, I still find bookmarks confusing to use compared to git branches. I don't know whether that's because bitbucket doesn't

Re: [Python-Dev] PEP: Collecting information about git

Augie Fackler writes: > There is no sacrifice [for git users moving to Mercurial] other > than familiarity--and because Mercurial indeed has as simpler UI, > closing the familiarity gap from Git to Mercurial is much easier > than the other way around. AFAIK it is still much easier to do the k

Re: [Python-Dev] PEP: Collecting information about git

Mercurial is easier to use (for cases outside linux kernel development). It's too bad the gravity of GitHub tends to override that. -Mike On 09/15/2015 05:20 PM, Chris Angelico wrote: Looks like it's time I spun up my own hg, rather than using the 3.1.2 that ships with Debian. ＞ sudo pip i

Re: [Python-Dev] PEP: Collecting information about git

On Sep 16 2015, Chris Angelico wrote: > On Wed, Sep 16, 2015 at 5:44 AM, Augie Fackler wrote: >>> but git is still better at it: ``git add -p`` >>> allows me to review and edit patches before commit while ``hg record`` >>> commits immediately. >> >> FWIW, I totally *get* wanting a staging area. T

Re: [Python-Dev] PEP: Collecting information about git

Chris Angelico gmail.com> writes: > > On Wed, Sep 16, 2015 at 5:44 AM, Augie Fackler durin42.com> wrote: > >> but git is still better at it: ``git add -p`` > >> allows me to review and edit patches before commit while ``hg record`` > >> commits immediately. > > > > FWIW, I totally *get* wanting

Re: [Python-Dev] PEP: Collecting information about git

On 16 Sep 2015 7:43 am, "Larry Hastings" wrote: > > > I don't follow. Because you're an advocate of Python switching to git and GitHub, we should have a git tutorial committed as a Python Enhancement Proposal? > > I'm not attempting to stir up a conversation about git vs hg. I only question the

Re: [Python-Dev] PEP: Collecting information about git

On Wed, Sep 16, 2015 at 5:44 AM, Augie Fackler wrote: >> but git is still better at it: ``git add -p`` >> allows me to review and edit patches before commit while ``hg record`` >> commits immediately. > > FWIW, I totally *get* wanting a staging area. That said, other than the > staging area, recor

Re: [Python-Dev] PEP: Collecting information about git

On Tue, Sep 15, 2015 at 10:41:54PM +0100, Larry Hastings wrote: > > I don't follow. Because you're an advocate of Python switching to > git and GitHub, we should have a git tutorial committed as a Python > Enhancement Proposal? > > I'm not attempting to stir up a conversation about git vs hg.

Re: [Python-Dev] PEP: Collecting information about git

I don't follow. Because you're an advocate of Python switching to git and GitHub, we should have a git tutorial committed as a Python Enhancement Proposal? I'm not attempting to stir up a conversation about git vs hg. I only question the idea that a git tutorial should be a PEP, when it ha

Re: [Python-Dev] PEP: Collecting information about git

Oleg Broytman phdru.name> writes: > > Hi! Hi! I work on Mercurial. I’ve got some inline responses, but I want to summarize and put this in context for those without much energy for the topic. There are a lot of reasons to prefer one tool over another. Common ones are familiarity, simplicity, a

Re: [Python-Dev] PEP: Collecting information about git

On Tue, 15 Sep 2015 20:32:33 +0200, Georg Brandl wrote: > On 09/15/2015 08:22 PM, Guido van Rossum wrote: > > For one, because *I* have been a (moderate) advocate for switching to git > > and > > GitHub. > > Fair enough. Still strange to read this PEP with the explicit caveat of > "The author of

Re: [Python-Dev] PEP: Collecting information about git

On Tue, Sep 15, 2015 at 08:32:33PM +0200, Georg Brandl wrote: > Fair enough. Still strange to read this PEP with the explicit caveat of > "The author of the PEP doesn't currently plan to write a Process PEP on > migration Python development from Mercurial to git." I am not a member of the core

Re: [Python-Dev] PEP: Collecting information about git

Fair enough. Still strange to read this PEP with the explicit caveat of "The author of the PEP doesn't currently plan to write a Process PEP on migration Python development from Mercurial to git." Georg On 09/15/2015 08:22 PM, Guido van Rossum wrote: > For one, because *I* have been a (moderate)

Re: [Python-Dev] PEP: Collecting information about git

For one, because *I* have been a (moderate) advocate for switching to git and GitHub. On Tue, Sep 15, 2015 at 11:19 AM, Georg Brandl wrote: > On 09/15/2015 08:02 PM, Oleg Broytman wrote: > > On Tue, Sep 15, 2015 at 09:46:55AM -0700, Benjamin Peterson < > benja...@python.org> wrote: > >> This loo

Re: [Python-Dev] PEP: Collecting information about git

On 09/15/2015 08:02 PM, Oleg Broytman wrote: > On Tue, Sep 15, 2015 at 09:46:55AM -0700, Benjamin Peterson > wrote: >> This looks like good information, but why is it a PEP? If anything, the >> devguide was probably be more appropriate. But even that's strange >> considering we don't use git at t

Re: [Python-Dev] PEP: Collecting information about git

On Tue, Sep 15, 2015, at 11:02, Oleg Broytman wrote: > On Tue, Sep 15, 2015 at 09:46:55AM -0700, Benjamin Peterson > wrote: > > This looks like good information, but why is it a PEP? If anything, the > > devguide was probably be more appropriate. But even that's strange > > considering we don't

Re: [Python-Dev] PEP: Collecting information about git

On Tue, Sep 15, 2015 at 09:46:55AM -0700, Benjamin Peterson wrote: > This looks like good information, but why is it a PEP? If anything, the > devguide was probably be more appropriate. But even that's strange > considering we don't use git at the moment. Exactly because the core team doesn't

Re: [Python-Dev] PEP: Collecting information about git

This looks like good information, but why is it a PEP? If anything, the devguide was probably be more appropriate. But even that's strange considering we don't use git at the moment. On Sat, Sep 12, 2015, at 06:56, Oleg Broytman wrote: > On Sat, Sep 12, 2015 at 03:54:51PM +0200, Oleg Broytman > w

Re: [Python-Dev] PEP: Collecting information about git

Hello! On Sat, Sep 12, 2015 at 03:54:51PM +0200, Oleg Broytman wrote: > Title: Collecting information about git The PEP is assigned number 103: https://www.python.org/dev/peps/pep-0103/ I added a section "Branching models". Oleg. -- Oleg Broytmanhttp://phdru.name/

Re: [Python-Dev] PEP: Collecting information about git

Hello! On Sun, Sep 13, 2015 at 02:10:42PM -0400, Barry Warsaw wrote: > One of the things I think is missing from most git documentation, is an > effective workflow for handling multiple branches. Thank you for the good question! I doubt there One True Way, so the core team will choose one of

Re: [Python-Dev] PEP: Collecting information about git

On Sep 12, 2015, at 03:54 PM, Oleg Broytman wrote: >This Informational PEP collects information about git. There is, of course, a >lot of documentation for git, so the PEP concentrates on more complex (and >more related to Python development) issues, scenarios and examples. Thanks for this Oleg.

Re: [Python-Dev] PEP: Collecting information about git

Hi! On Sun, Sep 13, 2015 at 09:14:58AM +1000, Tim Delaney wrote: > On 13 September 2015 at 04:42, Oleg Broytman wrote: > > >There are too many things that I personally can do with git but can't > > do with hg. Because of that I switched all my development from hg to git > > and I am willin

Re: [Python-Dev] PEP: Collecting information about git

On September 12, 2015 6:14:58 PM CDT, Tim Delaney wrote: >On 13 September 2015 at 04:42, Oleg Broytman wrote: > >>There are too many things that I personally can do with git but >can't >> do with hg. Because of that I switched all my development from hg to >git >> and I am willing to help

Re: [Python-Dev] PEP: Collecting information about git

On 13 September 2015 at 04:42, Oleg Broytman wrote: >There are too many things that I personally can do with git but can't > do with hg. Because of that I switched all my development from hg to git > and I am willing to help those who want to follow. > Slightly off-topic, but personally I'd

Re: [Python-Dev] PEP: Collecting information about git

On Sat, Sep 12, 2015 at 02:02:15PM -0400, PJ Eby wrote: > On Sat, Sep 12, 2015 at 9:54 AM, Oleg Broytman wrote: > > The plan is to extend the PEP in the future collecting information > > about equivalence of Mercurial and git scenarios to help migrating > > Python development from Mercurial to gi

Re: [Python-Dev] PEP: Collecting information about git

On Sat, Sep 12, 2015 at 9:54 AM, Oleg Broytman wrote: > The plan is to extend the PEP in the future collecting information > about equivalence of Mercurial and git scenarios to help migrating > Python development from Mercurial to git. I couldn't find any previous discussion about this, but I fig

Re: [Python-Dev] PEP: Collecting information about git

On Sat, Sep 12, 2015 at 08:29:10AM -0700, Guido van Rossum wrote: > I have only skimmed the first half but it looks really good. Thank you! > On Sat, Sep 12, 2015 at 8:12 AM, Brett Cannon wrote: > > > I have not had a chance to read Oleg's PEP, but the devguide has the > > reverse docs at

Re: [Python-Dev] PEP: Collecting information about git

Hi! I will add the URL with the following paragraph: Python Developer's Guide also has a chapter `Mercurial for git developers `_ that documents a few differences between git and hg. Thanks! On Sat, Sep 12, 2015 at 03:12:13PM +, Brett Cannon

Re: [Python-Dev] PEP: Collecting information about git

I have only skimmed the first half but it looks really good. On Sat, Sep 12, 2015 at 8:12 AM, Brett Cannon wrote: > I have not had a chance to read Oleg's PEP, but the devguide has the > reverse docs at https://docs.python.org/devguide/gitdevs.html so we have > the VCS docs down pat. :) > > On S

Re: [Python-Dev] PEP: Collecting information about git

I have not had a chance to read Oleg's PEP, but the devguide has the reverse docs at https://docs.python.org/devguide/gitdevs.html so we have the VCS docs down pat. :) On Sat, Sep 12, 2015, 06:59 Oleg Broytman wrote: > PEP: XXX > Title: Collecting information about git > Version: $Revision$ > La

[Python-Dev] PEP: Collecting information about git

PEP: XXX Title: Collecting information about git Version: $Revision$ Last-Modified: $Date$ Author: Oleg Broytman Status: Draft Type: Informational Content-Type: text/x-rst Created: 01-Jun-2015 Post-History: 12-Sep-2015 Abstract This Informational PEP collects information about git. Ther

Re: [Python-Dev] PEP: Collecting information about git

On Sat, Sep 12, 2015 at 03:54:51PM +0200, Oleg Broytman wrote: > PEP: XXX > Title: Collecting information about git HTMLized version: http://phdru.name/Software/Python/PEPs/pep-git.html git repo: http://git.phdru.name/?p=pep-git.git;a=summary Oleg. -- Oleg Broytmanhttp://