Re: [StGit PATCH] Add mergetool support to the classic StGit infrastructure

From: Karl Hasselström <kha@treskal.com>
Date: Feb 11, 2009, 09:25 UTC
Message-ID: <20090211092513.GD26136@diana.vm.bytemark.co.uk>
In-Reply-To: <20090210141413.28782.19243.stgit@pc1117.cambridge.arm.com>

On 2009-02-10 14:14:17 +0000, Catalin Marinas wrote:

Show 5 quoted lines

> Since Git already has a tool for interactively solving conflicts
> which is highly customisable, there is no need to duplicate this
> feature via the i3merge and i2merge configuration options. The
> user-visible change is that now mergetool is invoked rather than the
> previously customised interactive merging tool.

Very good.

Show 5 quoted lines

> +def mergetool(self, files = []):
> +    """Invoke 'git mergetool' to resolve any outstanding conflicts."""
> +    err = os.system('git mergetool %s' % ' '.join(files))
> +    if err:
> +        raise GitException('"git mergetool" failed, exit code: %d' % err)

Again, what happens if "files" is not given?

Show 7 quoted lines

> @@ -754,7 +758,6 @@ def resolved(filenames, reset = None):
>               '--stdin', '-z').input_nulterm(filenames).no_output()
>      GRun('update-index', '--add', '--').xargs(filenames)
>      for filename in filenames:
> -        gitmergeonefile.clean_up(filename)
>          # update the access and modificatied times
>          os.utime(filename, None)

Hmm, what does this line do, and why isn't it needed anymore? I don't know this part of StGit, I'm just curious ...

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle