magit

magit

[Henri-Paul Indiogine]

I am trying to learn how to use magit.  I managed to commit a file and
now I am trying to figure out how to check it out.  I looked at the
manual and also a tutorial but could find a reference to checking out a
committed file.

Thanks,


-- 
Henri-Paul Indiogine
Email: hindiogine@gmail.com
Skype: hindiogine
Website: http://www.coe.tamu.edu/~enrico

Re: magit

[Óscar Fuentes]

Henri-Paul Indiogine <hindiogine@gmail.com> writes:

> I am trying to learn how to use magit.  I managed to commit a file and
> now I am trying to figure out how to check it out.  I looked at the
> manual and also a tutorial but could find a reference to checking out a
> committed file.

Why do you need to checkout the file? Isn't it on your working tree?

I suspect that you are mixing concepts from other very different Version
Control Systems. Do you know git? magit requires at least a minimal
knowledge about git usage.

BTW, magit has its own mailing list:

http://zagadka.vm.bytemark.co.uk/magit/

Magit

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

What is the situation with preparing to include Magit in Emacs?

-- 
Dr Richard Stallman (https://stallman.org)
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: Magit

[Akib Azmain Turja]

[-- Attachment #1: Type: text/plain, Size: 723 bytes --]

Richard Stallman <rms@gnu.org> writes:

> [[[ To any NSA and FBI agents reading my email: please consider    ]]]
> [[[ whether defending the US Constitution against all enemies,     ]]]
> [[[ foreign or domestic, requires you to follow Snowden's example. ]]]
>
> What is the situation with preparing to include Magit in Emacs?

I don't think that will ever happen.  Magit has many contributors, and
many of them hasn't completed the paperwork.  So including Magit in
Emacs would be pretty hard (if possible)?

-- 
Akib Azmain Turja

Find me on Mastodon at @akib@hostux.social.

This message is signed by me with my GnuPG key.  Its fingerprint is:

    7001 8CE5 819F 17A3 BBA6  66AF E74F 0EFA 922A E7F5

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Magit

[Stefan Monnier]

Akib Azmain Turja [2022-09-03 12:29:08] wrote:
> Richard Stallman <rms@gnu.org> writes:
>> [[[ To any NSA and FBI agents reading my email: please consider    ]]]
>> [[[ whether defending the US Constitution against all enemies,     ]]]
>> [[[ foreign or domestic, requires you to follow Snowden's example. ]]]
>>
>> What is the situation with preparing to include Magit in Emacs?
>
> I don't think that will ever happen.  Magit has many contributors, and
> many of them hasn't completed the paperwork.  So including Magit in
> Emacs would be pretty hard (if possible)?

Actually, in a sense it's pretty easy: just make an exception for the
rule that all code needs to have its copyright assigned to the FSF.

Whether we want to make such an exception here of course is
another question.

But even if we do make such an exception, having a copy of Magit in
`emacs.git` would add extra maintenance burden to keep that copy in sync
with the one maintained elsewhere.  So for administrative reasons, it's
probably preferable to keep it outside of `emacs.git`.


        Stefan

Re: Magit

[Payas Relekar]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> Akib Azmain Turja [2022-09-03 12:29:08] wrote:
>> Richard Stallman <rms@gnu.org> writes:
>>> What is the situation with preparing to include Magit in Emacs?
>>
>> I don't think that will ever happen.  Magit has many contributors, and
>> many of them hasn't completed the paperwork.  So including Magit in
>> Emacs would be pretty hard (if possible)?
>
> Actually, in a sense it's pretty easy: just make an exception for the
> rule that all code needs to have its copyright assigned to the FSF.
>
> Whether we want to make such an exception here of course is
> another question.
>
> But even if we do make such an exception, having a copy of Magit in
> `emacs.git` would add extra maintenance burden to keep that copy in sync
> with the one maintained elsewhere.  So for administrative reasons, it's
> probably preferable to keep it outside of `emacs.git`.
>

For what its worth, my 2c:

Magit is one of the _killer apps_ of Emacs. I was drawn by allure of
org-mode, but was hooked in with magit. I have ready fair number of
anecdotes with similar story and perhaps another equal number who use
Emacs exclusively for magit.

I am also not alone to say magit is the best git user interface in
existence, for many reasons, one of them being it uses Git's own idioms
and does not invent its own terminology like many others.

If maintaining org-mode outside Emacs and regularly merging it has been
managed so far, I am fairly certain it can be done with magit too. I am
fairly noob, but will be willing to take on the task to do it for magit
should it be included in core.

As for copyright, there are better people to discuss and resolve that
matter.

Regards,
Payas
--

Re: Magit

[Eli Zaretskii]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: Richard Stallman <rms@gnu.org>,  emacs-devel@gnu.org
> Date: Sat, 03 Sep 2022 10:20:23 -0400
> 
> But even if we do make such an exception, having a copy of Magit in
> `emacs.git` would add extra maintenance burden to keep that copy in sync
> with the one maintained elsewhere.  So for administrative reasons, it's
> probably preferable to keep it outside of `emacs.git`.

We've decided long ago that whenever it will be possible, we'll add
Magit to Emacs.

Re: Magit

[Stefan Kangas]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> Actually, in a sense it's pretty easy: just make an exception for the
> rule that all code needs to have its copyright assigned to the FSF.

Sounds good to me, FWIW.

> But even if we do make such an exception, having a copy of Magit in
> `emacs.git` would add extra maintenance burden to keep that copy in sync
> with the one maintained elsewhere.  So for administrative reasons, it's
> probably preferable to keep it outside of `emacs.git`.

I'm not sure I understand the objection.  Is it not just a question of
popping something like this in a shell script that runs every N days:

  git clone <MAGIT-URL> magit
  cp magit/*.el lisp/magit
  rm -rf magit
  git commit -a -m "; Auto-update Magit"
  git push

If we want to be a bit more conservative, we have code in NonGNU ELPA to
check out the latest tagged package version.

Re: Magit

[Akib Azmain Turja]

[-- Attachment #1: Type: text/plain, Size: 829 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Stefan Monnier <monnier@iro.umontreal.ca>
>> Cc: Richard Stallman <rms@gnu.org>,  emacs-devel@gnu.org
>> Date: Sat, 03 Sep 2022 10:20:23 -0400
>> 
>> But even if we do make such an exception, having a copy of Magit in
>> `emacs.git` would add extra maintenance burden to keep that copy in sync
>> with the one maintained elsewhere.  So for administrative reasons, it's
>> probably preferable to keep it outside of `emacs.git`.
>
> We've decided long ago that whenever it will be possible, we'll add
> Magit to Emacs.

What about VC?  Why people don't use it much?

-- 
Akib Azmain Turja

Find me on Mastodon at @akib@hostux.social.

This message is signed by me with my GnuPG key.  Its fingerprint is:

    7001 8CE5 819F 17A3 BBA6  66AF E74F 0EFA 922A E7F5

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Magit

[Akib Azmain Turja]

[-- Attachment #1: Type: text/plain, Size: 1729 bytes --]

Stefan Kangas <stefankangas@gmail.com> writes:

> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
>> Actually, in a sense it's pretty easy: just make an exception for the
>> rule that all code needs to have its copyright assigned to the FSF.
>
> Sounds good to me, FWIW.
>
>> But even if we do make such an exception, having a copy of Magit in
>> `emacs.git` would add extra maintenance burden to keep that copy in sync
>> with the one maintained elsewhere.  So for administrative reasons, it's
>> probably preferable to keep it outside of `emacs.git`.
>
> I'm not sure I understand the objection.  Is it not just a question of
> popping something like this in a shell script that runs every N days:
>
>   git clone <MAGIT-URL> magit
>   cp magit/*.el lisp/magit
>   rm -rf magit
>   git commit -a -m "; Auto-update Magit"
>   git push

Yeah, I also think it isn't a too big problem.  I also think we should
take the portable packages (i.e. the packages which don't depend on
Emacs internals, e.g. term, artist, comint (maybe), doctor) out of the
main Emacs repository and make them available through GNU ELPA (while
still keeping a copy in main Emacs repository).  That way Emacs 28.1
users (and possibly Emacs 27.2 users) will get the latest updates to
those packages.

>
> If we want to be a bit more conservative, we have code in NonGNU ELPA to
> check out the latest tagged package version.

The last time I checked, the Magit version hosted on NonGNU ELPA was
completely broken.

-- 
Akib Azmain Turja

Find me on Mastodon at @akib@hostux.social.

This message is signed by me with my GnuPG key.  Its fingerprint is:

    7001 8CE5 819F 17A3 BBA6  66AF E74F 0EFA 922A E7F5

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Magit

[Eli Zaretskii]

> From: Akib Azmain Turja <akib@disroot.org>
> Cc: Stefan Monnier <monnier@iro.umontreal.ca>,  rms@gnu.org,
>   emacs-devel@gnu.org
> Date: Sun, 04 Sep 2022 00:22:43 +0600
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > We've decided long ago that whenever it will be possible, we'll add
> > Magit to Emacs.
> 
> What about VC?  Why people don't use it much?

People do use VC quite a lot.

Re: Magit

[Stefan Monnier]

>> But even if we do make such an exception, having a copy of Magit in
>> `emacs.git` would add extra maintenance burden to keep that copy in sync
>> with the one maintained elsewhere.  So for administrative reasons, it's
>> probably preferable to keep it outside of `emacs.git`.
>
> I'm not sure I understand the objection.  Is it not just a question of
> popping something like this in a shell script that runs every N days:
>
>   git clone <MAGIT-URL> magit
>   cp magit/*.el lisp/magit
>   rm -rf magit
>   git commit -a -m "; Auto-update Magit"
>   git push

People can (and do) commit changes directly to `emacs.git`s `master`
branch and the above would silently revert such changes.  It also means
that the Magit files in `emacs.git` don't get a proper commit log
history, making it harder to track down and fix bugs.

I'm all for including more packages in Emacs, but not by copying them
into the `master` branch `emacs.git`.  I'd rather have a Git submodule
or some such mechanism.


        Stefan

Re: Magit

[Philip Kaludercic]

Akib Azmain Turja <akib@disroot.org> writes:

> Stefan Kangas <stefankangas@gmail.com> writes:
>
>> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>>
>>> Actually, in a sense it's pretty easy: just make an exception for the
>>> rule that all code needs to have its copyright assigned to the FSF.
>>
>> Sounds good to me, FWIW.
>>
>>> But even if we do make such an exception, having a copy of Magit in
>>> `emacs.git` would add extra maintenance burden to keep that copy in sync
>>> with the one maintained elsewhere.  So for administrative reasons, it's
>>> probably preferable to keep it outside of `emacs.git`.
>>
>> I'm not sure I understand the objection.  Is it not just a question of
>> popping something like this in a shell script that runs every N days:
>>
>>   git clone <MAGIT-URL> magit
>>   cp magit/*.el lisp/magit
>>   rm -rf magit
>>   git commit -a -m "; Auto-update Magit"
>>   git push
>
> Yeah, I also think it isn't a too big problem.  I also think we should
> take the portable packages (i.e. the packages which don't depend on
> Emacs internals, e.g. term, artist, comint (maybe), doctor) out of the
> main Emacs repository and make them available through GNU ELPA (while
> still keeping a copy in main Emacs repository).  That way Emacs 28.1
> users (and possibly Emacs 27.2 users) will get the latest updates to
> those packages.
>
>>
>> If we want to be a bit more conservative, we have code in NonGNU ELPA to
>> check out the latest tagged package version.
>
> The last time I checked, the Magit version hosted on NonGNU ELPA was
> completely broken.

I've been using the version from NonGNU ELPA since it has been added
(last year), and there haven't been any issues.

Re: Magit

[Akib Azmain Turja]

[-- Attachment #1: Type: text/plain, Size: 747 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Akib Azmain Turja <akib@disroot.org>
>> Cc: Stefan Monnier <monnier@iro.umontreal.ca>,  rms@gnu.org,
>>   emacs-devel@gnu.org
>> Date: Sun, 04 Sep 2022 00:22:43 +0600
>> 
>> Eli Zaretskii <eliz@gnu.org> writes:
>> 
>> > We've decided long ago that whenever it will be possible, we'll add
>> > Magit to Emacs.
>> 
>> What about VC?  Why people don't use it much?
>
> People do use VC quite a lot.

Maybe my wordings were not clear.  I meant - why people don't talk about
VC much?

-- 
Akib Azmain Turja

Find me on Mastodon at @akib@hostux.social.

This message is signed by me with my GnuPG key.  Its fingerprint is:

    7001 8CE5 819F 17A3 BBA6  66AF E74F 0EFA 922A E7F5

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Magit

[Payas Relekar]

Akib Azmain Turja <akib@disroot.org> writes:

>>> What about VC?  Why people don't use it much?
>>
>> People do use VC quite a lot.
>
> Maybe my wordings were not clear.  I meant - why people don't talk about
> VC much?

VC is alright, but it requires some basic learning.

Magit is instantly intuitive and all interactive. Its a difference
between telling computer what to do vs computer asking/presenting
options for what needs to be done.

Its bit hard to describe, but in short Magit provides superior UX by a
wide margin.

Thanks,
Payas

--

Re: Magit

[Eli Zaretskii]

> From: Akib Azmain Turja <akib@disroot.org>
> Cc: monnier@iro.umontreal.ca,  rms@gnu.org,  emacs-devel@gnu.org
> Date: Sun, 04 Sep 2022 08:47:13 +0600
> 
> >> What about VC?  Why people don't use it much?
> >
> > People do use VC quite a lot.
> 
> Maybe my wordings were not clear.  I meant - why people don't talk about
> VC much?

Why do you say that?  VC is discussed here quite a lot, and the rate
of changes committed to VC files is also quite high.

Re: Magit

[Eli Zaretskii]

> From: Payas Relekar <relekarpayas@gmail.com>
> Date: Sun, 04 Sep 2022 09:43:11 +0530
> 
> Akib Azmain Turja <akib@disroot.org> writes:
> 
> >>> What about VC?  Why people don't use it much?
> >>
> >> People do use VC quite a lot.
> >
> > Maybe my wordings were not clear.  I meant - why people don't talk about
> > VC much?
> 
> VC is alright, but it requires some basic learning.

It is fully described in the Emacs manual.

If you need to work with several different VCSes, VC is a better
alternative, as it strives to present a unified UI for all the VCSes
it supports, from the now ancient RCS, via CVS and Subversion, all the
way to Git and Mercurial.

> Magit is instantly intuitive and all interactive. Its a difference
> between telling computer what to do vs computer asking/presenting
> options for what needs to be done.
> 
> Its bit hard to describe, but in short Magit provides superior UX by a
> wide margin.

Magit has a very different, unique UI that could be more convenient to
some/many people who want to use only Git.  Which is why we want it to
be part of the Emacs core.

Re: Magit

[tomas]

[-- Attachment #1: Type: text/plain, Size: 788 bytes --]

On Sun, Sep 04, 2022 at 08:25:54AM +0300, Eli Zaretskii wrote:

[...]

> > Magit is instantly intuitive and all interactive. Its a difference
> > between telling computer what to do vs computer asking/presenting
> > options for what needs to be done.
> > 
> > Its bit hard to describe, but in short Magit provides superior UX by a
> > wide margin.
> 
> Magit has a very different, unique UI that could be more convenient to
> some/many people who want to use only Git.  Which is why we want it to
> be part of the Emacs core.

To provide a (fairly unimportant) data point: I am a happy Git user,
mostly from the command line. Still, when I use an Emacs interface,
I strongly prefer VC. Magit feels to me kind of intrusive.

But that's me. I'm weird.

Cheers
-- 
t

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: Magit

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > I don't think that will ever happen.  Magit has many contributors, and
  > many of them hasn't completed the paperwork.

Talking with them about this is not impossible.  It just takes work.

Would someone like to volunteer to work on this?

-- 
Dr Richard Stallman (https://stallman.org)
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: Magit

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

What arrangements did we make to update the version of Magit in NonGNU
ELPA?  Are those arrangements being carried out?
-- 
Dr Richard Stallman (https://stallman.org)
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: Magit

[Philip Kaludercic]

Richard Stallman <rms@gnu.org> writes:

> [[[ To any NSA and FBI agents reading my email: please consider    ]]]
> [[[ whether defending the US Constitution against all enemies,     ]]]
> [[[ foreign or domestic, requires you to follow Snowden's example. ]]]
>
> What arrangements did we make to update the version of Magit in NonGNU
> ELPA?  Are those arrangements being carried out?

As is the default for NonGNU ELPA, the Magit repository is automatically
synchronised and mirrored.  Whenever the version tag in the package
header is bumped, a new version is released.

Re: Magit

[Philip Kaludercic]

Richard Stallman <rms@gnu.org> writes:

> [[[ To any NSA and FBI agents reading my email: please consider    ]]]
> [[[ whether defending the US Constitution against all enemies,     ]]]
> [[[ foreign or domestic, requires you to follow Snowden's example. ]]]
>
>   > I don't think that will ever happen.  Magit has many contributors, and
>   > many of them hasn't completed the paperwork.
>
> Talking with them about this is not impossible.  It just takes work.

Magit itself has 315 contributors of which approximately 70-90 have
significant contributions by my estimate.  There are certainly a few
that have already signed the CA, but there are plenty that have done so
either a long while ago and would not be difficult to contact.  And
with this many people there are always plenty who are disinterested or
actively hostile towards assigning their copyright, which is always an
unpleasant situation.

It might not be "impossible" in the literal sense of the word, but that
doesn't make it much easier either.

> Would someone like to volunteer to work on this?

Re: Magit

[Eli Zaretskii]

> From: Philip Kaludercic <philipk@posteo.net>
> Cc: Akib Azmain Turja <akib@disroot.org>,  emacs-devel@gnu.org
> Date: Mon, 05 Sep 2022 09:04:23 +0000
> 
> Richard Stallman <rms@gnu.org> writes:
> 
> >   > I don't think that will ever happen.  Magit has many contributors, and
> >   > many of them hasn't completed the paperwork.
> >
> > Talking with them about this is not impossible.  It just takes work.
> 
> Magit itself has 315 contributors of which approximately 70-90 have
> significant contributions by my estimate.  There are certainly a few
> that have already signed the CA, but there are plenty that have done so
> either a long while ago and would not be difficult to contact.  And
> with this many people there are always plenty who are disinterested or
> actively hostile towards assigning their copyright, which is always an
> unpleasant situation.
> 
> It might not be "impossible" in the literal sense of the word, but that
> doesn't make it much easier either.

AFAIK, the job of getting this done, however formidable, was already
under way.  Jonas described its progress on several occasions.

Re: Magit

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > of which approximately 70-90 have
  > significant contributions by my estimate.

It's a substantial job, but not enormous.  We can do it.
Could we have a few volunteers to divide up the job?

Then we need to find out from Jonas Bernoulli the status
of contacting those people -- who we need to contact.



-- 
Dr Richard Stallman (https://stallman.org)
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: Magit

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > > What arrangements did we make to update the version of Magit in NonGNU
  > > ELPA?  Are those arrangements being carried out?

  > As is the default for NonGNU ELPA, the Magit repository is automatically
  > synchronised and mirrored.  Whenever the version tag in the package
  > header is bumped, a new version is released.

That's normally a good way -- but then I wonder, how was it that a
user found a significant difference between the behavior of the Magit
in NonGNU ELPA and the one on another repo?

-- 
Dr Richard Stallman (https://stallman.org)
Chief GNUisance of the GNU Project (https://gnu.org)
Founder, Free Software Foundation (https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: Magit

[Phil Sainty]

On 2022-09-07 14:19, Richard Stallman wrote:
>   > As is the default for NonGNU ELPA, the Magit repository is 
> automatically
>   > synchronised and mirrored.  Whenever the version tag in the package
>   > header is bumped, a new version is released.
> 
> That's normally a good way -- but then I wonder, how was it that a
> user found a significant difference between the behavior of the Magit
> in NonGNU ELPA and the one on another repo?

That user would most likely have installed Magit from the MELPA
archive, which tracks the unstable development of every package
-- each time MELPA sees a change to a source repository, it builds
a new release of that package.

GNU ELPA and NonGNU ELPA, conversely, provide new releases only
when they observe that the package maintainer updated the version
string -- commits made between those version updates do not result
in a new release.

(Which of these two approaches provides the "best" version of
any given package at any given time might vary, of course.)


-Phil

Re: Magit

[Stefan Monnier]

> That's normally a good way -- but then I wonder, how was it that a
> user found a significant difference between the behavior of the Magit
> in NonGNU ELPA and the one on another repo?

You'll first have to ask him to see if what he saw has anything to do
with what he claimed or if it was some random other effect.


        Stefan

Re: Magit

[Akib Azmain Turja]

[-- Attachment #1: Type: text/plain, Size: 635 bytes --]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> That's normally a good way -- but then I wonder, how was it that a
>> user found a significant difference between the behavior of the Magit
>> in NonGNU ELPA and the one on another repo?
>
> You'll first have to ask him to see if what he saw has anything to do
> with what he claimed or if it was some random other effect.
>
>
>         Stefan
>
>

It works now!

-- 
Akib Azmain Turja

Find me on Mastodon at @akib@hostux.social.

This message is signed by me with my GnuPG key.  Its fingerprint is:

    7001 8CE5 819F 17A3 BBA6  66AF E74F 0EFA 922A E7F5

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]