Commit Graph

10523 Commits

Author SHA1 Message Date
Martin Geisler
46bbcdcea6 config: raise ConfigError on non-existing include files
Before, an %include directive for a non-existing file resulted in an
IOError and a traceback.
2009-12-12 16:46:16 +01:00
Dirkjan Ochtman
0513f13503 cmdutil: copy auth section in remoteui
This allows me to specify an auth section in a .hg/hgrc instead of just
a global or user-level hgrc.
2009-12-10 12:31:21 +01:00
Sune Foldager
0bec7f7de3 patchbomb: fix bug introduced in a6a075e49b19 and add test
Thanks to Augie Fackler for reporting this.
2009-12-08 23:23:59 +01:00
Sune Foldager
d262a88c75 patchbomb: handle repository#rev URLs correctly 2009-12-06 23:22:17 +01:00
Steve Borho
e46cd0e296 setup: ignore 'not importing' warnings during version detection
Python will issue an ImportWarning when seeing 'import locale' if
there is a locale/ directory present without a __init__.py file.

The warning is silent by default, but it somehow shows up anyway on
Windows when setup.py executed hg. The warning causes runcmd to panic
since it sees output on stderr.

This patch ignores warnings on stderr about not importing a package.
2009-12-05 14:18:31 -06:00
Christian Ebert
dd907fdefb keyword: go into restricted mode when transplanting
Expanded keyword is read into diff with transplant -b otherwise.
Test this scenario.

Thanks to Adam Berkes for providing an example case.
2009-12-23 12:04:17 +00:00
Christian Ebert
cbc3638bed keyword: do not monkeypatch diff when in restricted mode
kw_diff actually disabled restricted mode when 2 revisions were given,
because it effectively disables the extension in this case.

But the commands working with diff and patch need restricted mode
always enabled, i.e. expansion enabled when writing to the
working directory and - crucial for these commands - no expansion
when reading the filelog.
2009-12-23 12:04:04 +00:00
timeless
7f202fbf9b mq: qnew -f should reject merge working directories 2009-12-23 13:09:11 +01:00
Martin Geisler
70de345b15 hgext: enable extensions without "hgext." prefix in help texts 2009-12-22 00:50:03 +01:00
Sune Foldager
0d1feca701 handle file URIs correctly, according to RFC 2396 (issue1153)
The new code aims to implement the RFC correctly for file URIs.
Previously they were handled incorrectly in several ways, which
could cause problem on Windows in particular.
2009-12-03 11:06:55 +01:00
Sune Foldager
1a664ccf10 transplant: fix small bug when a patch fails while using --filter 2009-12-03 11:06:44 +01:00
Nicolas Dumazet
686db2d57f alias: do not crash when aliased command has no usage help text 2009-12-03 14:14:44 +09:00
Fabian Kreutz
a7bf3f1ac6 hgk: do not ignore ---/+++ lines in diff 2009-12-02 14:30:39 +02:00
Matt Mackall
2b10a4fa69 Added signature for changeset f943507d2ee7 2009-12-01 19:30:49 -06:00
Matt Mackall
07d8da7a2f share: fix interaction with clone 2009-12-01 19:28:15 -06:00
Matt Mackall
2ceeec453f Merge with i18n 2009-12-01 14:36:47 -06:00
Martin Geisler
9ed5d931c7 i18n: hand-transplant change in f01ee3ad1c34 2009-12-01 00:47:25 +01:00
Martin Geisler
b076a1e802 doc/Makefile: ensure C locale
The man pages can actually be translated by building them in a
different locale. However, the man pages contain internal links to
certain sections, and when the section titles are translated, the
links change too. So it is currently not recommended to build the man
pages in anything by the "C" locale.
2009-12-01 00:43:21 +01:00
Martin Geisler
542da45c3a commands: mark "ssh://" as inline literals in help texts 2009-12-01 00:15:45 +01:00
Martin Geisler
faafb1f7f3 schemes: fixed typos in module docstring 2009-11-30 23:12:51 +01:00
Wagner Bruna
3ec67ac49a i18n-pt_BR: added strings from crew 0960065f6682 2009-11-30 12:36:24 -02:00
Christian Ebert
418943dab0 keyword: the CVS keyword is $RCSfile$, not $RCSFile$
http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords

Fix default keyword map accordingly.
Keep $RCSFile$ for Mercurial backwards compatibility.
2009-11-26 10:51:17 +01:00
Martin Geisler
efe88f2ec3 keyword: sort demo output to ensure deterministic output 2009-11-26 20:50:16 +01:00
Martin Geisler
5ad36f40d3 extdiff: prevent exception on double-translation
The docstring is translated twice: once when used as a format string,
and once on display. The second translation fails when the first
translation introduces non-ASCII characters in the string.

