Commit Graph

2395 Commits

Author SHA1 Message Date
Matt Mackall
dd998094a7 rebase: add error codes
Suggested by Dirk Hasselbalch
2010-05-20 15:58:16 -05:00
Matt Mackall
639d751bf4 rebase: improve --abort failure message 2010-05-20 15:20:25 -05:00
Matt Mackall
70ee1c01f7 rebase: only show "rebase completed" message with -v 2010-05-20 15:15:11 -05:00
Matt Mackall
0f3c7b919c Fix up rebase's handling of strip backups 2010-05-20 12:21:35 -05:00
Matt Mackall
a5aceec057 strip: drop deprecated -b from synopsis 2010-05-19 20:20:16 -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
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
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
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
Steve Borho
c76d6b8145 extdiff: add labels, read diff arguments from [merge-tools]
hgtk has been using these same configs since Feb. Users only have to name the
tools they would like to use, ex:

[extdiff]
kdiff3 =
meld =
2010-01-07 22:19:05 -06:00
Yuya Nishihara
1027c10b16 patchbomb: respect HGPLAIN when piping --test output to PAGER
It makes easy to use `hg email --test` from another tool.
2010-05-16 22:23:14 +09:00
Christian Ebert
1d69bedc9e keyword: support extensions using dorecord, e.g. crecord
Provide extendable keyword.recordextensions variable, so other
extensions beside hgext.record which provide the dorecord function
can cooperate with hgext.keyword like so (example from crecord):

def extsetup():
    try:
        keyword = extensions.find('keyword')
        keyword.restricted += ' crecord qcrecord'
        try:
            # use record support in keyword.py if present
            keyword.recordcommands += ' crecord qcrecord'
            keyword.recordextensions += ' crecord'
        except AttributeError:
            pass
    except KeyError:
        pass
2010-05-09 11:14:43 +02:00
Matt Mackall
e2dac1c52b convert/svn: fix long line 2010-05-12 14:49:46 -05:00
Cédric Duval
2207d76e14 patchbomb: Reply-To support
From RFC 5322:
  an optional reply-to field MAY also be included, which contains the field
  name "Reply-To" and a comma-separated list of one or more addresses.
  [...]
  When the "Reply-To:" field is present, it indicates the address(es) to which
  the author of the message suggests that replies be sent.  In the absence of
  the "Reply-To:" field, replies SHOULD by default be sent to the mailbox(es)
  specified in the "From:" field unless otherwise specified by the person
  composing the reply.

Reply-To addresses may be specified either via command line with --reply-to
or via the 'email' or 'patchbomb' sections of the config file.
2010-05-10 22:06:28 +02:00
Benoit Boissinot
56bc6417ea merge with mpm 2010-05-11 20:22:37 +02:00
Patrick Mezard
82b9bdbce9 acl: improve undefined group error handling 2010-05-10 21:44:00 +02:00
Patrick Mezard
842d65c40f acl: grp module is not available on windows 2010-05-10 21:09:48 +02:00
Patrick Mezard
d289b10ad0 convert/svn: report path discovery progress
When converting non-local repositories, scanning changed paths before
retrieving data can be almost as slow as retrieving the data itself, thanks to
HTTP calls overhead.
2010-05-09 22:51:25 +02:00
Patrick Mezard
ba463ef89c convert: display files data retrieval progress 2010-05-09 22:50:42 +02:00
Patrick Mezard
8c28124de1 convert: add progress support 2010-05-09 22:50:07 +02:00
Patrick Mezard
20f6d4cdf1 convert: merge sources getmode() into getfile() 2010-05-09 21:52:34 +02:00
Patrick Mezard
9b61bd6f00 convert/svn: remove useless sort 2010-05-09 21:49:57 +02:00
Patrick Mezard
6a90010ffe convert/svn: list files explicitely, stop checking their type
We do not care about directories when looking for recursively added or removed
items, and the redundant _checkpath() call is expensive with remote
repositories.
2010-05-09 21:45:00 +02:00
Patrick Mezard
f781589aef acl: clarify acl.sources, fix typo 2010-05-09 20:12:45 +02:00
Patrick Mezard
0c57130de8 convert/svn: remove unused variable 2010-05-09 19:37:16 +02:00
Patrick Mezard
4eba02ab8f Merge with crew-stable 2010-05-09 19:25:35 +02:00
Patrick Mezard
3cefb24597 convert/svn: handle files/links replaced by dirs (issue2166) 2010-05-09 19:11:02 +02:00
Patrick Mezard
c25c428f66 convert/svn: do not retrieve removed files
It gives us a way to not retrieve content of entries we know are no longer
files. And it is faster when converting remote repositories.
2010-05-09 19:11:02 +02:00
Patrick Mezard
1cb53b6a8f convert/svn: correctly encode deleted entry paths
This recode call was removed in 597805361f86, because it looked the
encode(decode()) construct was a no-op. In fact, the first decode() call was
wrong, and entries still have to be encoded before being passed to the sink.
2010-05-09 19:11:02 +02:00
Patrick Mezard
c5e014e3e0 convert/svn: remove broken but unused copy filtering code
For some reason, if a copy source is deleted in the same revision it is
referenced, it is filtered out. This is silly, because this happens all the
time with move operations. Fortunately, the filtering code is buggy and ends
being a no-op 99% of the time, since it does not delete the right key. Just
remove all this nonsense.
2010-05-09 19:11:02 +02:00
Matt Mackall
f37d605b14 clean up remaining generic exceptions 2010-05-07 16:59:00 -05:00
Martin Geisler
f93965f673 mq: mark error message for translation 2010-05-07 23:31:49 +02:00
Martin Geisler
0133c2f995 mq: mark string for translation 2010-05-07 23:28:07 +02:00
Eric Eisner
21d3c16701 mq: make use of output labeling for summary 2010-05-07 16:51:45 -04:00
Stanimir Stamenkov
268f6af2e2 color: add some missing background colors for win32 console 2010-05-07 15:19:37 -05:00
Elifarley Callado Coelho Cruz
6a180e3b5f acl: update docstring to describe section [acl.groups] 2010-05-06 15:14:40 -03:00
Elifarley Callado Coelho Cruz
1b50176554 acl: support for group definitions in section [acl.groups], which take precedence over OS-level groups 2010-05-06 14:23:14 -03:00
Matt Mackall
7a237857b0 mq: add a line to hg summary 2010-05-05 20:53:45 -05:00
Christian Ebert
7ef7102e51 keyword: omit setting extra variable for record context
Since ab6bbeb1b787 the context is always retrieved in
kwtemplater.overwrite().
2010-05-05 14:02:45 +02:00
Martin Geisler
fa236c2f0a acl: more consistent docstring 2010-05-05 09:25:09 +02:00
Martin Geisler
648fca8526 acl: fix reST syntax 2010-05-05 09:18:05 +02:00
Elifarley Callado Coelho Cruz
e8298826aa acl: add support for branch-based access control 2010-05-04 08:37:20 -03:00
Christian Ebert
9642b7288d keyword: simplify record switch in kwtemplater.overwrite
1) use kwtemplater.record attribute for clarity
2) drop optional context argument; consider the speed loss by
   duplicating the dictionary lookup repo['.'] as negligible
2010-05-01 23:59:39 +02:00
Steve Borho
146627c709 color: fix typo in w32effect for bold_background 2010-05-01 16:57:02 -05:00
Matt Mackall
7f6aa6252c Merge with stable 2010-05-01 15:15:35 -05:00