emacs and git...

Hi,

I guess it's a dumb...

I know that some of you work within emacs. I tried to use git iniside a emacs shell (M-x shell) and had a weid behaviour:

$ git diff
WARNING: terminal is not fully functional
-  (press RETURN)

"Francis Moreau" <francis.moro@gmail.com> writes:

DVC has an embryo of a git mode (development not active at the moment).

  http://download.gna.org/dvc/

There's also a git.el which I didn't try yet.

Francis> Hi, Francis> I guess it's a dumb...

Francis> I know that some of you work within emacs. I tried to use git iniside Francis> a emacs shell (M-x shell) and had a weid behaviour:

Francis> $ git diff Francis> WARNING: terminal is not fully functional Francis> - (press RETURN) Francis> diff --git a/.lde/bin/cmd-version b/.lde/bin/cmd-version.[m Francis> index a6ce3f8..687112d 100755.[m Francis> --- a/.lde/bin/cmd-version.[m Francis> +++ b/.lde/bin/cmd-version.[m Francis> @@ -54,7 +54,7 @@ gdb_version () {.[m Francis> [snip]

Francis> I'm not using diff color option.

Francis> Can anybody shed some light ?

I use M-x shell on a regular basis, and have learned to add the following three items to my .emacs wherever I'm at:

  (setenv "PAGER" "/bin/cat")
  (setenv "EDITOR" "/opt/emacs/bin/emacsclient") ; `which emacsclient`
  (server-start)

Unless you do the first line, programs that like to push things through "less" or "more" do some pretty nasty things. And those last two are nice, because you can use "git-commit" directly in the shell window, and it'll pop up an emacs buffer. Read up on emacs-server mode or you won't know how to get out of it though. :)

I use M-x term instead of shell mode to interact with git. That works fine for me.

C-c C-j and C-c C-k switches between line and character mode so the
regular emacs control sequences are not sent directly to the term
session.
 
-Bernt

On 3/22/07, Bernt Hansen <bernt@norang.ca> wrote:

yes that works for me too but I'm wondering why it doesn't for shell mode...

thanks

On 3/22/07, Randal L. Schwartz <merlyn@stonehenge.com> wrote:

the funny thing is that the following command in emacs' shell actually do nothing.

$ PAGE=cat git diff HEAD^ $

yep I already do that.

Francis> $ PAGE=cat git diff HEAD^

PAGE?  or PAGER?

On 3/23/07, Randal L. Schwartz <merlyn@stonehenge.com> wrote:

PAGER

But I actually know it doesn't print anything, because I put 'HEAD' instead of 'HEAD^', sorry for the wrong alert.

Can't git make 'cat' the default pager when run on a dumb terminal ?

thanks

"Francis Moreau" <francis.moro@gmail.com> writes:

IIRC, `more` works on a dumb terminal.

But using PAGER=cat is a longstanding and widely used trick among Emacs old timers, predating the EDITOR=emacsclient, which is even nicer. I would highly recommend it. These two environment variables make running *everything* in compilation mode (or shell buffer) so much nicer than otherwise.

On 3/23/07, Junio C Hamano <junkio@cox.net> wrote:

yes it does although the behaviour is a bit weird. Not all screen is used.

I think I'm going to give a try PAGER=more and EDITOR=emacsclient config with shell buffer and see if it can fit well my git usage.

I tried to use term mode but it's pretty annoying to switch between 'line' and 'char' mode all the time.

BTW Junio, just out of curiosity, do you use shell or term mode ?

"Francis Moreau" <francis.moro@gmail.com> writes:

Neither. Almost all of my external command session inside Emacs is done in compilation mode. I even bind "C-x c" to "compile".

On 3/23/07, Junio C Hamano <junkio@cox.net> wrote:

hm do you also run all git commands in this mode ??

"Francis Moreau" <francis.moro@gmail.com> writes:

Which ones do you specifically have in mind to have trouble with?

On 3/24/07, Junio C Hamano <junkio@cox.net> wrote:

well none in peculiar (since I now use PAGER=more), I'm just suprised you're using compilation mode for all your commands.

thanks

On 3/23/07, Junio C Hamano <junkio@cox.net> wrote:

BTW why not making 'more' the default on a dumb term instead of 'less' ?

"Francis Moreau" <francis.moro@gmail.com> writes:

Isn't that so 80'ish?

On 3/24/07, Junio C Hamano <junkio@cox.net> wrote:

It simply avoids this kind of output when running `git-diff` from shell mode for example:

+
+Basic bisect commands: start, bad, good
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The way you use it is:
 
 ------------------------------------------------
 $ git bisect start
-$ git bisect bad                       # Current version is bad
-$ git bisect good v2.6.13-rc2          # v2.6.13-rc2 was the last version
-                                       # tested that was good
+$ git bisect bad                 # Current version is bad
+$ git bisect good v2.6.13-rc2    # v2.6.13-rc2 was the last version
+                                 # tested that was good
 ------------------------------------------------
 
-When you give at least one bad and one good versions, it will
-bisect the revision tree and say something like:
+When you give at least one bad and one good versions, it will bisect
+the revision tree and say something like: