Commit Graph

12655 Commits

Author SHA1 Message Date
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
Brodie Rao
04db466f58 revset: handle re.compile() errors in grep()
Raise error.ParseError instead of allowing re.error to bubble up.
2010-09-17 10:21:02 -05:00
Martin Geisler
4152cae060 archive: set date to 1980 for very old zip files
The zip file format stores the date using "MS-DOS format" which
apparently means that they use 1980 as their epoch. Python's zipfile
module emits deprecation warnings of this form

  /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: struct
  integer overflow masking is deprecated
    self.fp.write(zinfo.FileHeader())
  /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: 'H' format
  requires 0 <= number <= 65535
    self.fp.write(zinfo.FileHeader())
  /home/mg/src/mercurial-crew/mercurial/archival.py:169:
  DeprecationWarning: struct integer overflow masking is deprecated
    self.z.close()
  /home/mg/src/mercurial-crew/mercurial/archival.py:169:
  DeprecationWarning: 'H' format requires 0 <= number <= 65535
    self.z.close()

when it is given such old timestamps. This fixes this by silently
clamping the date to 1980.
2010-09-20 15:33:39 +02:00
Matt Mackall
08439e0f2d tests: add exit codes to unified tests 2010-09-16 17:51:32 -05:00
Matt Mackall
6e90a5484a merge with stable 2010-09-16 16:12:26 -05:00
Matt Mackall
44786dde5f merge with crew 2010-09-16 16:05:00 -05:00
Steve Borho
6c61bc3690 eol: setup the repo.ui in reposetup()
This fixes problems some have reported using the eol extension
together with TortoiseHg.  It ensures the ui associated with the
repository has the preupdate.eol hook configured.
2010-09-15 17:46:51 -05:00
Matt Mackall
920b3bfd15 merge with i18n 2010-09-14 16:20:34 -05:00
Sune Foldager
cd1204adbe color: add win32 support for non-black background
This complicates the code a bit, since attributes need to be masked together
correctly before they are applied. Perhaps the code should be redesigned at
some point, but this works well for now.
2010-09-13 16:12:25 +02:00
Brodie Rao
4be7b3bfc3 merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
2010-09-12 18:05:53 -05:00
Peter Arrenbrecht
1aec67382d transplant: maintain list of transplants in dict 2010-09-16 16:00:29 +02:00
Adrian Buehlmann
3cc83c1b44 tests: unify test-hgignore 2010-09-15 22:18:46 +02:00
Pascal Quantin
8779a2558c win32: update build instructions with correct CRT version
As stated in http://msdn.microsoft.com/en-us/library/cc664727.aspx, when you
compile an application with MSVC 2008 SP1 it is bound by default to the
original CRT version (9.0.21022.8). This is the case for Python 2.6 up to 3.1.
If the wrong CRT version is embedded in the Inno Setup installer, with a PC
that does not have the MSVC 2008 redistributable package installed, hg will
refuse to launch with an error: "the system cannot execute the specified
program".
2010-09-16 11:36:38 +02:00
Matt Mackall
14e058119e merge with crew 2010-09-16 16:07:22 -05:00
Steve Borho
8230ece29c Merge with stable 2010-09-15 17:48:03 -05:00
Adrian Buehlmann
9b6356a565 tests: unify test-hardlinks-safety 2010-09-15 20:41:14 +02:00
Adrian Buehlmann
e339f22cb2 tests: unify test-extra-filelog-entry 2010-09-15 18:00:09 +02:00
Adrian Buehlmann
8f0c161e55 tests: unify test-extdiff 2010-09-15 16:27:39 +02:00
Sune Foldager
aca3a53bf9 clone: only use stream when we understand the revlog format
This patch fixes issues with stream cloning in the presense of parentdelta,
lwcopy and similar additions that change the interpretation of the revlog
format, or the format itself.

Currently, the stream capability is sent like this:
stream=<version of changelog>

But the client doesn't actually check the version number; also, it only checks
the changelog and it doesn't capture the interpretation-changes and
flag-changes in parentdelta and lwcopy.

This patch removes the 'stream' capability whenever we use a non-basic revlog
format, to prevent old clients from receiving incorrect data. In those cases,
a new capability called 'streamreqs' is added instead. Instead of a revlog
version, it comes with a list of revlog-format relevant requirements, which
are a subset of the repository requirements, excluding things that are not
relevant for stream.

New clients use this to determine whether or not they can stream. Old clients
only look for the 'stream' capability, as always. New servers will still send
this when serving old repositories.
2010-09-15 11:06:22 +02:00
Sune Foldager
867cb5176e localrepo: factor out requirement application and write 2010-09-15 10:44:10 +02:00
Will Maier
8775baf673 tests: add test for bookmark push/pull 2010-09-14 22:26:43 -05:00
Will Maier
0641d40bd9 bookmarks: set VALUE in push/pull 2010-09-14 21:45:43 -05:00
Adrian Buehlmann
5ff414e3b0 tests: unify test-username-newline 2010-09-14 16:52:32 +02:00
Adrian Buehlmann
b6aa039052 tests: unify test-url-rev 2010-09-14 16:42:02 +02:00
Sune Foldager
843894f4b3 tests: remove exec bit from .t files 2010-09-14 16:03:10 +02:00