Matt Mackall <mpm@selenic.com> [Sat, 23 Jul 2011 14:33:35 -0500] rev 14925
templater: use a global funcs table
Simon Heimberg <simohe@besonet.ch> [Sat, 23 Jul 2011 06:09:14 +0200] rev 14924
ui: config path relative to repo root
Simon Heimberg <simohe@besonet.ch> [Sat, 23 Jul 2011 06:08:52 +0200] rev 14923
ui: providing no default value to configpath should not raise an Error
Simon Heimberg <simohe@besonet.ch> [Sat, 23 Jul 2011 06:08:49 +0200] rev 14922
ui: fix error, base can not be a list
Matt Mackall <mpm@selenic.com> [Sat, 23 Jul 2011 11:52:25 -0500] rev 14921
merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 22 Jul 2011 20:31:15 -0300] rev 14920
test-i18n, i18n-pt_BR: updated test message changed in 41c3a71c318d
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 22 Jul 2011 20:27:40 -0300] rev 14919
i18n-pt_BR: synchronized with a934b9249574
Matt Mackall <mpm@selenic.com> [Fri, 22 Jul 2011 17:17:23 -0500] rev 14918
merge with stable
Augie Fackler <durin42@gmail.com> [Thu, 21 Jul 2011 15:56:15 -0500] rev 14917
rebase: remove trailing whitespace found by check-code
Lee Cantey <lcantey@gmail.com> [Fri, 22 Jul 2011 08:03:47 -0700] rev 14916
hooks: use python 2.4 compatible exception handling
Matt Mackall <mpm@selenic.com> [Fri, 22 Jul 2011 17:11:35 -0500] rev 14915
url: handle urls of the form file:///c:/foo/bar/ correctly
David Golub <davidg@fogcreek.com> [Thu, 21 Jul 2011 16:02:34 -0400] rev 14914
dispatch: avoid double backslashes in error message
The use of %r in the format string caused Python to display Windows paths with
double backslashes.
Angel Ezquerra <angel.ezquerra@gmail.com> [Thu, 21 Jul 2011 15:10:16 +0200] rev 14913
hgweb: add a "web/logoimg" setting to customize the web logo image
This change complements the existing web/logourl setting, and lets the user
customize the logo image that is shown on many of the hg server pages.
If this setting is not set, hglogo.png is used.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 21 Jul 2011 11:05:26 +0200] rev 14912
util: move windows and posix wildcard imports to begin of file
Adrian Buehlmann <adrian@cadifra.com> [Fri, 22 Jul 2011 10:35:05 +0200] rev 14911
util: move "default" hidewindow to posix.py
There is a hidewindow in win32.py, which we get via windows.py
Adrian Buehlmann <adrian@cadifra.com> [Fri, 22 Jul 2011 10:31:56 +0200] rev 14910
util: move "default" lookupreg to posix.py
There is a lookupreg in win32.py, which we get via windows.py
Adrian Buehlmann <adrian@cadifra.com> [Fri, 22 Jul 2011 09:55:46 +0200] rev 14909
util: move "default" unlinkpath to posix.py
we have a unlinkpath in windows.py
Adrian Buehlmann <adrian@cadifra.com> [Fri, 22 Jul 2011 09:53:15 +0200] rev 14908
util: move "default" makedir to posix.py
makedir is already defined in win32.py, which gets imported into util.py
via windows.py if we are running on Windows
Augie Fackler <durin42@gmail.com> [Thu, 21 Jul 2011 15:52:08 -0500] rev 14907
summary: allow color to highlight active bookmark
Augie Fackler <durin42@gmail.com> [Mon, 18 Jul 2011 07:53:26 -0500] rev 14906
summary: show bookmarks separate from tags and note active mark (issue2892)
Andrew Pritchard <andrewp@fogcreek.com> [Wed, 20 Jul 2011 18:23:06 -0400] rev 14905
localrepo: make requirements attribute of newly-created repos contain a set
This is for internal consistency, as this attribute typically contains a set
Matt Mackall <mpm@selenic.com> [Fri, 22 Jul 2011 16:46:22 -0500] rev 14904
localrepo: fix comment on set
Matt Mackall <mpm@selenic.com> [Thu, 21 Jul 2011 15:39:37 -0500] rev 14903
revert: restore check for uncommitted merge (issue2915) (BC)
This will restore the pre-1.9 behavior.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jul 2011 14:06:55 -0500] rev 14902
localrepo: add set method to iterate over a given revset
This should allow replacing a number of hand-rolled graph algorithms.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jul 2011 14:05:45 -0500] rev 14901
revset: add formatspec convenience query builder
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.
Matt Mackall <mpm@selenic.com> [Tue, 19 Jul 2011 17:51:45 -0500] rev 14899
merge with 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.
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.
Matt Mackall <mpm@selenic.com> [Tue, 19 Jul 2011 14:19:04 -0500] rev 14896
merge with stable
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.
Alexander Krauss <krauss@in.tum.de> [Sun, 17 Jul 2011 00:35:31 +0200] rev 14894
hbisect: more consistent variable name
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).
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.
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
Matt Mackall <mpm@selenic.com> [Mon, 18 Jul 2011 14:53:52 -0500] rev 14890
alias: fix up test results
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.
Steve Borho <steve@borho.org> [Fri, 08 Jul 2011 20:24:19 -0500] rev 14861
scmutil: add missing import of re
see https://bitbucket.org/tortoisehg/thg/issue/929
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:36:34 -0500] rev 14860
dispatch: fix checking of rpath in _getlocal
This avoids an extra config read
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:36:22 -0500] rev 14859
ui: rename _is_trusted to _trusted
is and do are pointless, underbar separators are style violations
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:27:03 -0500] rev 14858
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:22:36 -0500] rev 14857
eol: fix silly test-gendoc breakage by escaping control characters
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 12:13:07 +0200] rev 14856
eol: document new eol.fix-trailing-newline setting
Stepan Koltsov <stepancheg@yandex-team.ru> [Fri, 01 Jul 2011 23:12:52 +0400] rev 14855
eol: fix missing trailing newlines in comitted files
Some text editors (Eclipse, for example) do not add trailing newlines,
so diffs often contain annoying "\ No newline at the end of file".
This patch to eol extension simply adds trailing newline on commit.
Stepan Koltsov <stepancheg@yandex-team.ru> [Fri, 01 Jul 2011 22:53:58 +0400] rev 14854
eol: eol.only-consistent can now be specified in .hgeol
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 10:34:19 +0200] rev 14853
merge with stable
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 10:19:37 +0200] rev 14852
commands: use mergetoolopts when a command supports --tool
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 12:35:03 -0500] rev 14851
revsets: actually catch type error on tip^p1(tip) (issue2884)
The previous commit was empty.
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.
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.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 19:25:56 -0500] rev 14848
bookmarks: simplify warning code
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.
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.
Augie Fackler <durin42@gmail.com> [Thu, 02 Jun 2011 14:33:01 -0500] rev 14836
progress: remove superfluous parens
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.
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2011 14:30:53 -0500] rev 14834
merge with 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.
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.
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.
Idan Kamara <idankk86@gmail.com> [Mon, 04 Jul 2011 14:36:16 +0300] rev 14830
fileset: fix typo in binary() doc
Arne Babenhauserheide <bab@draketo.de> [Fri, 01 Jul 2011 22:50:36 +0200] rev 14829
help: fileset foo.lst was named files.lst
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:59:09 -0500] rev 14828
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:54:27 -0500] rev 14827
Added signature for changeset de9eb6b1da4f
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:54:25 -0500] rev 14826
Added tag 1.9 for changeset de9eb6b1da4f
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).
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.
Matt Mackall <mpm@selenic.com> [Thu, 30 Jun 2011 19:34:09 -0500] rev 14823
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Jun 2011 16:36:38 +0200] rev 14822
run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Jun 2011 16:25:05 +0200] rev 14821
run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate()
Eli Carter <eli.carter@tektronix.com> [Thu, 30 Jun 2011 13:22:12 -0500] rev 14820
subrepo: correct revision in svn checkout
A Subversion subrepo checkout uses a url and --revision which does not do the
correct thing when specifying a revision of a branch that has since been
deleted and recreated. The checkout needs to specify the revision as URL@REV
instead.
Steve Borho <steve@borho.org> [Thu, 30 Jun 2011 12:55:19 -0500] rev 14819
wix: catch up with more added files
revsets: 1.7::tip and adds("mercurial/help/**")
1.7::tip and adds("mercurial/templates/**")
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 30 Jun 2011 20:37:32 -0300] rev 14818
i18n-pt_BR: translate template filter descriptions
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 30 Jun 2011 20:05:23 -0300] rev 14817
i18n-ja: recover template translations from 15200b46165b
These translations were removed by 68a697421a57 because the original
strings were transfered to the docstrings (264f292a0c6f) without
the corresponding sources being added to the Makefile for extraction.
Alexander Sauta <demosito@gmail.com> [Fri, 01 Jul 2011 00:26:45 +0400] rev 14816
i18n-ru: fixed mixed up msgid and msgstr in annotate
Alexander Sauta <demosito@gmail.com> [Fri, 01 Jul 2011 00:14:30 +0400] rev 14815
i18n-ru: translated missing strings for commands, some typos corrected
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 29 Jun 2011 18:19:17 -0300] rev 14814
i18n-pt_BR: synchronized with 9adce4b38ed1