Commit Graph

11154 Commits

Author SHA1 Message Date
Matt Mackall
46429c0cb8 strip: hide unbundle messages by default
Unbundling is an internal implementation detail for strip, only show
them with --verbose.
2010-05-20 13:27:28 -05:00
Matt Mackall
0f3c7b919c Fix up rebase's handling of strip backups 2010-05-20 12:21:35 -05:00
Matt Mackall
a386dc3529 strip: improve full backup message 2010-05-20 12:15:44 -05:00
Matt Mackall
a5aceec057 strip: drop deprecated -b from synopsis 2010-05-19 20:20:16 -05:00
Matt Mackall
1717a658d7 rebase: use helpers.sh in tests 2010-05-19 20:20:12 -05:00
Matt Mackall
0a1ca665ca strip: be quiet about temporary internal bundle 2010-05-19 19:46:39 -05:00
Patrick Mezard
b68b0fc427 Merge with crew-stable 2010-05-19 22:32:40 +02:00
Aaron Digulla
db9d4ddfda convert/svn: close gettags() log stream (issue2196) 2010-05-19 22:09:58 +02:00
Patrick Mezard
094ca2873a convert/svn: remove useless try/catch
While the try/catch was reintroduced in 05a88417e1cb, it was made useless by
the tags/ existence check in getheads().
2010-05-19 22:04:41 +02:00
Martin Geisler
efb4a38a04 Use our custom hg reStructuredText role some more
I missed these occurrences on my first scan through the source.
2010-05-18 16:31:10 +02:00
Martin Geisler
e11007adaf minirst: handle line breaks in hg role 2010-05-18 16:24:14 +02:00
Martin Geisler
a6312d22f5 extdiff: fix reST syntax in module docstring 2010-05-17 23:11:27 +02:00
Martin Geisler
adcdd57662 rebase: stress that only local changesets should be rebased 2010-05-17 21:16:35 +02:00
Martin Geisler
88705a5b97 minirst: fix debug code 2010-05-17 20:42:28 +02:00
Javi Merino
2642058a63 Fixed a bashism with trap numbers in hgeditor.
When using trap in a shell script, it's more portable to use signal
names, instead of numbers. Signal names (INT, KILL,...) are defined in
POSIX, whereas its corresponding numbers aren't.
2010-05-11 12:06:30 +02:00
Martin Geisler
3411550e7e Merge with stable 2010-05-17 21:30:00 +02:00
Matt Mackall
0eed4acf96 Merge with stable 2010-05-16 14:38:32 -05:00
Steve Losh
6c5a8fed4b tag: add -e/--edit option for modifying the commit message 2010-05-15 23:33:22 -04:00
Brodie Rao
6239bef137 pager: fork and exec pager as parent process
With the pager as the child process instead of the parent process, the
termination of the parent Mercurial process can cause the terminal to return
before the pager exits. Inverting the relationship prevents that issue.

Platforms without fork() will continue to use util.popen().
2010-05-03 14:00:34 -05:00
Matt Mackall
68193d6f79 Added signature for changeset bf23c7a64aac 2010-05-13 11:30:50 -05:00
Matt Mackall
0af0192ab8 Merge with i18n 2010-05-11 17:11:40 -05:00
Martin Geisler
6437ecd7f6 i18n-da: translated various small strings 2010-05-08 23:41:45 +02:00
Martin Geisler
6b4f17126f i18n-da: synchronize with a4ed397c1fe5 2010-05-08 23:22:40 +02:00
Martin Geisler
0f12cdee49 commands: explain that "hg serve" does not do authentication 2010-05-07 17:03:31 +02:00
Martin Geisler
03fe3d3627 commands: explain that "hg serve" is mostly for ad-hoc sharing 2010-05-07 17:01:14 +02:00
Brendan Cully
4d11a5bfea grep: clarify help for -r 2010-05-03 15:22:47 -07:00
Matt Mackall
60271b58eb Added signature for changeset 53507b778ebd 2010-05-01 16:02:51 -05:00
Wagner Bruna
d2ede753bb i18n-pt_BR: synchronized with 0f0816bb2880 2010-05-01 17:55:44 -03:00
Matt Mackall
127aa795db Merge with i18n 2010-05-01 15:08:30 -05:00
Faheem Mitha
5fe5a6e7b6 mq: rewrite strip docstrings
This patch is joint work with ilowe.
2010-05-01 23:04:49 +05:30
Mads Kiilerich
76f4bb870c test-issue2137: don't use $PWD; use pwd instead
This fixes test failure on Solaris, as described on
http://mercurial.selenic.com/wiki/WritingTests
2010-05-01 19:24:51 +02:00
Mads Kiilerich
7c7a8e770e test-mq-merge: quote ^
^ is magic on Solaris and must be quoted
2010-05-01 19:24:49 +02:00
Mads Kiilerich
5e49c62ca7 test-extension: changed environment variables must be exported again
This fixes failure on Solaris because HGRCPATH wasn't unset.
2010-05-01 19:24:46 +02:00
Wagner Bruna
707cfea20f subrepo: add test for issue1977 2010-04-30 19:50:37 -03:00
Wagner Bruna
e4cfca8a2e subrepo: update test output for issue1977 fix 2010-04-30 19:49:35 -03:00
Matt Mackall
53ab4498e1 subrepo: propagate and catch push failures 2010-04-30 18:32:18 -05:00
Wagner Bruna
52fb80e608 i18n-pt_BR: synchronized with dea59174415a 2010-04-30 17:39:56 -03:00
Nicolas Dumazet
09283d5a0c static-http: mimic more closely localrepo (issue2164: allow clone -r )
* httprangereader: name, __iter__ and close are needed to mimic file object
* static-http opener:
    - disallow write/append modes
    - add (unused) atomictemp parameter