The problem is that the gettext module calls unicode(message) on the
string, i.e., it decodes it to a Unicode string using the ASCII
encoding (the default encoding). By translating it into a Unicode
string here, the unicode() call becomes a noop.
2009-11-26 20:06:45 +01:00
Matt Mackall
de8a538d3a Merge stable heads 2009-11-25 21:54:18 -06:00
Matt Mackall
442b2ca92d Merge with crew 2009-11-24 10:23:53 -06:00
Wagner Bruna
8fc5f3b74f run-tests: LANGUAGE may make tests fail 2009-11-24 13:55:13 -02:00
Alexander Solovyov
57c962c64c schemes extension 2009-11-24 17:48:23 +02:00
Sune Foldager
2368eabe27 extdiff: respect --option in command aliases (issue949) 2009-11-30 19:37:38 +01:00
Sune Foldager
9318efef10 fix bug in prepush logic involving merge changesets
When creating new branches and merging them into existing ones, you would
sometimes be able to push some changesets (the existing branches) without using
--force, even when that creates a new head on the remote.

A test which triggers the error has been added.
2009-11-30 14:58:52 +01:00
timeless@mozdev.org
15e268f188 commands: add missing options in command line help 2009-11-28 23:44:18 +01:00
Martin Geisler
7fb918d179 commands: mark strings for translation 2009-11-28 23:23:16 +01:00
Benoit Boissinot
61f5eea9d1 run-tests: always set $COLUMNS, fix running tests under emacs shell
fix tests failure reported by Neal Becker.
2009-11-23 22:45:36 +01:00
Pascal Quantin
ba9e9478b8 Add help files to win32 installer (issue 1919) 2009-11-23 22:08:59 +01:00
Wagner Bruna
28a3c0d951 i18n-pt_BR: synchronized with f2439d70a733 2009-11-23 15:15:01 -02:00
Thomas Arendsen Hein
51b9419544 Do not overwrite motd attribute of hgwebdir instances on refresh.
This allows using
application = hgwebdir(...)
application.motd = (string or object with __str__ method)
in WSGI (like it is possible in CGI).

Changed web.motd in the config file is still read with this, because
hgwebdir.templater.motd() does not store the config value.
2009-11-22 11:25:01 +01:00
timeless@mozdev.org
4cd821593d commands: Try to improve help options text for basic commands
Mostly rewrite -r text
2009-11-20 14:37:36 +02:00
Martin Geisler
4817fcfe96 check-code.py: make help strings consistent 2010-02-07 10:58:51 +01:00
Mads Kiilerich
289637cadf check-code.py: escape backslash 2010-02-07 01:52:10 +01:00
Augie Fackler
03f43e09ea qnew: ignore force option
This makes the default behavior the same as qnew --force, and
deprecates the force option.
2010-02-07 07:37:05 -06:00
Dirkjan Ochtman
a0b7a8db3f strip apostrophes from an error messages 2010-02-07 15:09:02 +01:00
Dirkjan Ochtman
d5c4ebd0b0 mq: fix typo, thanks pmezard 2010-02-07 14:53:17 +01:00
Dirkjan Ochtman
0e0764f0be commands: annotate follows by default, separate -f/--file option 2010-02-07 14:51:52 +01:00
Patrick Mezard
1ce5274987 Merge with crew-stable 2010-02-07 14:43:21 +01:00
Sune Foldager
5020620fca interpret repo#name url syntax as branch instead of revision
Previously, the name part of an repo#name url was interpreted as a
revision, similar to using the --rev option. Now it is instead looked
up as a branch first, and if that succeeds all the heads of the branch
will be processed instead of just its tip-most head. If the branch
lookup fails, it will be assumed to be an revision as before (e.g. for
tags).
2010-02-07 14:29:07 +01:00
Brodie Rao
91c6eab10f dispatch: provide help for disabled extensions and commands
Before a command is declared unknown, each extension in hgext is searched,
starting with hgext.<cmdname>. If there's a matching command, a help message
suggests the appropriate extension and how to enable it.

Every extension could potentially be imported, but for cases like rebase,
relink, etc. only one extension is imported.

For the case of "hg help disabledext", if the extension is in hgext, the
extension description is read and a similar help suggestion is printed.
No extension import occurs.
2010-02-07 14:01:43 +01:00
Brodie Rao
b0f0c580fa extensions: refactor disabled() 2010-02-07 11:32:08 +01:00
Dirkjan Ochtman
e11a173bf9 mq: don't warn on qpush against a branch head 2010-02-07 14:06:05 +01:00
Dirkjan Ochtman
38666f1574 mq: deprecate qinit and qcommit 2010-02-07 13:49:52 +01:00
Dirkjan Ochtman
7144a20940 mq: deprecate qsave, qrestore and related options 2010-02-07 12:34:02 +01:00