Commit Graph

11385 Commits

Author SHA1 Message Date
Wagner Bruna
22d1edb0c2 help: fix glossary.txt named branches description 2010-06-23 17:49:49 -03:00
Javi Merino
9da23a6f37 zeroconf: Use BadDomainName exception instead of string exceptions
String exceptions no longer work in python 2.6. Use exception classes
instead.
2010-06-23 10:45:53 +02:00
David Soria Parra
5b87f2b170 bookmarks: Use error message consistently
The 'updating bookmark %s failed!' message is better than
'failed to update bookmark %s'. To have more consistent error
messages we use just 'updating bookmarks %s failed'.
2010-06-23 11:53:59 +02:00
Matt Mackall
f685625ce4 Merge with default, fix up stray topological head from i18n 2010-06-22 15:45:13 -05:00
Matt Mackall
2c615ad604 i18n: disable check-code on polib.py 2010-06-22 15:44:19 -05:00
Wagner Bruna
daff7cb86b Merge with i18n 2010-06-21 17:02:48 -03:00
Matt Mackall
5e7ddd1612 revset: improve help on strings 2010-06-21 13:38:40 -05:00
Matt Mackall
a97eb93e35 tests: extend revset test 2010-06-21 13:26:13 -05:00
Matt Mackall
299b7254c4 merge: sort arguments to stabilize the ancestor search 2010-06-21 13:25:42 -05:00
Wagner Bruna
a21a8c007b i18n-pt_BR: synchronized with 8a547e8af1af 2010-06-21 11:53:38 -03:00
Martin Geisler
f455cb5a95 Merge with mpm 2010-06-20 23:37:09 +02:00
Matt Mackall
a6428604f4 merge: improve merge with ancestor message 2010-06-20 14:21:56 -05:00
Martin Geisler
e8c4696ad2 i18n-da: copy msgids that does not need translating 2010-06-20 20:02:27 +02:00
Martin Geisler
f08fb80ec0 acl: delete trailing whitespace in docstring 2010-06-20 19:48:28 +02:00
Martin Geisler
02be1018f0 i18n-da: synchronize with 423999e89b20 2010-06-20 17:38:57 +02:00
David Soria Parra
62a88dc827 bookmarks: Add -B option to incoming/outgoing to compare bookmarks
We add a -B/--bookmarks option to hg incmoing and hg outgoing. If the option
is passed we compare bookmarks instead of changesets. This can be used
to see which bookmarks do not exists on the remote site.
2010-06-20 12:26:48 +02:00
Matt Mackall
f31a27fb38 Merge with i18n 2010-06-22 15:33:58 -05:00
Martin Geisler
c890ed545b discovery: use stable sort order in --new-branch warning
A Python set seems to do this already when you iterate over it, but
this should be considered an implementation detail and not something
we can rely on.

This also gets rid of an unnecessary string conversion -- the set
already contains strings.
2010-06-22 12:38:39 +02:00
Wagner Bruna
a6cde13fa3 Merge i18n default into stable 2010-06-21 16:59:38 -03:00
Matt Mackall
ca34f1b48d revset: fix up contains/getstring when no args passed 2010-06-19 13:00:08 -05:00
Matt Mackall
2d126f9f2e revrange: attempt to parse old-style queries as a first pass 2010-06-19 13:00:01 -05:00
Matt Mackall
e5e3827657 revset: allow extended characters in symbols 2010-06-19 12:22:35 -05:00
Martin Geisler
2493321650 i18n: fix translation of empty paragraphs 2010-06-19 19:16:11 +02:00
Mads Kiilerich
8670b69488 ui: ignore EIO in write_err
Hgs signal handler will catch the signal for example if the terminal hg is
running in is closed. That will make it try to warn that it was 'killed', but
that might fail with EIO and cause hg to exit with an unhandled exception.
Normally nobody cares, but system error handlers such as Fedoras abrt will
notice and report https://bugzilla.redhat.com/show_bug.cgi?id=596594 .
2010-06-16 00:22:10 +02:00
Mads Kiilerich
206817ee38 http push: break infinite recursion on failure with Python 2.6.5 (issue2179)
Python 2.6.5 will keep resetting the retry count on redirects, for example when
the server returns 401 on failing auth (like google code currently does). We
stop the endless recursion by not resetting the count.

