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.
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
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 16:06:54 -0500] rev 14887
aliases: drop cwd manipulation
Already done in _dispatch
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
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 14:27:16 -0500] rev 14885
merge with stable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Fri, 15 Jul 2011 20:07:19 +0200] rev 14884
rebase: reset bookmarks (issue2265 and issue2873)
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 12:56:58 -0500] rev 14883
merge with 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.
Benoit Allard <benoit@aeteurope.nl> [Fri, 15 Jul 2011 10:18:24 +0200] rev 14881
web: Output a correct date in short format (issue2902)
Idan Kamara <idankk86@gmail.com> [Fri, 15 Jul 2011 16:28:09 +0300] rev 14880
test-commandserver: explicitly close opened file
Matt Mackall <mpm@selenic.com> [Thu, 14 Jul 2011 12:39:39 -0500] rev 14879
verify: fix mq misfire
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:30:27 -0500] rev 14878
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:30:09 -0500] rev 14877
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 05 Jul 2011 17:54:36 -0300] rev 14876
i18n-pt_BR: synchronized with 35f5cfdd0427
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:27:56 -0500] rev 14875
merge with stable
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)
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)
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 16:28:46 -0500] rev 14872
verify: filter messages about missing null manifests (issue2900)
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:24:54 -0500] rev 14871
merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 17:41:49 -0500] rev 14870
subrepo: use working copy of .hgsub to filter status (issue2901)
Patrick Mezard <pmezard@gmail.com> [Wed, 13 Jul 2011 19:23:33 +0200] rev 14869
notify: remove unused url() method
Patrick Mezard <pmezard@gmail.com> [Wed, 13 Jul 2011 19:23:12 +0200] rev 14868
test-notify-changegroup: test notifications on unbundle
Patrick Mezard <pmezard@gmail.com> [Wed, 13 Jul 2011 19:23:08 +0200] rev 14867
run-tests: fix summary when accepting changes interactively
Accepted changes were not counted as success.
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 16:29:28 -0500] rev 14866
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 16:28:46 -0500] rev 14865
verify: filter messages about missing null manifests (issue2900)
Idan Kamara <idankk86@gmail.com> [Mon, 11 Jul 2011 17:49:45 +0300] rev 14864
cmdserver: restore old working dir after dispatch when we have --cwd
Idan Kamara <idankk86@gmail.com> [Mon, 11 Jul 2011 17:46:55 +0300] rev 14863
dispatch: don't use request repo if we have --cwd
Nicholas Riley <njriley@illinois.edu> [Tue, 12 Jul 2011 12:06:11 -0400] rev 14862
eol: ignore IOError from deleted files in commitctx
A Mercurial repo signals a file is deleted by raising IOError when the
file's data is requested. This IOError is normally caught by
localrepository.commitctx. With the eol extension enabled and EOL
mappings in place, the eolrepo subclass should ignore IOError because
a deleted file has no line endings to process.
This issue exhibited itself when performing an incremental hg convert
of a revision with deleted files to a repo with an existing .hgeol
file.