Sat, 09 Jul 2011 09:44:15 +0200 hgcia: Set default value of strip to -1 (issue2891) stable
Cédric Krier <ced@b2ck.com> [Sat, 09 Jul 2011 09:44:15 +0200] rev 14850
hgcia: Set default value of strip to -1 (issue2891) For backward compatibility the root path of the repository is not displayed unless the user has specified an explicit strip value.
Thu, 07 Jul 2011 10:32:30 +0200 commands: improve help for -y/--noninteractive stable
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 10:32:30 +0200] rev 14849
commands: improve help for -y/--noninteractive Before, the help text said that Mercurial would assume 'yes' for all prompts, but this is confusing since many prompts don't have any 'yes' choice. It now more accurately describes what will happen.
Wed, 06 Jul 2011 19:25:56 -0500 bookmarks: simplify warning code
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 19:25:56 -0500] rev 14848
bookmarks: simplify warning code
Wed, 06 Jul 2011 19:25:56 -0500 bookmarks: drop superfluous strip
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 19:25:56 -0500] rev 14847
bookmarks: drop superfluous strip
Tue, 05 Jul 2011 10:20:27 +0200 bookmarks: add a warning for non empty malformed line
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
Tue, 05 Jul 2011 10:13:54 +0200 bookmarks: more robust parsing of bookmarks file
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
Wed, 06 Jul 2011 19:25:53 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 19:25:53 -0500] rev 14844
merge with stable
Wed, 06 Jul 2011 13:43:29 -0500 revsets: catch type error on tip^p1(tip) (issue2884) 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)
Wed, 06 Jul 2011 13:37:50 -0500 revsets: do the right thing with x^:y (issue2884) stable
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.
Wed, 06 Jul 2011 18:28:42 +0900 win32mbcs: wrap two more functions to be wrapped. stable
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.
Tue, 05 Jul 2011 14:36:33 +0300 commands, merge: call setconfig on the right ui
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.
Tue, 05 Jul 2011 14:28:55 +0300 peer: change arg name to convey it can be a repo as well
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
Thu, 23 Jun 2011 15:00:45 -0500 progress: add a changedelay to prevent parallel topics from flapping (issue2698)
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.
Thu, 23 Jun 2011 14:55:09 -0500 progress: make progress bar a singleton to avoid double-progress ui bugs
Augie Fackler <durin42@gmail.com> [Thu, 23 Jun 2011 14:55:09 -0500] rev 14837
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.
Thu, 02 Jun 2011 14:33:01 -0500 progress: remove superfluous parens
Augie Fackler <durin42@gmail.com> [Thu, 02 Jun 2011 14:33:01 -0500] rev 14836
progress: remove superfluous parens
Sun, 03 Jul 2011 12:58:03 +0200 keyword: reuse already present working contexts for match
Christian Ebert <blacktrash@gmx.net> [Sun, 03 Jul 2011 12:58:03 +0200] rev 14835
keyword: reuse already present working contexts for match Shortens overlong line as side-effect.
Tue, 05 Jul 2011 14:30:53 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2011 14:30:53 -0500] rev 14834
merge with stable
Tue, 05 Jul 2011 14:30:42 -0500 discovery: quiet note about heads stable
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2011 14:30:42 -0500] rev 14833
discovery: quiet note about heads This was changing output on in/out -v for no good reason.
Mon, 04 Jul 2011 19:53:39 -0300 patch: fix parsing patch files containing CRs not followed by LFs stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 04 Jul 2011 19:53:39 -0300] rev 14832
patch: fix parsing patch files containing CRs not followed by LFs Since 1e64e1e12195 , patch lines containing a CR not followed by a LF would be incorrectly splitten, causing a failure to apply the patch.
Tue, 05 Jul 2011 11:53:32 +0100 treediscovery: rename stop() in tests to fix failures on AIX. stable
Jim Hague <jim.hague@acm.org> [Tue, 05 Jul 2011 11:53:32 +0100] rev 14831
treediscovery: rename stop() in tests to fix failures on AIX. It seems ksh, the default shell on AIX, does not permit the creation of a function called stop(). test-treediscovery.t and test-treediscovery-legacy.t both fail on AIX with error 'syntax error at line 25 : `(' unexpected'. Fix by renaming stop() in the scripts to tstop(). For completeness rename start() to tstart() to match. Both tests then pass on AIX. Add check for the use of stop() in a shell script to check-code.
Mon, 04 Jul 2011 14:36:16 +0300 fileset: fix typo in binary() doc stable
Idan Kamara <idankk86@gmail.com> [Mon, 04 Jul 2011 14:36:16 +0300] rev 14830
fileset: fix typo in binary() doc
Fri, 01 Jul 2011 22:50:36 +0200 help: fileset foo.lst was named files.lst stable
Arne Babenhauserheide <bab@draketo.de> [Fri, 01 Jul 2011 22:50:36 +0200] rev 14829
help: fileset foo.lst was named files.lst
Fri, 01 Jul 2011 13:59:09 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:59:09 -0500] rev 14828
merge with stable
Fri, 01 Jul 2011 13:54:27 -0500 Added signature for changeset de9eb6b1da4f stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:54:27 -0500] rev 14827
Added signature for changeset de9eb6b1da4f
Fri, 01 Jul 2011 13:54:25 -0500 Added tag 1.9 for changeset de9eb6b1da4f stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:54:25 -0500] rev 14826
Added tag 1.9 for changeset de9eb6b1da4f
Fri, 01 Jul 2011 17:37:09 +0200 util: rename the util.localpath that uses url to urllocalpath (issue2875) stable 1.9
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Jul 2011 17:37:09 +0200] rev 14825
util: rename the util.localpath that uses url to urllocalpath (issue2875) util is never imported by any other name than util, so this is mostly just a simple search and replace from util.localpath to util.urllocalpath (assuming other uses of util.localpath already has been renamed).
Fri, 01 Jul 2011 18:13:48 +0200 tests: restore previous fix for date ambiguity in cvs test stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Jul 2011 18:13:48 +0200] rev 14824
tests: restore previous fix for date ambiguity in cvs test 017ab404e588 changed some sleeps after cvs update to sleeps before commit. I don't know why that should work, but I have a machine where it doesn't work. Commits regularly fails becuase cvs doesn't notice that a file has been changed. Restoring the previous sleep between the update and the edit makes cvs notice the change.
Thu, 30 Jun 2011 19:34:09 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 30 Jun 2011 19:34:09 -0500] rev 14823
merge with stable
(0) -10000 -3000 -1000 -300 -100 -50 -28 +28 +50 +100 +300 +1000 +3000 +10000 +30000 tip