Commit Graph

2492 Commits

Author SHA1 Message Date
Matt Mackall
07bf3725e6 bookmarks: add pushkey server-side support 2010-06-17 11:01:51 -05:00
Greg Ward
1b6a40bfe8 mq: make 'qdelete <patchidx>' work again.
This just backs out b51fc1a46a02 (a minor code cleanup that
accidentally broke qdelete) and adds a test.
2010-06-16 22:00:02 -04:00
Martin Geisler
0cbec6eadd relink: ensure deterministic directory walk in collect 2010-06-16 12:22:14 +02:00
timeless
675858ac70 relink/progress: Adding progress for collecting stage 2010-06-10 15:35:06 +02:00
timeless
6ffa07b04b relink/progress: Adding progress for pruning stage 2010-06-10 13:09:50 +02:00
Christian Ebert
e5d231e804 keyword: postpone manifest calculation in kwtemplater.overwrite
We can check for file existence in the working directory (needed
in case of recording) by simply using the given context and
calculate the manifest only when there are in fact candidates
for expansion/shrinking.
2010-06-15 17:15:31 +02:00
Martin Geisler
6e246c45aa p4: fix long line and bad spacing around % 2010-06-15 11:05:17 +02:00
Frank Kingswood
28f1de6e41 Fix shell quoting on p4 conversion 2010-06-14 16:38:36 +01:00
Renato Cunha
b35e385443 hgext/zeroconf/__init__.py: Separate relative and absolute imports.
2to3 complains when relative and absolute imports are mixed, this fix just
separates them on the zeroconf extension. According to 2to3, the other modules
are fine.
2010-06-14 16:56:20 -03:00
Dan Villiom Podlaski Christiansen
e64c6d6314 pager: set ui.formatted() prior to redirecting stdout. 2010-06-07 15:34:48 +02:00
Dan Villiom Podlaski Christiansen
de6e2d6afa mq: use ui.formatted() instead of ui.plain(). 2010-06-07 15:33:03 +02:00
Dan Villiom Podlaski Christiansen
eb569c8b47 color: use ui.formatted(). 2010-06-07 15:28:54 +02:00
FUJIWARA Katsunori
ce06b102df help: show value requirement and multiple occurrence of options
this helps users to know what kind of option is:

  - no value is required(flag option)
  - value is required
  - value is required, and multiple occurrences are allowed

each kinds are shown as below:

 -f --force              force push
 -e --ssh CMD            specify ssh command to use
 -b --branch BRANCH [+]  a specific branch you would like to push

if one or more 3rd type options are shown, explanation for '[+]' mark
is also shown as footnote.
2010-06-06 17:25:00 +09:00
Christian Ebert
6241cdaae9 keyword: pass context to kwtemplater.overwrite
Now that we have retrieved the context in every calling function
except commit, pass it as argument to kwtemplater.overwrite to
avoid looking it up twice.

Reorder arguments to kwtemplater.overwrite to reflect their
importance.

Turn node argument into a simple boolean and rename it to iswctx.
2010-06-09 12:45:48 +01:00
Stefano Tortarolo
28423089a9 rebase: --abort doesn't strip away the target changeset (issue2220)
When a changeset is skipped, rebase keeps the previous target as next
target and if the skipped cset is the first one, the recorded target is
actually the original target.
--abort did not detect this situation but simply stripped away the cset.
2010-06-08 18:01:07 +02:00
Steve Borho
0d0e614fc9 Merge backout 2010-06-08 15:52:56 -05:00
Steve Borho
b82bd4f289 Backed out changeset: 1bfde817782c 2010-06-08 15:52:41 -05:00
Martin Geisler
bd1de7cf0d mq: use hg reST role some more 2010-06-08 14:12:46 +02:00
Dirkjan Ochtman
af6b696f0f move working dir/dirstate methods from localrepo to workingctx 2010-06-07 20:03:32 +02:00
Steve Borho
e91613380a color: labeled text should be passed to ui.write() as ui.labeled
Some implementations of ui.label() (HTML versions in particular) must escape
the provided text and then markup the text with their tags.  When this marked
up text is then passed to ui.write(), we must label the text as 'ui.labeled'
so the implementation knows not to escape it a second time (exposing the initial
markup).

This required the addition of a 'ui.plain' label for text that is purposefully
not marked up.

