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

From: Karl Hasselström <kha@treskal.com>
Date: Mar 13, 2009, 02:02 UTC
Message-ID: <20090313020243.GB15393@diana.vm.bytemark.co.uk>
In-Reply-To: <20090312120902.2992.25192.stgit@pc1117.cambridge.arm.com>

On 2009-03-12 12:09:02 +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.

I agree wholeheartedly with the idea. Just one issue:

Show 8 quoted lines

> +def mergetool(files = ()):
> +    """Invoke 'git mergetool' to resolve any outstanding conflicts. If 'not
> +    files', all the files in an unmerged state will be processed."""
> +    err = os.system('git mergetool %s' % ' '.join(files))
> +    # check for unmerged entries (prepend 'CONFLICT ' for consistency with
> +    # merge_recursive())
> +    conflicts = ['CONFLICT ' + f for f in get_conflicts()]
> +    if conflicts:

Mmm, os.system()? That'll break things as soon as we have a file name with a space in it. I'm pretty sure there's something in stgit.run that you could use.

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