Commit Graph

12761 Commits

Author SHA1 Message Date
Wagner Bruna
27ade2b1fe i18n-pt_BR: synchronized with 3b2ccc533643 2010-08-26 22:38:33 -03:00
Wagner Bruna
a9f899105e i18n: merge with stable 2010-08-26 22:27:20 -03:00
Mads Kiilerich
cd19e3668d mercurial.spec: specify file modes for install 2010-08-26 23:11:03 +02:00
Mads Kiilerich
9876c3e7ec simplemerge: remove hash-bang from non-executable script 2010-08-26 22:51:48 +02:00
Matt Mackall
1d137468dc Added signature for changeset 4d3ecabcbab3 2010-08-26 11:00:46 -05:00
Wagner Bruna
e0d3959c2b i18n-pt_BR: synchronized with 7f905de659f7 2010-08-24 11:01:00 -03:00
Wagner Bruna
20ce77ceda i18n: merge with stable 2010-08-24 10:58:12 -03:00
Matt Mackall
7d97cdbd5f tests: fix up bisect test output 2010-08-21 10:44:57 -05:00
Matt Mackall
395274c87f merge: move reverse-merge logic out of filemerge (issue2342) 2010-08-21 10:41:29 -05:00
Martin Geisler
4e658a8344 i18n: merged stable heads 2010-08-21 11:21:49 +02:00
Wagner Bruna
d9dc537dfd i18n-pt_BR: synchronized with 53eb543142a2 2010-08-20 21:22:57 -03:00
Paolo Giarrusso
c3cff04334 i18n-it: finish translating 'hg summary' output 2010-08-21 00:33:13 +02:00
Paolo Giarrusso
7b94db3f28 i18n-it: remove bogus fuzzy translations for revset
The translations were all random fuzzy strings, which can only do harm, so
remove them.

Moreover, given the status of revset (it seems mostly an internal undocumented module, and
to understand it you need the source anyway), I prefer not to translate it for
now.
2010-08-21 00:33:13 +02:00
Paolo Giarrusso
ba37d2e8a7 i18n-it: update fuzzy messages/translate patchbomb 2010-08-21 00:33:13 +02:00
Paolo Giarrusso
5f787cd82c i18n-it: update mq translation
Significant updates were performed - when translating something, I tried to
choose a term and use it consistently everywhere possible, so here I translated
a lot of messages. Additionally, I use the mq extension a lot, and now I am
using the translation, so I will be able to translate it better.
2010-08-21 00:33:13 +02:00
Paolo Giarrusso
2cb388c930 i18n-it: updates after msgmerge on stable branch, 2nd part 2010-08-21 00:33:13 +02:00
Paolo Giarrusso
349519ebf2 i18n-it: general updates fuzzy synopsis texts
This patch follows the fix on the translation of [OPTION]... with other needed
updates on the same class of messages.
2010-08-21 00:33:13 +02:00
Paolo Giarrusso
c6a52a4321 i18n-it: translate [OPTION]..., not [OPTIONS]...: keep the singular
Since [OPTION]... is intended to mean more options, it was translated in Italian
as plural. However the plural is conveyed by `...', so switch to the singular.
This was also useful because for the '-o OPT' extdiff option, I have to
translate `OPT' as a singular.
2010-08-21 00:33:13 +02:00
Paolo Giarrusso
e1ba23c075 i18n-it: readd other lost accented characters
The problem was introduced already in revision 8d217f7d68be by the original
Italian translator, according to logs. This might be due to a bug in the program
he used, "Lokalize 0.3", or maybe not - some accented characters exist also in
that commit.
2010-08-21 00:33:13 +02:00
Paolo Giarrusso
9d1732d174 i18n-it: updates after msgmerge on stable branch 2010-08-21 00:33:13 +02:00
Paolo Giarrusso
d2ae1be27a i18n-it: perform msgmerge on the tip of the stable branch 2010-08-21 00:33:13 +02:00
Matt Mackall
f710302a5d bisect: better message for unrelated starting revisions 2010-08-20 17:16:37 -05:00
David Soria Parra
ebfeb45938 bookmarks: Check if the bookmark to delete exists on the remote 2010-08-19 15:04:21 -04:00
Patrick Mezard
efbdac1e61 win32: remove useless lstat() fallback in nlinks()
The fallback was introduced by 33415b0b4e64 at the same time than
nlinks(). Apparently it only handles the case where target path
does not exist. Just raise IOError directly.
2010-08-19 22:51:09 +02:00
Patrick Mezard
5e126e9b42 win32: correctly break hardlinks on network drives (issue761)
win32.nlinks() was often returning 1 instead of the correct
hardlinks count when reading from network drives. This made
commit or push to a repository on a network share to fail
breaking the hardlinks in the datastore, possibly causing
integrity errors in repositories linked locally on the remote
side.

