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

[Augie Fackler]

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 a staging area. That said, other than the
> > staging area, record (aka commit --interactive) and git add -p are identical
> > functionality-wise. We also now ship (at least as of 3.5) a curses UI for
> > record, which is quite nice.
> 
> Looks like it's time I spun up my own hg, rather than using the 3.1.2
> that ships with Debian.

Clone https://selenic.com/hg and run `make deb` - it's not quite done
(doesn't include system configs for using the ca-certificates files for ssl
trust), but it should give you usable debs on your system. Please let me
know if it doesn't work for you!

(Note that I'm not subbed to python-devel, so you'll get faster service by
leaving me cc'ed on the thread.)

> A better UI for interactive (partial) commits
> would go a long way toward filling the hole left by not having a
> staging area; though I'll still miss it, some, in the most complicated
> cases (where I use 'git gui' to stage and unstage bits, then check in
> 'gitk' that it looks right, continue until happy). Fortunately the
> complicated cases are rare, but when my non-technical mother or my
> technical-but-decades-out-of-date father needs help fixing up a
> repository problem, I make good use of git's staging power.
> 
> Mentioning in the PEP that some of these things are available as of
> version X might help bridge the gap between one author's knowledge and
> a core dev's skills.
> 
> ChrisA
> 




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

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

[Nikolaus Rath]

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. That said, other than the
>> staging area, record (aka commit --interactive) and git add -p are identical
>> functionality-wise. We also now ship (at least as of 3.5) a curses UI for
>> record, which is quite nice.
>
> Looks like it's time I spun up my own hg, rather than using the 3.1.2
> that ships with Debian. A better UI for interactive (partial) commits
> would go a long way toward filling the hole left by not having a
> staging area;

You don't need to update Mercurial, it sufficient to install the
Tortoisehg frontend (unless you really want a curses interface,
Tortoisehg is X11). Give it a shot!

Best,
-Nikolaus

-- 
GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F
Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F

 »Time flies like an arrow, fruit flies like a Banana.«
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

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

[Mike Miller]

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 install -U mercurial

  Downloading mercurial-3.5.1.tar.gz (4.4MB): 4.4MB downloaded
  Running setup.py (path:/tmp/pip_build_root/mercurial/setup.py) egg_info for 
package mercurial...


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

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

[Stephen J. Turnbull]

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 kinds of things that "git
filter-branch" does in git than in hg.  (Haven't looked closely at hg's
capabilities since 3.2, though -- hg has been just fine for everyday
work on hg-using projects for years IMO.)  OTOH, I don't think that's
relevant to Python development, and probably the majority of VCS users
consider it an abomination.

 > If Python crew wants to go to Git, then it should go to Git, but it
 > should want to go for legitimate reasons--not a misguided belief
 > that Git can do things Mercurial cannot.

+1  I've always liked git (I was the git proponent for PEP 374), but
even at that time, the kinds of things that the vast majority of
Python developers do the vast majority of the time were equally
possible in git and hg.  The only thing that hg really lost badly on
IMO was "named branches", and that's been fixed with bookmarks.

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

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

[Chris Angelico]

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, record (aka commit --interactive) and git add -p are identical
> functionality-wise. We also now ship (at least as of 3.5) a curses UI for
> record, which is quite nice.

Looks like it's time I spun up my own hg, rather than using the 3.1.2
that ships with Debian. A better UI for interactive (partial) commits
would go a long way toward filling the hole left by not having a
staging area; though I'll still miss it, some, in the most complicated
cases (where I use 'git gui' to stage and unstage bits, then check in
'gitk' that it looks right, continue until happy). Fortunately the
complicated cases are rare, but when my non-technical mother or my
technical-but-decades-out-of-date father needs help fixing up a
repository problem, I make good use of git's staging power.

Mentioning in the PEP that some of these things are available as of
version X might help bridge the gap between one author's knowledge and
a core dev's skills.

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

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

[Nick Coghlan]

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 idea that a git tutorial should be a PEP, when it has
literally nothing to do with enhancing Python.  There are countless other
venues through which Oleg could publish this information--a blog, a wiki,
or even a series of postings to this newsgroup. I would encourage him to
withdraw the PEP and publish through one of those.

