revsets: catch type error on tip^p1(tip) (
issue2884)
revsets: do the right thing with x^:y (
issue2884)
Given an operator ^ that's either postfix or infix and an operator :
that's either prefix or infix, the parser can't figure out the right
thing to do. So we rewrite the expression to be sensible in the optimizer.
win32mbcs: wrap two more functions to be wrapped.
util.checkwinfilename() and util.checkosfilename() are wrapped.
The former, used by scmutil, is not friendly for Shift_JIS bytes.
The latter is an dynamic alias of checkwinfilename() used by other
modules.
commands, merge: call setconfig on the right ui
In practice this doesn't change anything since ui == repo.ui here, but setting
repo.ui explicitly here is clearer since hg.merge will use repo.ui later on.
progress: add a changedelay to prevent parallel topics from flapping (
issue2698)
When combined with the earlier change to make the progress object
truly a singleton, this prevents the progress bar swapping on 'hg
clone --pull' on a local filesystem.
Thanks to timeless for lots of debugging help at the Copenhagen sprint
to isolate the root cause of this and a first draft an idea that would
fix it.
progress: make progress bar a singleton to avoid double-progress ui bugs
This helps
issue2698 a little, but isn't a complete fix, since
generators still can produce some weird progress bar switching.
keyword: reuse already present working contexts for match
Shortens overlong line as side-effect.