Here is what the MSDN says about GetFileInformationByHandle():

  Depending on the underlying network features of the operating
  system and the type of server connected to, the
  GetFileInformationByHandle function may fail, return partial
  information, or full information for the given file.

In practice, we never got the correct hardlinks count when
reading from and to many combinations of Window XP, 2003, Vista
and 7, via network drives or RDP shares. It always returned 1
instead. The only setup returning an accurate links count was a
samba on Debian.

To avoid this, Mercurial now breaks the hardlinks unconditionally
when writing to a network drive.
2010-08-19 22:51:09 +02:00
Brodie Rao
5c97a02c1e convert: use encoding.encoding instead of locale.getpreferredencoding()
The latter may not return useful results in certain OS X environments.
2010-08-18 10:53:52 -04:00
Brodie Rao
e752297abf convert: properly set encoding for gnuarch converter 2010-08-18 10:53:50 -04:00
Mads Kiilerich
b27d1fd3b8 mq: don't inherit default and default-push paths with --mq (issue2333)
Configuration from the outer repo is inherited to the patches repo when --mq is
used.

In case the patches repo only has paths.default configured but the outer repo
has paths.default-push then the inherited default-push will win. Very
confusing.

Inheriting the default paths is however wrong in all sane cases, so now we
explicitly remove them.
2010-08-18 02:43:45 +02:00
Dirkjan Ochtman
285c18754a help: document stringify templatefilter 2010-08-19 10:59:37 +02:00
Matt Mackall
6f470d1e51 merge with i18n 2010-08-17 17:40:53 -05:00
Sol Jerome
859b297e3f util: avoid using hashlib on Python < 2.5 (issue2278)
The following patch allows the use of python2.4 with a standalone
hashlib rather than assuming that python2.5 is in use when hashlib is
imported successfully.
2010-08-17 17:38:19 -05:00
Wagner Bruna
4617552400 i18n-pt_BR: fix typo in commit help text
spotted by Fred Maranhão
2010-08-17 12:02:34 -03:00
Wagner Bruna
1047459b00 i18n-pt_BR: synchronized with a3d9ffe07430 2010-08-16 16:06:10 -03:00
Wagner Bruna
a1d5e54dfc i18n-pt_BR: fix typo 2010-08-16 15:46:00 -03:00
Matt Mackall
bd90b40e16 templates: add filenolink to raw style (issue2332) 2010-08-16 12:55:42 -05:00
Dan Villiom Podlaski Christiansen
d64d4dc9f0 encoding: improve handling of buggy getpreferredencoding() on Mac OS X
Prior to version 2.7, calling locale.getpreferredencoding() would
always return 'mac-roman' on Mac OS X. Previously, this was handled by
a call to locale.setlocale(). Unfortunately, Python 2.6.5 and older
have a bug where isspace() would incorrectly report True for 0x85 and
0xa0 after such a call.