PEP 481 proposes moving the core workflow to a GitHub backed Phabricator
instance, so I see some utility in having an informational PEP that
collects details on the practical benefits folks see in git over hg. For
cases where the perception is incorrect, we can note that too, and improve
the dev guide accordingly (the Mercurial folks may also find out useful in
improving their tutorials and default settings)

For example, your 3.5.0 release process experiment highlighted some of the
problems with BitBucket's Mercurial pull requests being incorrectly
implemented atop named branches rather than bookmarks:
https://bitbucket.org/site/master/issues/6705/cant-create-pull-request-from-hg-bookmark

This means if folks are following Atlassian's lead and using branches in
Mercurial when bookmarks would be more appropriate, they're going to
encounter problems.

Cheers,
Nick.

>
>
> /arry
>
>
> On 09/15/2015 07:22 PM, Guido van Rossum wrote:
>>
>> 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 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 use git the information
doesn't
>>> > belong to the current revision of Developer's Guide.
>>>
>>> And if it doesn't propose to make the core team use git, why is it a
PEP?
>>>
>>> Georg
>>>
>>> ___
>>> Python-Dev mailing list
>>> Python-Dev@python.org
>>> https://mail.python.org/mailman/listinfo/python-dev
>>> Unsubscribe:
https://mail.python.org/mailman/options/python-dev/guido%40python.org
>>
>>
>>
>>
>> --
>> --Guido van Rossum (python.org/~guido)
>>
>>
>> ___
>> Python-Dev mailing list
>> Python-Dev@python.org
>> https://mail.python.org/mailman/listinfo/python-dev
>> Unsubscribe:
https://mail.python.org/mailman/options/python-dev/larry%40hastings.org
>
>
>
> ___
> Python-Dev mailing list
> Python-Dev@python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe:
https://mail.python.org/mailman/options/python-dev/ncoghlan%40gmail.com
>
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

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

[Oleg Broytman]

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.  I
> only question the idea that a git tutorial should be a PEP, when it
> has literally nothing to do with enhancing Python.  There are

   There are PEPs that enhance development process but not Python
itself. I consider the PEP one of those.

> countless other venues through which Oleg could publish this
> information--a blog, a wiki, or even a series of postings to this
> newsgroup. I would encourage him to withdraw the PEP and publish
> through one of those.
> 
> 
> //arry/
> 
> On 09/15/2015 07:22 PM, Guido van Rossum wrote:
> >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
> >> 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 use git the information
> >doesn't
> >> belong to the current revision of Developer's Guide.
> >
> >And if it doesn't propose to make the core team use git, why is it
> >a PEP?
> >
> >Georg
> >-- 
> >--Guido van Rossum (python.org/~guido )

Oleg.
-- 
 Oleg Broytmanhttp://phdru.name/p...@phdru.name
   Programmers don't die, they just GOSUB without RETURN.
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

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

[Benjamin Peterson]

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 use git at the moment.
> 
>Exactly because the core team doesn't use git the information doesn't
> belong to the current revision of Developer's Guide.

Unless it's actually going to argue that we should move to git, I don't
see why it should be a PEP either.
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

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

[Georg Brandl]

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 the moment.
> 
>Exactly because the core team doesn't use git the information doesn't
> belong to the current revision of Developer's Guide.

And if it doesn't propose to make the core team use git, why is it a PEP?

Georg

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

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

[Georg Brandl]

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) 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 
> > 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 use git the information doesn't
> > belong to the current revision of Developer's Guide.
> 
> And if it doesn't propose to make the core team use git, why is it a PEP?



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

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

[Guido van Rossum]

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 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 use git the information doesn't
> > belong to the current revision of Developer's Guide.
>
> And if it doesn't propose to make the core team use git, why is it a PEP?
>
> Georg
>
> ___
> Python-Dev mailing list
> Python-Dev@python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe:
> https://mail.python.org/mailman/options/python-dev/guido%40python.org
>



-- 
--Guido van Rossum (python.org/~guido)
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

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

[Oleg Broytman]

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 team, I certainly cannot write such a
Process PEP. But I very much hope to see one and help if I can.

