Commit Graph

12528 Commits

Author SHA1 Message Date
Brodie Rao
7362459729 cleanup: use x in (a, b) instead of x == a or x == b 2010-09-23 00:02:31 -05:00
Martin Geisler
b4116c95c0 merge with stable 2010-09-23 10:59:21 +02:00
Mads Kiilerich
82136a3aba merge with stable 2010-09-23 01:59:02 +02:00
Matt Mackall
b05cd46be9 merge with stable 2010-09-22 18:29:41 -05:00
Matt Mackall
430e769c2b tests: various fixes for new unified test pattern format 2010-09-22 18:20:47 -05:00
Brodie Rao
b5fe0d906e tests: add glob matching for unified tests
This adds a " (glob)" marker that works like a simpler version of
(re): "*" is converted to ".*", and "?" is converted to ".".

Both special characters can be escaped using "\", and the backslash
itself can be escaped as well.

Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't
supported.
2010-09-22 16:06:02 -05:00
Brodie Rao
7d7d96bd74 tests: require regexes in unified tests to be marked with " (re)"
Consider this test:

  $ hg glog --template '{rev}:{node|short} "{desc}"\n'
  @  2:20c4f79fd7ac "3"
  |
  | o  1:38f24201dcab "2"
  |/
  o  0:2a18120dc1c9 "1"

Because each line beginning with "|" can be compiled as a regular
expression (equivalent to ".*|"), they will match any output.

Similarly:

  $ echo foo


The blank output line can be compiled as a regular expression and will
also match any output.

With this patch, none of the above output lines will be matched as
regular expressions. A line must end in " (re)" in order to be matched
as one.

Lines are still matched literally first, so the following will pass:

  $ echo 'foo (re)'
  foo (re)
2010-09-22 16:06:00 -05:00
Brodie Rao
548fb65104 tests: ensure regexes match to the end of the string
Regular expressions in the test suite are currently written assuming
that you need a trailing ".*" to avoid matching to the end.

Instead of matching regular expressions using "^pattern", this patch
makes matching more restrictive by matching "^pattern$".
2010-09-22 16:05:59 -05:00
Brodie Rao
94cd8c2067 tests: don't match blank output lines as regexes in unified tests
Currently, the following unified test will pass:

  $ echo foo


A blank output line (a line containing just two spaces) will match any
output.

The patch modifies the unified test runner to ignore empty strings
strings when do regular expression matching.
2010-09-22 16:05:59 -05:00
Brodie Rao
3ed54dfa3d tests: improve regexes in unified tests 2010-09-22 16:05:58 -05:00
Martin Roppelt
d6cfcf4082 i18n-de: deleted outdated messages with msgattrib, allowed language header 2010-09-22 13:34:40 +02:00
Christoph
0f7b88c9c4 merge 2010-09-22 16:32:02 +02:00
Martin Roppelt
aec5d99ad4 i18n-de: delete language duplicate, update last-translator 2010-09-22 09:45:14 +02:00
Martin Roppelt
fcd70a7d1a i18n-de: fix formatting 2010-09-22 09:40:11 +02:00
Martin Roppelt
7031d11ca4 merge stable into default 2010-09-22 09:22:42 +02:00
Martin Roppelt
e8a836c004 i18n-de: fix broken translations, 66 defuzzied, 14 new translations 2010-09-22 08:54:00 +02:00
Christoph Mewes
43d264a873 i18n-de: keyword extension 2010-09-22 04:32:55 +02:00
Christoph Mewes
2552c7fb16 i18n-de: interhg extension 2010-09-22 01:04:43 +02:00
Christoph Mewes
440a75cfe6 i18n-de: more inotify 2010-09-22 01:04:25 +02:00
Christoph
69addb2c52 l10n: sig, glog, cia, hgk, highlight, inotify, interhg
New status: 1851 messages complete with 302 fuzzies and 745 untranslated.

