Commit Graph

12898 Commits

Author SHA1 Message Date
Erik Zielke
b55d97e2ae gendoc: refactor get_cmd
Refactors the get_cmd to take the table as argument, instad
of just referencing the global table, thereby enabling reuse
for extension command tables.
2010-10-18 14:37:52 +02:00
Erik Zielke
69888281fd mq: switched to `` around * * *
So it can be parsed by rst.
2010-10-18 14:37:50 +02:00
Adrian Buehlmann
b9ef72891e Revert: capitalization doc fix 2010-10-17 00:45:34 +02:00
Mads Kiilerich
fd086af9b7 subrepo: abort instead of pushing/pulling to the repo itself
_abssource will now abort (or return None) in the rare cases where no push/pull
path can be found.
2010-10-19 03:56:20 +02:00
Mads Kiilerich
9c4dc8c331 subrepo: rename relpath to subrelpath and introduce reporelpath 2010-10-19 03:55:28 +02:00
Mads Kiilerich
35ef3c1409 mdiff: carriage return (\r) is also ignorable whitespace 2010-10-19 03:55:06 +02:00
Steve Borho
e484985865 merge: add --tool argument to merge and resolve
These arguments are shorthand for --config ui.merge, but they also
override HGMERGE if it is found in the user's environment.
2010-10-15 23:00:45 -05:00
timeless
73617c6e5a patchbomb: move command option help from the extension (patchbomb) to the command (email) 2010-10-17 14:00:01 +03:00
Steve Losh
0224e99d28 alias: fail gracefully when invalid global options are given (issue2442)
This patch modifies the check for shell aliases to prevent crashing when an invalid
global option is given.

When an invalid global option is given the check will simply return and let the
normal error handling for this case happen.
2010-10-17 13:24:37 -04:00
Paul Molodowitch
d3b62a0e94 bookmarks: better fix for issue2016 (lookup infinite recursion)
af2e49ed3c19 partially reverted by Patrick Mézard <pmezard@gmail.com>
2010-10-07 13:44:17 -07:00
Brodie Rao
c97e40185c convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411)
This is a followup to dd4fb29994d3, which only fixed the conversion of
patches with UTF-8 metadata.

This patch allows a changelog to have any bytes with values
0x7F-0xFF. It parses the XML changelog as Latin-1 and uses
converter_source.recode() to decode the data as UTF-8/Latin-1.

Caveats:

- Since the convert extension doesn't provide any way to specify the
  source encoding, users are still limited to UTF-8 and Latin-1.

- etree will still complain if the changelog has bytes with values
  0x00-0x19. XML only allows printable characters.
2010-10-01 10:15:04 -05:00
Adrian Buehlmann
5fa66b2722 revset: fix #branch in urls for outgoing()
hg log -r 'outgoing(..)' ignored #branch in some cases.
This patch fixes it.

The cases where it misbehaved are now covered by the added
test-revset-outgoing.t
2010-10-05 11:34:13 +02:00
Matt Mackall
83637cabbd Added signature for changeset 199deecb201c 2010-10-01 10:18:57 -05:00
Matt Mackall
a5a188925c merge with i18n 2010-10-01 10:16:52 -05:00
Wagner Bruna
8b77291f33 i18n-pt_BR: synchronized with c61f444c3b61 2010-10-01 11:15:19 -03:00
Wagner Bruna
4574e64882 merge with i18n stable 2010-10-01 11:15:10 -03:00
Martin Geisler
08e5ff349e url: mark certificate error string for translation 2010-10-01 16:08:46 +02:00
FUJIWARA Katsunori
4b59fae0fc i18n-ja: synchronized with f4065dd08ede 2010-10-01 17:24:18 +09:00
Matt Mackall
2f08720257 merge with i18n 2010-09-30 19:09:58 -05:00
Mads Kiilerich
04a1302ca7 test-doctest: test the modules that contains doctests 2010-10-01 00:48:51 +02:00
Mads Kiilerich
665d2722d8 doc: clarify that https cert verification requires web.cacerts 2010-10-01 00:48:50 +02:00
Mads Kiilerich
916b2a0e20 url: verify correctness of https server certificates (issue2407)
Pythons SSL module verifies that certificates received for HTTPS are valid
according to the specified cacerts, but it doesn't verify that the certificate
is for the host we connect to.

We now explicitly verify that the commonName in the received certificate
matches the requested hostname and is valid for the time being.

This is a minimal patch where we try to fail to the safe side, but we do still
rely on Python's SSL functionality and do not try to implement the standards
fully and correctly. CRLs and subjectAltName are not handled and proxies
haven't been considered.

This change might break connections to some sites if cacerts is specified and
the certificates (by our definition) isn't correct. The workaround is to
disable cacerts which in most cases isn't much worse than it was before with
cacerts.
2010-10-01 00:46:59 +02:00
Wagner Bruna
677dd9e389 i18n-pt_BR: synchronized with 5612a9d71c56 2010-09-30 14:07:57 -03:00
Patrick Mezard
a8f024ef25 patch: test and document a bit binary to regular file upgrade 2010-09-28 00:41:08 +02:00
Patrick Mezard
a9686ec545 patch: upgrade to git patch when removing binary file
Otherwise it may cause data loss when removing binary files in mq with
--git=auto.
2010-09-28 00:41:07 +02:00
Patrick Mezard
5468157807 patch: fix rename text to binary file (issue2400) 2010-09-27 22:47:10 +02:00
Matt Mackall
ab716e0166 merge with iin 2010-09-27 10:48:21 -05:00
Wagner Bruna
075446028b i18n-pt_BR: update to new Portuguese ortography 2010-09-25 22:53:31 -03:00
Wagner Bruna
3ca87d4d14 i18n-pt_BR: minor rewording 2010-09-25 22:53:27 -03:00
Wagner Bruna
a0f99df980 i18n-pt_BR: assorted typo fixes 2010-09-25 22:53:21 -03:00
Wagner Bruna
a79dd2c6ef i18n-pt_BR: synchronized with 55aa9de513df 2010-09-24 19:47:00 -03:00
Wagner Bruna
edd561ea42 merge with i18n stable 2010-09-24 19:26:01 -03:00
Mads Kiilerich
d6040e08e1 test-gendoc: mute gendoc stderr
Solaris had problems with zh_CN and warned "couldn't set locale correctly" on
stderr. We don't care.
2010-09-24 02:57:15 +02:00
Mads Kiilerich
8e2068d8b4 test-mq-symlinks: fix symlink handling on solaris
It seems like ln -s gets confused if an existing symlink is dangling:
$ rm -f a b; ln -s a b; ln -sf b b
ln: cannot create b: File exists

