git mergetool again

git mergetool again

[Andrea Crotti]

I really have to solve this before I go completely insane :D
It's more a problem of git but could make life easier to many emacs
user, so I think it's not offtopic.

Anyway I like emerge and it would be nice to use it to solve conflicts
with git.
Now the default configuration for me is really bad, because it opens a
new emacs, loads the WHOLE configuration and in short doesn't work at
all!

So I read again the doc and ended up with something like
--8<---------------cut here---------------start------------->8---
[mergetool "mymerge"]
	cmd = 'exec /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -e \"(ediff-files (getenv \"LOCAL\") (getenv \"MERGED\") (getenv \"REMOTE\"))\"'
[merge]
	tool = mymerge
--8<---------------cut here---------------end--------------->8---

after trying all possible easier solutions.

but now way it doesn't work.
I just need to fire up the editor with ediff-files on those three files,
which at the call moment are part of the environment (I think).

Not sure I need the getenv but the thing is that I have no way to get
the f***** actual command used by git for emerge.

I tried all possible magic combinations with git config, but no way it
doesn't spit it out..
Any help is welcome :)
Thanks

Re: git mergetool again

[Andrea Crotti]

Andrea Crotti <andrea.crotti.0@gmail.com> writes:

> I really have to solve this before I go completely insane :D
> It's more a problem of git but could make life easier to many emacs
> user, so I think it's not offtopic.
>
> Anyway I like emerge and it would be nice to use it to solve conflicts
> with git.
> Now the default configuration for me is really bad, because it opens a
> new emacs, loads the WHOLE configuration and in short doesn't work at
> all!
>
> So I read again the doc and ended up with something like
> [mergetool "mymerge"]
> 	cmd = 'exec /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -e \"(ediff-files (getenv \"LOCAL\") (getenv \"MERGED\") (getenv \"REMOTE\"))\"'
> [merge]
> 	tool = mymerge
>
> after trying all possible easier solutions.
>
> but now way it doesn't work.
> I just need to fire up the editor with ediff-files on those three files,
> which at the call moment are part of the environment (I think).
>
> Not sure I need the getenv but the thing is that I have no way to get
> the f***** actual command used by git for emerge.
>
> I tried all possible magic combinations with git config, but no way it
> doesn't spit it out..
> Any help is welcome :)
> Thanks

I didn't in the easiest place, what process is started by git, and here
the command (I added the -Q)

--8<---------------cut here---------------start------------->8---
cmd =Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $MERGED $REMOTE
--8<---------------cut here---------------end--------------->8---

it's already much better, but I would like to use emacsclient instead,
still not working there though :(

Re: git mergetool again

[Andrea Crotti]

Andrea Crotti <andrea.crotti.0@gmail.com> writes:

>
> I didn't in the easiest place, what process is started by git, and here
> the command (I added the -Q)
>
> cmd =Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $MERGED $REMOTE
>
> it's already much better, but I would like to use emacsclient instead,
> still not working there though :(

Sorry wrong command
--8<---------------cut here---------------start------------->8---
 cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED
--8<---------------cut here---------------end--------------->8---

Hope it's useful for someone else that wants emerge as the merge tool..

Re: git mergetool again

[Andrea Crotti]

Andrea Crotti <andrea.crotti.0@gmail.com> writes:
> Sorry wrong command
>  cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED
>
> Hope it's useful for someone else that wants emerge as the merge tool..

I don't get what's wrong with this line
--8<---------------cut here---------------start------------->8---
cmd = /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -c -e '(emerge-files-with-ancestor-command (getenv "LOCAL") (getenv "MERGED") (getenv "REMOTE"))'
--8<---------------cut here---------------end--------------->8---

instead of 
        # cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED

should not that be the same thing?
But I always get that "local" is a void variable...

Re: git mergetool again

[David Kastrup]

Andrea Crotti <andrea.crotti.0@gmail.com> writes:

> Andrea Crotti <andrea.crotti.0@gmail.com> writes:
>> Sorry wrong command
>>  cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED
>>
>> Hope it's useful for someone else that wants emerge as the merge tool..
>
> I don't get what's wrong with this line
> cmd = /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -c -e '(emerge-files-with-ancestor-command (getenv "LOCAL") (getenv "MERGED") (getenv "REMOTE"))'
>
> instead of 
>         # cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED
>
> should not that be the same thing?

Huh?  Why should it?  emerge-files-with-ancestor-command does not take
arguments.

-- 
David Kastrup

Re: git mergetool again

[jpkotta]

On Aug 17, 10:11 am, David Kastrup <d...@gnu.org> wrote:
> Andrea Crotti <andrea.crott...@gmail.com> writes:
> > Andrea Crotti <andrea.crott...@gmail.com> writes:
> >> Sorry wrong command
> >>  cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED
>
> >> Hope it's useful for someone else that wants emerge as the merge tool..
>
> > I don't get what's wrong with this line
> > cmd = /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -c -e '(emerge-files-with-ancestor-command (getenv "LOCAL") (getenv "MERGED") (getenv "REMOTE"))'
>
> > instead of
> >         # cmd = Emacs -Q -f emerge-files-with-ancestor-command $LOCAL $REMOTE $MERGED
>
> > should not that be the same thing?
>
> Huh?  Why should it?  emerge-files-with-ancestor-command does not take
> arguments.
>
> --
> David Kastrup

I use Mercurial, but the merge tool config is basically the same.  See
http://mercurial.selenic.com/wiki/MergingWithEmacs for some
solutions.  I used to use the script there, now I use what would be
the equivalent of 'emacs --eval "(ediff-merge-with-ancestor \"$local\"
\"$other\" \"$base\" nil \"$output\")"'

Re: git mergetool again

[David Kastrup]

Andrea Crotti <andrea.crotti.0@gmail.com> writes:

> I really have to solve this before I go completely insane :D
> It's more a problem of git but could make life easier to many emacs
> user, so I think it's not offtopic.
>
> Anyway I like emerge and it would be nice to use it to solve conflicts
> with git.
> Now the default configuration for me is really bad, because it opens a
> new emacs, loads the WHOLE configuration and in short doesn't work at
> all!
>
> So I read again the doc and ended up with something like
> [mergetool "mymerge"]
> 	cmd = 'exec /Applications/Emacs.app/Contents/MacOS/bin/emacsclient -e \"(ediff-files (getenv \"LOCAL\") (getenv \"MERGED\") (getenv \"REMOTE\"))\"'
> [merge]
> 	tool = mymerge
>
> after trying all possible easier solutions.
>
> but now way it doesn't work.
> I just need to fire up the editor with ediff-files on those three files,
> which at the call moment are part of the environment (I think).

ediff-files is not emerge.  If you want to use ediff, don't use a
mergetool.  Instead just use
M-x smerge-ediff RET
on the unmerged file with the conflict markers.

-- 
David Kastrup