[PATCH 1 of 2] rebase: improve error and debug messages

[timeless]

On Tue, Oct 13, 2009 at 12:18 PM, Sune Foldager <cryo at cyanite.org> wrote:
>>> +            raise util.Abort(_('source is ancestor of destination'))

> Sure, but it seems to go a bit against the trend in Mercurial error messages, which tend
> to be concise and not use a lot of 'the', 'of the' and such. I am not against more verbose
> responses


> (although 'rebase' is probably better than 'move').

oh yeah.

> But what's wrong with the current message?
> Source matches the argument (--source),
> and ancestor should be clear enough, I think.

well, to get technical... "ancestor" should be "an ancestor" otherwise
it implies <the only ancestor>

beyond that... dunno, to me, the thing wasn't grockable.

>
>>>         if commonbase == repo[dest]:
>>> -            raise util.Abort(_('cannot rebase a descendant'))
>>> +            raise util.Abort(_('source is descendant of destination'))
>
>> I don't get this.
>
> Due to rebase using the merge logic to do its work, rebasing 'backwards' is not possible.

Abort("source and destination can't be linearly related") ?

> Yeah, I suppose that could be done :-).

:)