We now rely on rm instead of on ln -sf.
2010-09-24 02:52:12 +02:00
Mads Kiilerich
5f130ba1ac test-archive: fix touch datestamps
Backport ac3a256cdaf4 and cd415c06acaf to stable.
2010-09-24 02:49:09 +02:00
Patrick Mezard
42663f256e convert/darcs: improve unsupported format detection (issue2172) 2010-09-24 00:04:07 +02:00
Patrick Mezard
bc1ff8ebda bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016)
_bookmarks is loaded lazily and calls super.lookup(). Unfortunately, branch and
tags caches initializations also recurse in lookup() and end up trying to
access _bookmarks again. Massive confusion ensues.

I considered fixing all branches and tags cache loading to avoid recursing in
lookup() but it would add complexity to otherwise working code provided lookups
are performed on nodes or revnums.
2010-09-24 00:03:58 +02:00
Alexandre Fayolle
55241e7f70 Fix memory leak when using hg commands over http repositories
When using hg commands over an http repository in a long running process, a
httphandler instance is leaked for each command, because of a loop
handler.parent -> OpenerDirector and OpenerDirector.handlers -> handler which
is not handled by Python's gc. Discussion on #mercurial concluded that removing
the __del__ method solved the problem.
2010-09-23 11:41:27 +02:00
Brodie Rao
20c102ca36 grep: only catch re.error when compiling regular expressions 2010-09-22 19:15:27 -05:00
Anthony Foiani
5a82d7f2a7 doc: clarify smtp.password usage 2010-09-23 00:27:04 -06:00
Mads Kiilerich
48773bdeed log: include unmodified-in-merge files in log diff/stat (issue2383)
f02da4369319 assumed that walkchangerevs called prep with all relevant matched
filenames, but actually it only contains the names of files changed in the
relevant changeset. That meant that log diff/stat of merges missed the diff for
files only changed in the other branch.

This is a minimal fix for making sure we only use fns when we are following and
thus will have problems with merges anyway ...
2010-09-23 01:23:16 +02:00
Mads Kiilerich
b0f0118486 tests: fix unzip -l variability fix
01-01-1980 slipped through the grep.
2010-09-23 01:51:17 +02:00
Matt Mackall
0e166af1f9 tests: fix unzip -l variability 2010-09-22 17:13:49 -05:00
Patrick Mezard
23ced90ea0 mq: always require --force when pushing patches (issue2363)
--force was not necessary when passing --rev since cb494d252290, but this
behaviour is usually harmful when branch names are passed instead of explicit
revisions.
2010-09-22 23:51:10 +02:00
Patrick Mezard
aebd1a7052 context: fix filectx.undelete() (issue2388) 2010-09-21 23:14:58 +02:00
Wagner Bruna
854d34137e i18n-pt_BR: synchronized with 673d7f4ad253 2010-09-21 01:51:56 -03:00
Matt Mackall
25cfe14ed3 tests: fix hgweb template change 2010-09-20 17:01:12 -05:00
Ry4an Brase
87ae742f5e Correct Content-Type header values for archive downloads.
The content type for both .tar.gz and .tar.bz2 downloads was
application/x-tar, which is correct for .tar files when no
Content-Encoding is present, but is not correct for .tar.gz and .tar.bz2
files unless Content-Encoding is set to gzip or x-bzip2, respectively.

However, setting Content-Encoding causes browsers to undo that encoding
during download, when a .gz or .bz2 file is usually the desired
artifact.  Omitting the Content-Encoding header is preferred to avoid
having browsers uncompress non-render-able files.

Additionally, the Content-Disposition line indicates a final desired
filename with .tar.gz or .tar.bz2 extension which makes providing a
Content-Encoding header inappropriate.

With the current configuration browsers (Chrome and Firefox thus far)
are registering the application/x-tar Content-Type and not .tar
extension and appending that extension, yielding filename.tar.gz.tar as
a final on-disk artifact.  This was originally reported here:
http://stackoverflow.com/questions/3753659

I've changed the .tar.gz and .tar.bz2 Content-Type values to
application/x-gzip and application/x-bzip2, respectively.  Which yields
correctly named download artifacts on Firefox, Chrome, and IE.
2010-09-20 14:56:08 -05:00
Erik Zielke
0c1276bb2d mq: removed -m from qpush help (Issue2401)
The -m option became deprecated in changeset 1e63d4dee4f6,
but the option still appeared in the help line for the qpush
command
2010-09-27 09:19:48 +02:00
Ryan Phillips
505aacc190 hgweb: be consistent with the background highlighting on closed branches (Issue2386)
The coal and paper web themes will highlight closed branches as a visual cue to
the user. This patch makes the other two themes constistent.

For users with difficulty differentiating colors, it would be better to split
out closed branches to a new table or optionally hide them.
2010-09-19 21:20:38 -05:00