Jens Bäckman
2e29ea532c
i18n-sv: synchronized with ff5cef3a14fd
2010-06-29 09:11:55 +02:00
Mads Kiilerich
d28bbb7fca
test-acl: don't use $PWD
...
solaris ....
2010-06-28 23:23:55 +02:00
Mads Kiilerich
5adb9bace1
test-alias: don't use the environment variable PWD
...
solaris ...
2010-06-28 23:16:11 +02:00
Mads Kiilerich
07f64c28d2
revert: Make it clearer when not to use revert
2010-06-28 15:08:01 +02:00
Augie Fackler
be26c0a474
progress: check stderr.isatty() before each print
...
This prevents writing progress information to a non-tty stderr if one is
swapped in after startup, which happens in `hg serve`.
2010-06-27 22:20:47 -05:00
Wagner Bruna
c9753c0aa2
i18n-pt_BR: synchronized with 0e823c849647
2010-06-26 21:37:10 -03:00
Wagner Bruna
a0bce5f7f7
Merge with stable
2010-06-26 21:29:39 -03:00
Mads Kiilerich
107eb37856
http digest auth: reset redirect counter on new requests (issue2255)
...
This fixes a regression introduced in d5b57915925b when Mercurial reuses the
auth handler for several requests and the redirect counter never is reset.
2010-06-26 23:00:58 +02:00
Matt Mackall
d4380e872d
revset: deal with empty sets in range endpoints
...
(spotted by Julian Cowley <julian@lava.net>)
2010-06-28 11:07:27 -05:00
Matt Mackall
43cb4cbcf4
subrepo: fix silent push failure for SVN (issue2241)
2010-06-27 18:20:49 -05:00
Matt Mackall
80fcc54f22
bookmarks: fix in/out return values
2010-06-26 12:26:03 -05:00
Matt Mackall
ae9cea9fad
bookmarks: fix bogus cut and paste for outgoing
2010-06-26 12:24:55 -05:00
Matt Mackall
e4cf775b71
addchangegroup: pass in lock to release it before changegroup hook is called
...
Currently, callers of addchangegroup first acquire the repository
lock, usually to check that an unbundle request isn't racing. This
means that changegroup hook actions that might write to a repo get
stuck waiting for a lock. Here, we add a new optional lock parameter
and update all the callers. Post-1.6 we may make it non-optional.
2010-06-25 13:47:28 -05:00
Simon Howkins
f313e6ccd4
cmdutil: only output style header once in non-buffered mode (issue2130)
2010-06-24 15:18:47 +01:00
Wagner Bruna
2959609e80
i18n-pt_BR: glossary.txt translation
2010-06-23 17:54:59 -03:00
Matt Mackall
526f8c09e9
bookmarks: touch changelog on write to force hgweb reload
2010-06-23 13:38:52 -05:00
Christian Boos
400df6f4a9
setup: ignore failures to build optional inotify extension
2010-06-23 13:44:07 +02:00
Matt Mackall
63b3d97fcf
revset: make negate work for sort specs
2010-06-30 17:44:36 -05:00
Matt Mackall
e02c6fa5ff
update: synchronize permissions in the dirstate (issue1473)
...
fix by Benoit, updated by mpm to not affect all clean files
2010-06-30 17:34:20 -05:00
Simon Howkins
b6970b73cd
heads: fix templating of headers again (issue2130)
...
(tweaks and test by mpm)
2010-06-24 15:18:47 +01:00
FUJIWARA Katsunori
c90b346d0a
minirst: use unicode string as intermediate form for replacement
...
Some character encodings use ASCII characters other than
control/alphabet/digit as a part of multi-bytes characters, so direct
replacing with such characters on strings in local encoding causes
invalid byte sequences.
2010-06-30 12:44:58 +09:00
Matt Mackall
4edb323e75
subrepo: fix recording of + in .hgsubstate (issue2217)
2010-06-29 17:30:42 -05:00
Vishakh H
7839628449
mq: qimport cleanup on fail (issue2214)
...
save state of successfully added patches and ensure
cleanup on the way out.
2010-06-29 03:09:42 +05:30
Jens Bäckman
548330ebff
i18n-sv: output from 'hg' is once again fully Swedish
2010-06-23 09:33:28 +02:00
Jens Bäckman
536a65a7dd
i18n-sv: synchronized with 8e1f71cb5d41
2010-06-23 09:10:54 +02:00
Wagner Bruna
580dd04d11
i18n-pt_BR: synchronized with 78f35f5dfb5f
2010-06-22 21:13:18 -03:00
Wagner Bruna
7be1b5b207
Merge with stable
2010-06-22 20:48:48 -03: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
Gilles Moris
de632dde6b
mq: explicit exit code when patch is already on top
2010-06-22 21:36:09 +02:00
Gilles Moris
ed9f9e6f02
mq: fix qpush --move for selected guarded patches
...
In the case of guarded patch, the patch could not be found because the
full_series list contains also the guard value appended to each patch name.
As we already checked that the patch is pushable above in the code, we just
have to use the series list (which doesn't contains guard value) to get the
patch index.
2010-06-22 09:49:51 +02:00
Wagner Bruna
94fd1c3ad7
help: glossary.txt formatting fixes
2010-06-23 17:50:27 -03:00
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
Jens Bäckman
96991ce625
i18n-sv: synchronized with 54c73dd216f8
2010-06-22 09:43:07 +02:00
Wagner Bruna
daff7cb86b
Merge with i18n
2010-06-21 17:02:48 -03:00
Wagner Bruna
a6cde13fa3
Merge i18n default into stable
2010-06-21 16:59:38 -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