I was a little pedantic here, passing even ' ' strings to ui.label() when it
would be included with other labeled text in a ui.write() call.   But it seemed
appropriate to lean to the side of caution.
2010-06-03 23:18:18 -05:00
Dirkjan Ochtman
cf1de649bd move discovery methods from localrepo into new discovery module 2010-06-07 18:35:54 +02:00
Christian Ebert
9f4630cb27 keyword: use context to detect uncommitted merge 2010-06-03 10:37:31 +01:00
Matt Mackall
ae637a04b0 rebase: use usual util.abort rather than error.ParseError 2010-06-04 17:22:33 -05:00
Matt Mackall
86ebd43d71 remoteui: move from cmdutil to hg 2010-06-01 11:18:57 -05:00
Cédric Duval
06eedc4b82 mq: prevent the creation of a queue whose name is already taken
Each check is moved under the code handling the relevant option, and
a new one is added for --create. This fixes duplicated entries being
added to the queues list.
2010-06-03 20:40:23 +02:00
Henrik Stuart
ac61fc4db1 mq: fix naming issues for qqueue directories 2010-06-02 19:39:45 +02:00
Martin Geisler
ae18c6a910 win32text: mark this extension as deprecated 2010-06-02 14:54:25 +02:00
Alexander Solovyov
a6931a2129 churn: add possibility to include/exclude paths 2010-05-27 22:50:23 +03:00
Alexander Solovyov
06239f590d churn: support spaces in aliases (issue2222) 2010-06-02 14:28:45 +02:00
Christian Ebert
8386b76841 keyword: retrieve added and modified files from commitctx 2010-06-01 03:45:10 +02:00
Christian Ebert
a2b0bda630 keyword: force dirstate normal when all changes in a file are recorded
Before this bugfix a file whose changes were entirely recorded was still
considered modified by "hg status".

Note: the test must use hg record -l/--logfile, because this is not
reproducible with hg record -m/--message.
2010-06-01 01:05:45 +02:00
Martin Geisler
e68f4fb8bb Merge with stable 2010-05-31 21:43:03 +02:00
Martin Geisler
d9fb8f71e1 eol: extension for managing file EOLs 2010-05-31 21:37:01 +02:00
Martin Geisler
9050bae24d Merge with stable 2010-05-31 13:55:47 +02:00
Nicolas Dumazet
20bba72bdf record: check that we are not committing a merge before patch selection
It might sound like a good idea to use record to filter changes when merging.
If someone attemps this, it's better to tell her "no" right ahead, before the
patch generation/line selection, so she does not spend time doing it just to
receive a red light after that (sometimes rather long) process.
2010-05-31 17:13:15 +09:00
Martin Geisler
575c7bca7d record: better way to find help in docstring
This outputs only the lines in the verbatim block without relying on
the translator to have translated the little 'y - record this change'
string.
2010-05-31 13:43:03 +02:00
Nicolas Dumazet
7a4893d709 record: docstring typo 2010-05-31 14:48:26 +09:00
Martin Geisler
4644ff1a96 mq: mention qqueue in module docstring 2010-05-30 23:24:10 +02:00
Ronny Pfannschmidt
4362059a98 make transactions work on non-refcounted python implementations 2010-05-27 17:47:40 +02:00
Henrik Stuart
9ec8c20547 mq: support multiple patch queues using qqueue 2010-05-29 20:32:39 +02:00
Martin Geisler
b457854adf mq: remove unneeded local variable in delete 2010-05-24 00:55:42 +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
Brodie Rao
5f6e33ab1d pager: exec pager using /bin/sh -c
This mimics the behavior of popen() and ensures setting the pager to something
like "LESS=FSRX less" will work.
2010-05-19 09:54:12 -05:00
Brodie Rao
97e764bcba pager: exec pager using /bin/sh -c
This mimics the behavior of popen() and ensures setting the pager to something
like "LESS=FSRX less" will work.
2010-05-19 09:54:12 -05:00
Christian Ebert
e472d468be keyword: offer svn-like default keywordmaps
svn-like default keywords can be set in a new configuration section
called [keywordset] -- thanks to timeless for the name.

Move setup of default keywordmaps into dedicated function used by
kwtemplater.__init__ and demo.

HeadURL/URL is not supported (by default).
2010-05-19 00:45:50 +02:00
Christian Ebert
dfcf923020 keyword: add 2 svn-like date filters
svnisodate yields the format the date in svn's Id keyword expands to.
svnutcdate yields the format svn's Date/LastChangedDate expands to.

http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html
2010-05-18 22:16:38 +02:00
Sune Foldager
f9f5488566 push: add --new-branch option to allow intial push of new branches
Compare this to --force which allows anything to be pushed. With --new-branch,
only changesets to named branches not present on the and changesets not
introducing additional heads on existing branches are allowed.

Developed by
  Henrik Stuart <henrik.stuart@edlund.dk>
  Sune Foldager <cryo@cyanite.org>
2010-05-21 15:22:29 +02:00
Yuya Nishihara
be0949be33 color: bring back colors with pager
It's introduced by f77a63ba3f8f, but missing in merge changeset
at fe99ec3fe2d0.
2010-05-18 18:55:14 +09:00
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
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
Faheem Mitha
5fe5a6e7b6 mq: rewrite strip docstrings
This patch is joint work with ilowe.
2010-05-01 23:04:49 +05:30
Patrick Mezard
ce447a0bd6 convert/svn: tree conflicts no longer happen now we use memctx 2010-05-01 16:29:27 +02:00
Mads Kiilerich
ee95467b21 mq: qpush --move, reorder patch series and apply only the patch
This makes it less necessary to edit .hg/patches/series manually.
2010-04-30 15:05:51 +02:00