[PATCH] merge: report all files in _checkunknown

Matt Mackall mpm at selenic.com
Thu Jan 12 14:57:31 CST 2012


On Wed, 2012-01-11 at 16:00 -0500, Jordi Gutiérrez Hermoso wrote:
> # HG changeset patch
> # User Jordi Gutiérrez Hermoso <jordigh at octave.org>
> # Date 1326315222 18000
> # Node ID 9fe70ec6cb418daa14fed5f09f94c4f482d4d052
> # Parent  c47d69ce5208d5b5cfd2fb2f0f1d7a2b4795fbf5
> merge: report all files in _checkunknown

First, this is two patches at a minimum: extending the abort object,
then using that new facility.

Second, I'm definitely not happy with extending the abort object. I'd
rather have a loop of ui.warn("oh no: %s" % f) followed by a raise
util.Abort("bad stuff") than try to stuff an arbitrarily large amount of
info into an exception object.

Third, this is still a band-aid: the whole checkunknown thing is a hack
that we should be working on eliminating, not extending. So I'm only
going to accept minimal changes to support this, definitely not anything
that has wider repercussions outside this function.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list