Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 19:25:56 -0500] rev 14847
bookmarks: drop superfluous strip
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 05 Jul 2011 10:20:27 +0200] rev 14846
bookmarks: add a warning for non empty malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 05 Jul 2011 10:13:54 +0200] rev 14845
bookmarks: more robust parsing of bookmarks file
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 19:25:53 -0500] rev 14844
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 13:43:29 -0500] rev 14843
revsets: catch type error on tip^p1(tip) (issue2884)
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 13:37:50 -0500] rev 14842
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.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 06 Jul 2011 18:28:42 +0900] rev 14841
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.
Idan Kamara <idankk86@gmail.com> [Tue, 05 Jul 2011 14:36:33 +0300] rev 14840
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.
Idan Kamara <idankk86@gmail.com> [Tue, 05 Jul 2011 14:28:55 +0300] rev 14839
peer: change arg name to convey it can be a repo as well
Augie Fackler <durin42@gmail.com> [Thu, 23 Jun 2011 15:00:45 -0500] rev 14838
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.