In order to fix this, we replace the previous _encodingfixup mapping
to an _encodingfixers mapping. Rather than mapping encodings to their
replacement, it maps them to a function returning the
replacement. This allows us to provide an simplified implementation of
getpreferredencoding() which extracts the expected encoding and
restores the locale.

This fix is based on a patch originally submitted by Martijn Pieters
as well as feedback from Brodie Rao.
2010-08-14 01:30:54 +02:00
Patrick Mezard
cfb0a4943f templatefilters: unnest uescape() 2010-08-15 17:50:52 +02:00
Martin Geisler
db0d34b21b url: limit expansion to safe auth keys (Issue2328)
Mads Kiilerich pointed out that 1e4ade283b02 was too eager since the
prefix and password keys may contain $-signs. So this only add the
username to the list of keys that are expanded.

This also updates the documentation to match.
2010-08-13 10:53:10 +02:00
Martin Geisler
74902a4df9 url: expand vars in all [auth] settings (issue2328) 2010-08-13 10:10:11 +02:00
Thomas Arendsen Hein
8baff1aff6 Fix merge-tools.checkconflicts
re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".

Now conflict markers inside the file are found, too.
2010-08-26 17:38:43 +02:00
Brodie Rao
6c64db37bc alias: make shadowing behavior more consistent (issue2054)
Currently, given an alias like the following:

    [alias]
    summary = summary --remote

The alias might be executed - or it might not - depending on the order
of the cmdtable dict.

This happens because cmdalias gets assigned back to the cmdtable like so:

    cmdtable['summary'] = ...

Yet '^summary|sum' is still in the table, so which one cmdutil.findcmd()
chooses isn't deterministic.

This patch makes cmdalias assign back to '^summary|sum'. It uses the same
cmdtable key lookup that extensions.wrapcommand() does.
2010-08-21 22:48:14 -04:00
Yuya Nishihara
f2b7b3bc23 hgweb: handle exception of misconfigured path on index page
If hgweb.config contains wrong path mapping, hgweb causes internal server
error on repository index page.

This patch changes makeindex() to ignore RepoError, because it looks to be
designed to suppress configuration error.
2010-08-24 23:30:51 +09:00
Martin Geisler
e215b992dc context: mark string for translation 2010-08-25 13:29:46 +02:00
Alecs King
057134ed97 log: fix the bug 'hg log --stat -p == hg log --stat'
Before:
    hg log --stat -p -r tip # only show stat

After:
    hg log --stat -p -r tip # show stat _and_ diff
2010-08-13 14:29:30 +08:00
Martin Geisler
5f4b538b5a glossary: fixed typo 2010-08-17 17:33:42 +02:00
Martin Geisler
f39e256b0e glossary: add entry for "Branch, inactive" 2010-08-17 13:59:37 +02:00
Yuya Nishihara
f6cfbe6d14 templatefilters: use \uxxxx style escape for JSON string
It's embeddable in plain javascript, and also conforms to JSON standard.
2010-08-11 01:06:21 +09:00
Dan Villiom Podlaski Christiansen
8933f2e981 test-notify: make it pass on Mac OS X (again)
Changeset 372e3cb2c9bf (from 2008) introduced a hack to handle the
very long values of $TMPDIR typically seen on Mac OS X. This hack
expected continuation lines to begin with a tab. However, as a result
of a change in Python 2.7, changeset 025d0ea4305a made it so
continuation lines began with a tab. Since then, `test-notify' has
been broken on Mac OS X.

Merely replacing the tab in the regular expression with a space will
not work: not only do tab continuations still occur in the message, but
other lines -- in the body of the message -- also start with a
space. Luckily, all broken up lines appear to end with either a colon
or an n, so we can match those, and reinsert them in the replacement.
2010-08-13 17:21:06 +02:00
Martin Geisler
17737f37b7 dagparser: transplant part of aac98bf716a5 2010-08-15 17:49:59 +02:00
Martin Geisler
888421d8ca check-code: catch "echo -n" in tests 2010-08-15 17:48:05 +02:00