http://bugs.python.org/issue3819 introduced the regression with Python 2.6.5.

http://bugs.python.org/issue8797 discusses a fix which might make it to 2.6.6
and 2.7.0.
2010-06-16 22:54:58 +02:00
Yuya Nishihara
968bdb2fd0 pager: respect HGPLAIN
Pager shouldn't be enabled for scripting use.
2010-06-20 01:20:12 +09:00
Christian Ebert
60b4f2db95 patchbomb: reduce number of opts.get calls
Rename outgoing() function to getoutgoing() analogous to
getbundle() etc. to avoid name conflict.
2010-06-16 00:37:21 +02:00
Matt Mackall
8de0daaafc parser: improve infix error checking
(spotted by timeless)
2010-06-19 17:56:52 -05:00
Georg Brandl
9033acc5dc transplant: when reading journal, treat only lines starting with "# " special like patch.extract() does 2010-06-19 12:51:57 +02:00
Matt Mackall
5efb5b5080 revrange: fix up empty query again 2010-06-20 14:21:47 -05:00
Greg Ward
0756f7dc65 extensions: recommend against using wrapfunction for repo methods
Instead, all extensions should use the "dynamic subclass" trick:
subclass repo.__class__ and then replace repo.__class__ with your new
subclass.  This avoids conflicts that happen when one extension uses
wrapfunction and another uses subclassing to extend the same method of
localrepository.
2010-06-15 13:04:22 -04:00
Martin Geisler
319b8eae1b i18n-zh_TW: split messages into paragraphs 2010-06-19 17:19:15 +02:00
Martin Geisler
0b9e58c14f i18n-zh_CN: split messages into paragraphs 2010-06-19 17:19:15 +02:00
Martin Geisler
51859da91b i18n-sv: split messages into paragraphs 2010-06-19 17:19:15 +02:00
Martin Geisler
2fb3c81dc1 i18n-pt_BR: split messages into paragraphs 2010-06-19 17:19:15 +02:00
Martin Geisler
b6f296c814 i18n-ja: split messages into paragraphs 2010-06-19 17:19:14 +02:00
Martin Geisler
5c04cc6e28 i18n-it: split messages into paragraphs 2010-06-19 17:19:14 +02:00
Martin Geisler
e0717f4c05 i18n-fr: split messages into paragraphs 2010-06-19 17:19:14 +02:00
Martin Geisler
f9f8d79dab i18n-el: split messages into paragraphs 2010-06-19 17:19:14 +02:00
Martin Geisler
286e330aa8 i18n-de: split messages into paragraphs 2010-06-19 17:19:14 +02:00
Martin Geisler
46df75d845 i18n-da: split messages into paragraphs 2010-06-19 17:19:14 +02:00
Martin Geisler
96002610aa Merge with hg-i18n 2010-06-19 17:06:11 +02:00
Martin Geisler
c5a1b1f582 i18n-da: remove spurious \n 2010-06-18 15:22:56 +02:00
Matt Mackall
0b177f47ca bookmarks: add support for push --bookmark to export bookmarks 2010-06-17 15:54:26 -05:00
Matt Mackall
624998f1b4 bookmarks: add support for pull --bookmark to import remote bookmarks 2010-06-17 14:26:23 -05:00
Dirkjan Ochtman
56aef99b57 patch: inline small, single-use 'write' function 2010-06-17 15:51:27 +02:00
Dirkjan Ochtman
12058a3e8e patch: inline small, single-use 'close' function 2010-06-17 15:50:35 +02:00
Dirkjan Ochtman
75e5a3fcef mq: __str__ falls back to __repr__ 2010-06-17 15:53:26 +02:00
Matt Mackall
bb9bb2f2c0 bookmarks: update known bookmarks on the target on push 2010-06-17 12:22:21 -05:00
Matt Mackall
58c8d93978 bookmarks: pull known bookmarks from server that are newer 2010-06-17 12:10:47 -05:00