[PATCH stable] update: shorten abort message for updating across branches when unclean

Nicolas Dumazet nicdumz at gmail.com
Mon Nov 30 01:35:45 CST 2009


2009/11/30 Stuart W Marks <smarks at smarks.org>:
> -                raise util.Abort(_("crosses branches (use 'hg merge' to merge "
> -                                 "or use 'hg update -C' to discard changes)"))
> +                raise util.Abort(_("can't cross branches when there are "
> +                                   "uncommitted changes"))

Mmm. I agree that messages should not wrap lines.
But do we want to remove the extra information? Why not simply
inserting a linefeed:
    abort: crosses branches
    (use 'hg merge' to merge or use 'hg update -C' to discard changes)
?

>             elif onode is None:
>                 raise util.Abort(_("crosses branches (use 'hg merge' or use "
>                                    "'hg update -c')"))

Why is this message not specifying "'hg merge' [to merge] or use 'hg
update -c' [to check]"?
Maybe we should be consistent here, pick one format and use the same
verbosity in both messages.


Anyway, if you change the messages you also need to update the
docstring of update() which specifies the messages to expect.

-- 
Nicolas Dumazet — NicDumZ


More information about the Mercurial-devel mailing list