> Georg
> 
> 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.
> > 
> > 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 
> > > 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 use git the information 
> > doesn't
> > > belong to the current revision of Developer's Guide.
> > 
> > And if it doesn't propose to make the core team use git, why is it a 
> > PEP?

Oleg.
-- 
 Oleg Broytmanhttp://phdru.name/p...@phdru.name
   Programmers don't die, they just GOSUB without RETURN.
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

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

[R. David Murray]

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 the PEP doesn't currently plan to write a Process PEP on
> migration Python development from Mercurial to git."

I understood this to mean he's providing the info that would be needed
for writing a process PEP, but as an informational PEP because there's
no other place it fits better and Guido would like to have it on record,
but isn't himself planning to propose a switch *at the moment*, thus
cutting off panic from the community that there was an immanent proposal
to switch.

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

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

[Benjamin Peterson]

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 
> 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://phdru.name/   
>  p...@phdru.name
>Programmers don't die, they just GOSUB without RETURN.
> ___
> Python-Dev mailing list
> Python-Dev@python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe:
> https://mail.python.org/mailman/options/python-dev/benjamin%40python.org
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

[Python-Dev] python windows installation inconsistent use of registry keys

[Barry Scott]

I am used to looking in 
HKLM:\SOFTWARE\Python\PythonCore\%(py_maj)d.%(py_min)d\InstallPath
to find out where python is installed so that my installation kit can add 
itself to site-packages.

I just found that the registry key used for 32 bit python 3.5 on windows 
changed to be '3.5-32',
which I can change my installer to cope with.

However the key for the 64bit install is ‘3.5’ but not '3.5-64'.

Why was this changed and why not consistently between 32 and 64 bit versions?

Barry
PyCXX, PySVN maintainer

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

Re: [Python-Dev] peps: Move 13 -> 103

[Serhiy Storchaka]

On 15.09.15 04:21, barry.warsaw wrote:

https://hg.python.org/peps/rev/e275c4cd4b44
changeset:   6059:e275c4cd4b44
user:Barry Warsaw 
date:Mon Sep 14 21:21:40 2015 -0400
summary:
   Move 13 -> 103

files:
   pep-0103.rst |  2 +-
   1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/pep-0013.rst b/pep-0103.rst
rename from pep-0013.rst
rename to pep-0103.rst


Is it due to superstition?


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

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

[Oleg Broytman]

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/p...@phdru.name
   Programmers don't die, they just GOSUB without RETURN.
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] peps: Move 13 -> 103

[Oleg Broytman]

On Tue, Sep 15, 2015 at 12:17:00PM +0300, Serhiy Storchaka 
 wrote:
> On 15.09.15 04:21, barry.warsaw wrote:
> >https://hg.python.org/peps/rev/e275c4cd4b44
> >changeset:   6059:e275c4cd4b44
> >user:Barry Warsaw 
> >date:Mon Sep 14 21:21:40 2015 -0400
> >summary:
> >   Move 13 -> 103
> >
> >files:
> >   pep-0103.rst |  2 +-
> >   1 files changed, 1 insertions(+), 1 deletions(-)
> >
> >
> >diff --git a/pep-0013.rst b/pep-0103.rst
> >rename from pep-0013.rst
> >rename to pep-0103.rst
> 
> Is it due to superstition?

   It's because I suggested the PEP doesn't deserve to be listed among
the top Process PEPs. Mine PEP is just Informational, so a number like
103 seems to suits it better. Barry agreed.

Oleg.
-- 
 Oleg Broytmanhttp://phdru.name/p...@phdru.name
   Programmers don't die, they just GOSUB without RETURN.
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

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

[Oleg Broytman]

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 use git the information doesn't
belong to the current revision of Developer's Guide.

> On Sat, Sep 12, 2015, at 06:56, Oleg Broytman wrote:
> > On Sat, Sep 12, 2015 at 03:54:51PM +0200, Oleg Broytman 
> > wrote:
> > > PEP: 103
> > > Title: Collecting information about git

Oleg.
-- 
 Oleg Broytmanhttp://phdru.name/p...@phdru.name
   Programmers don't die, they just GOSUB without RETURN.
___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

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

