From: Karl Hasselström <kha@treskal.com>
Date: Tue, 02 Dec 2008 15:43:59 GMT
Subject: Re: [StGit PATCH] Print conflict details with the new infrastructure (bug #11181)
Message-ID: <20081202154359.GB19967@diana.vm.bytemark.co.uk>
In-Reply-To: <20081202144045.24372.69278.stgit@localhost.localdomain>

On 2008-12-02 14:40:45 +0000, Catalin Marinas wrote:

> The patch modifies the IndexAndWorkTree.merge() function to display
> pass the conflict information (files) when raising an exception. The
> logic is similar to the one in the old infrastructure.

Good. But

>          if self.__error:
> -            out.error(self.__error)
> +            error_lines = self.__error.split('\n')
> +            out.error(*error_lines)

this feels like something of a hack. Wouldn't it be cleaner to modify
MergeConflictException to hold e.g. the set of conflicting filenames,
and let it have a method that returned a list of lines? No biggie,
though.

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