* static-http repo:
    - root attribute is needed for localrepo.dirstate()
    - _branch* attributes are required for commitctx and branchmap calls
* tags: force repo.opener.__iter__ call earlier to force httprangereader
  to try to read the cache early, to avoid raising IOError later.
2010-04-26 20:13:14 +09:00
Dan Villiom Podlaski Christiansen
16da932a11 dispatch: don't mangle ImportError abort messages
Previously, Mercurial assumed that the last word of the string
representation was the name of the moduled that was imported. This
assmption is incorrect, despite being true for the common case of an
exception raised by the Python VM.

For example, hgsubversion raises an ImportError with a helpful message
if the Subversion bindings were not found. The final word of this
message is not meaningful on its own, and is never the name of a
module.

This patch changes the output printed to be a simple stringification
of the exception instance. In most cases, this will be `abort: No
module named X!' rather than `abort: could not import module X!'.

No functionality change; all tests pass.
2010-04-30 18:11:56 +02:00
Benoit Boissinot
e1d4a8491c relink/progress: correctly handle the no file to relink case 2010-05-01 14:36:48 +02:00
Michael Glassford
f37b4abb21 schemes: fix // breakage with Python 2.6.5 (issue2111)
Recent Pythons (e.g. 2.6.5 and 3.1) introduce a change that causes
urlparse.urlunparse(urlparse.urlparse('x://')) to return 'x:' instead of 'x://'i and
urlparse.urlunparse(urlparse.urlparse('x:///y')) to return 'x:/y' instead of 'x:///y'.
Fix url.hidepassword() and url.removeauth() to handle these cases.
2010-04-08 11:00:46 -04:00
Dan Connolly
3a8d40d5c3 log: document the new xml style 2010-04-28 13:36:06 -05:00
Matt Mackall
e40531cc47 Merge with i18n 2010-04-28 13:45:21 -05:00
Patrick Mezard
b7c02777e0 util: fix default termwidth() under Windows
sys.stdout.write('-'*80 + '\n')

or

  sys.stdout.write('-'*80 + '\r')

do not work on Windows as they do on unix. On a 80 columns Windows console, the
extra CR or LF are interpreted as if belonging to the next line, so the first
command displays 2 lines (only one on unix) and the second one leave the line
visible and move back to the following line. To avoid this, we sacrifice one
column under Windows.
2010-04-26 22:30:40 +02:00
Faheem Mitha
a231e38798 commands: revised documentation of 'default' and 'default-push'
This patch was a collaborative effort between faheem, mg, timeless and
ilowe.
2010-04-27 00:44:06 +05:30
Patrick Mezard
8207527bd4 test-convert-git: be tolerant to git output variants 2010-04-26 14:40:34 +02:00
Patrick Mezard
438c49a871 convert/git: check status when reading output stream 2010-04-25 23:07:46 +02:00
Patrick Mezard
7dba5c05ca convert/git: check status when reading the whole output 2010-04-25 22:59:50 +02:00
Patrick Mezard
cadf5fd884 convert/git: rename gitcmd() into gitopen() for readability 2010-04-25 22:32:27 +02:00
Martin Geisler
aa7bc3741f hgrc.5: mention lists as well 2010-04-25 17:11:36 +02:00