bookmarks: drop superfluous strip

bookmarks: add a warning for non empty malformed line

bookmarks: more robust parsing of bookmarks file

merge with stable

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.