[Augie Fackler]

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, and power. Version control debates often touch all
three of those points, and there’s often a _lot_ of misinformation thrown
around during the debate. It’s very clear to me based on this thread that
Oleg is not familiar with Mercurial -- everything listed as impossible is
not only doable in Mercurial, but not infrequently the command or flag is
*identically named*. I’m sending this mail not in an attempt to combat what
may be a healthy move for the your development community, but instead to
ensure that the right capability tradeoffs are seen during this process.

If the Python community wants to move to Git (or, as is more often the case
with such migrations, GitHub specifically - the choice of Git is often
totally unrelated to the popularity of the one particular host), it should
do so for good, clear reasons. That might be everyone thinking Git is a
better tool (to my own personal dismay, I’ll admit), or it might be that the
perceived network effects of being hosted on GitHub outweigh the switching
costs or difficulty of using a more complex tool.

>
> On Sun, Sep 13, 2015 at 09:14:58AM +1000, Tim Delaney  gmail.com> wrote:
> > On 13 September 2015 at 04:42, Oleg Broytman  phdru.name> 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 love to know what those are. I've
> > yet to find anything in Git that I haven't been able to do at least as well
> > with Mercurial (or an extension), and there are things Mercurial
> > supports that I use extensively (in particular named branches and phases)
> > where the concept doesn't even exist in Git.
>

[elided much that is strictly personal preference, plus some personal history]

>Git fixed all the problems I had with hg. Its branching model suits
> my understanding of branches much better.

So use bookmarks. They're almost identical.

> With git we can have
> per-directory .gitignore and .gitattributes. Lightweight and annotated
> tags point exactly to the commits they tag.

I'm chalking these up to personal taste, but know that the tagging behavior
of git vs hg is a very complicated tradeoff. Mercurial chose a path that
makes tags audit-able in the future, whereas in Git a tag could disappear
and it'd be hard to prove.


> Ability to pull and push between unrelated repos.

In my opinion, this is honestly a misfeature, but Mercurial absolutely can
do it:  `hg pull --force` will do what you want.

>I learned commit editing and found that it was the thing I wanted so
> badly in hg. When I started Mercurial was at version 1.7 and there was
> no commit editing at all; there was ``hg rollback`` but it only could
> undo one transaction.

Please forget rollback exists. It's dangerous, and we're hiding it from new
users for a reason. :)
> Later Mercurial learned commit editing,
> unwillingly perhaps,

Not at all unwillingly, we're just trying to be deliberate about it. We
wanted to make sure that we *both* enabled editing by default, *and* make it
impossible for a user to lose data. Getting that right took time, but we
think the wait has been worth it. If you want a preview of where we’re
headed, take a look at
https://mercurial.selenic.com/wiki/ChangesetEvolution. Parts of it have
shipped, and the whole concept is making steady progress.

> 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, record (aka commit --interactive) and git add -p are identical
functionality-wise. We also now ship (at least as of 3.5) a curses UI for
record, which is quite nice.

>Git is powerful. Even now, at version 3.1 ``hg help log`` lists about
> a dozen of options; ``git help log`` gives me about 60 pages of
> documentation.

Counting number of command line flags is a horrible way to compare power of
the tool. It reflects complexity, not power.

Mercurial has two major concepts--revsets and templates--that repeat over
and over, and which eliminate the need for many command-line flags that Git
has to include. I’ll give some examples below, but I’d also like to point
out that if you'd read recent Mercurial (3.5 is current - you looked at a
version that’s over a year old by now) output for 'hg help log', you'd find
many options are quite powerful. See below.

> I do not use all of them but I very much like
> ``git log --decorate``

This can be done with our templating system - I even have it in 

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

[Larry Hastings]

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 has 
literally nothing to do with enhancing Python.  There are countless 
other venues through which Oleg could publish this information--a blog, 
a wiki, or even a series of postings to this newsgroup. I would 
encourage him to withdraw the PEP and publish through one of those.



//arry/

On 09/15/2015 07:22 PM, Guido van Rossum wrote:
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
> 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 use git the information
doesn't
> belong to the current revision of Developer's Guide.

And if it doesn't propose to make the core team use git, why is it
a PEP?

Georg

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




--
--Guido van Rossum (python.org/~guido )


___
Python-Dev mailing list
Python-Dev@python.org
https://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
https://mail.python.org/mailman/options/python-dev/larry%40hastings.org


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