Thu, 21 Jul 2011 14:04:57 -0500 revset: allow bypassing alias expansion
Matt Mackall <mpm@selenic.com> [Thu, 21 Jul 2011 14:04:57 -0500] rev 14900
revset: allow bypassing alias expansion For internal usage of revset queries, we don't want aliases breaking things.
Tue, 19 Jul 2011 17:51:45 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 19 Jul 2011 17:51:45 -0500] rev 14899
merge with stable
Tue, 19 Jul 2011 13:43:53 -0500 subrepo: don't commit in subrepo if it's clean stable
Kevin Bullock <kbullock@ringworld.org> [Tue, 19 Jul 2011 13:43:53 -0500] rev 14898
subrepo: don't commit in subrepo if it's clean If a subrepo has changed relative to the outer repo's substate, but the subrepo itself is clean, we don't need to commit in the subrepo.
Mon, 18 Jul 2011 22:58:21 +0200 rebase: block collapse with keepbranches on multiple named branches (issue2112) stable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Mon, 18 Jul 2011 22:58:21 +0200] rev 14897
rebase: block collapse with keepbranches on multiple named branches (issue2112) Collapse and keepbranches should be blocked when there is more than one named branch on the branch that's going to be rebased.
Tue, 19 Jul 2011 14:19:04 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 19 Jul 2011 14:19:04 -0500] rev 14896
merge with stable
Sun, 17 Jul 2011 00:36:43 +0200 hbisect: do not assume that min(good) is an ancestor of min(bad)
Alexander Krauss <krauss@in.tum.de> [Sun, 17 Jul 2011 00:36:43 +0200] rev 14895
hbisect: do not assume that min(good) is an ancestor of min(bad) The included test used to report "inconsistent state", which is incorrect. While this situation cannot occur when the user sticks to the suggested bisect sequence. However, adding more consistent good/bad information to the bisect state should be tolerated as well.
Sun, 17 Jul 2011 00:35:31 +0200 hbisect: more consistent variable name
Alexander Krauss <krauss@in.tum.de> [Sun, 17 Jul 2011 00:35:31 +0200] rev 14894
hbisect: more consistent variable name
Sat, 16 Jul 2011 12:22:40 +0200 hbisect: confine loop to the relevant interval
Alexander Krauss <krauss@in.tum.de> [Sat, 16 Jul 2011 12:22:40 +0200] rev 14893
hbisect: confine loop to the relevant interval In this context we know that ancestors[rev] == None for all rev <= goodrev, so looping further back is unnecessary (and confusing).
Sat, 16 Jul 2011 15:24:28 +0300 win32: assign winstdout to sys.__stdout__ as well (issue2888) stable
Idan Kamara <idankk86@gmail.com> [Sat, 16 Jul 2011 15:24:28 +0300] rev 14892
win32: assign winstdout to sys.__stdout__ as well (issue2888) On Windows sys.stdout was being replaced with winstdout, which caused util.system() to redirect its output (due to 406b6d7bdcb9). That causes interactive tools (such as vim) to stop working.
Mon, 18 Jul 2011 14:57:22 -0500 alias: note interaction of shell aliases with early opts in help
Matt Mackall <mpm@selenic.com> [Mon, 18 Jul 2011 14:57:22 -0500] rev 14891
alias: note interaction of shell aliases with early opts in help
Mon, 18 Jul 2011 14:53:52 -0500 alias: fix up test results
Matt Mackall <mpm@selenic.com> [Mon, 18 Jul 2011 14:53:52 -0500] rev 14890
alias: fix up test results
Sat, 09 Jul 2011 19:06:59 +0300 hooks: redirect stdout/err/in to the ui descriptors when calling python hooks stable
Idan Kamara <idankk86@gmail.com> [Sat, 09 Jul 2011 19:06:59 +0300] rev 14889
hooks: redirect stdout/err/in to the ui descriptors when calling python hooks We need to make sure that python hooks I/O goes through the ui descriptors so it doesn't mess the command server protocol.
Fri, 15 Jul 2011 18:03:37 -0500 alias: pass local ui to shell alias
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 18:03:37 -0500] rev 14888
alias: pass local ui to shell alias This avoids an additional config read
Fri, 15 Jul 2011 16:06:54 -0500 aliases: drop cwd manipulation
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 16:06:54 -0500] rev 14887
aliases: drop cwd manipulation Already done in _dispatch
Fri, 15 Jul 2011 16:06:53 -0500 dispatch: move shell alias handling after early arg handling
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 16:06:53 -0500] rev 14886
dispatch: move shell alias handling after early arg handling --cwd, --repo, and --config obviously should be handled first
Fri, 15 Jul 2011 14:27:16 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 14:27:16 -0500] rev 14885
merge with stable
Fri, 15 Jul 2011 20:07:19 +0200 rebase: reset bookmarks (issue2265 and issue2873) stable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Fri, 15 Jul 2011 20:07:19 +0200] rev 14884
rebase: reset bookmarks (issue2265 and issue2873)
Fri, 15 Jul 2011 12:56:58 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 12:56:58 -0500] rev 14883
merge with stable
Thu, 14 Jul 2011 11:46:15 +0300 cmdserver: take repo.baseui as our ui stable
Idan Kamara <idankk86@gmail.com> [Thu, 14 Jul 2011 11:46:15 +0300] rev 14882
cmdserver: take repo.baseui as our ui The ui passed to server() is really repo.ui, that is it contains its local configuration as well. When running commands that use a different repo than the servers cached repo, we don't want to use that ui as the baseui for the new repo.
Fri, 15 Jul 2011 10:18:24 +0200 web: Output a correct date in short format (issue2902) stable
Benoit Allard <benoit@aeteurope.nl> [Fri, 15 Jul 2011 10:18:24 +0200] rev 14881
web: Output a correct date in short format (issue2902)
Fri, 15 Jul 2011 16:28:09 +0300 test-commandserver: explicitly close opened file stable
Idan Kamara <idankk86@gmail.com> [Fri, 15 Jul 2011 16:28:09 +0300] rev 14880
test-commandserver: explicitly close opened file
Thu, 14 Jul 2011 12:39:39 -0500 verify: fix mq misfire
Matt Mackall <mpm@selenic.com> [Thu, 14 Jul 2011 12:39:39 -0500] rev 14879
verify: fix mq misfire
Wed, 13 Jul 2011 19:30:27 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:30:27 -0500] rev 14878
merge with stable
Wed, 13 Jul 2011 19:30:09 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:30:09 -0500] rev 14877
merge with i18n
Tue, 05 Jul 2011 17:54:36 -0300 i18n-pt_BR: synchronized with 35f5cfdd0427 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 05 Jul 2011 17:54:36 -0300] rev 14876
i18n-pt_BR: synchronized with 35f5cfdd0427
Wed, 13 Jul 2011 19:27:56 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:27:56 -0500] rev 14875
merge with stable
Wed, 13 Jul 2011 16:43:18 -0500 commit: suppress spurious new head message for duplicate commit (issue2893)
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 16:43:18 -0500] rev 14874
commit: suppress spurious new head message for duplicate commit (issue2893)
Wed, 13 Jul 2011 16:58:51 -0500 osutil: emulate os.listdir's OSError for long names (issue2898)
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 16:58:51 -0500] rev 14873
osutil: emulate os.listdir's OSError for long names (issue2898)
(0) -10000 -3000 -1000 -300 -100 -50 -28 +28 +50 +100 +300 +1000 +3000 +10000 +30000 tip