Transmitted-via: Transifex (www.transifex.net).
2010-09-21 23:05:28 +00:00
Dan Villiom Podlaski Christiansen
9c75aee050 templater: add hex filter. 2010-09-22 00:14:57 +02:00
Patrick Mezard
aebd1a7052 context: fix filectx.undelete() (issue2388) 2010-09-21 23:14:58 +02:00
Dan Villiom Podlaski Christiansen
9c066c24dc tests: unify test-convert-svn-* 2010-09-21 18:40:33 +02:00
Martin Roppelt
2687d0a6b8 i18n-de: update pot 2010-09-21 15:45:51 +02:00
Wagner Bruna
a8cea544fe merge with i18n 2010-09-21 01:55:53 -03:00
Wagner Bruna
854d34137e i18n-pt_BR: synchronized with 673d7f4ad253 2010-09-21 01:51:56 -03:00
Christoph
914a5c15c4 l10n: churn, color, convert and eol extension done
New status: 1793 messages complete with 306 fuzzies and 799 untranslated.

Transmitted-via: Transifex (www.transifex.net).
2010-09-21 00:25:25 +00:00
Matt Mackall
25cfe14ed3 tests: fix hgweb template change 2010-09-20 17:01:12 -05:00
Matt Mackall
add9355590 tests: fix hgweb template change 2010-09-20 17:01:12 -05:00
Matt Mackall
6b5c5e35ef merge with stable 2010-09-20 16:56:57 -05:00
Matt Mackall
f764dbce14 merge with crew 2010-09-20 16:56:44 -05:00
Matt Mackall
fc9b3fe966 revsets: reduce cost of outgoing in the optimizer 2010-09-20 16:40:36 -05:00
Patrick Mezard
614db673f4 Merge with stable 2010-09-20 22:29:13 +02: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
Patrick Mezard
979ccf4590 Use lexists() instead of exists() where appropriate 2010-09-20 21:46:56 +02:00
Patrick Mezard
0988572cc6 convert/svn: fix broken symlink renames in svn sink 2010-09-20 21:46:39 +02:00
Patrick Mezard
e043450e1d rename: do not overwrite existing broken symlinks 2010-09-20 21:46:39 +02:00
Patrick Mezard
21f3e10fb9 patch: do not overwrite broken untracked symlinks 2010-09-20 21:42:11 +02:00
Patrick Mezard
2d21e62e9b patch: fix target when patching broken symlinks (issue2368) 2010-09-20 21:42:11 +02:00
Martin Geisler
34af0cf109 subrepo: add support for 'hg archive' 2010-09-20 15:46:17 +02:00
Martin Geisler
37b2820a98 subrepo: introduce files and filedata methods for subrepo classes 2010-09-20 15:44:30 +02:00
Martin Geisler
989dda555a merge with stable 2010-09-20 15:42:58 +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
Dan Villiom Podlaski Christiansen
4a1790f181 mq: fix the deprecation comment for qsave & qrestore.
Changeset 1e63d4dee4f6 deprecated qsave and qrestore. In the
deprecating comment, users were referred to 'rebase --mq' which -- at
the time the message was written -- didn't exist. Currently, on the
default branch, rebase *does* take a '--mq' option, but it probably
doesn't do what Dirkjan expected it to do when he wrote the message.

In the original, deprecating commit, little context was provided as to
why this change was made. Based on my recollection, concensus at the
Paris Sprint in February 2010 was that one of the problems with MQ was
that it exposed far too many commands. Notable among these were qsave
& qrestore: very few core developers understood what they did and even
fewer (none, IIRC) actually used them. However, they couldn't be
removed; not only do the usual backwards compatibility reasons apply,
but the hg book refers to them.
2010-09-20 13:31:02 +02:00
Martin Geisler
0e7bc2c419 i18n-da: synchronized with 44c602721bf8 2010-09-18 22:03:33 +02:00
Christoph
1854711fde l10n: primarily added separate translations for template markers
New status: 1583 messages complete with 423 fuzzies and 892 untranslated.

Transmitted-via: Transifex (www.transifex.net).
2010-09-18 09:07:57 +00:00
Christoph
7adba08c6b l10n: based on a fresh pot file
New status: 1459 messages complete with 435 fuzzies and 1004 untranslated.

Transmitted-via: Transifex (www.transifex.net).
2010-09-18 01:16:31 +00:00
Steve Borho
d990f5561b Merge with stable 2010-09-17 12:45:13 -05:00
Steve Borho
3e9e61ae68 test-eol-update: record new results as correct
Changeset 63043d17c14b changed the result of this test. The 'hg update 0'
command, which causes a merge of modified a.txt, now leaves a.txt in the
EOLN format specified by .hgeol as it was committed in revision 0.

Previously, it used the .hgeol contents from the working directory before the
update.
2010-09-17 12:44:35 -05:00