Commit Graph

6159 Commits

Author SHA1 Message Date
Jesse Glick
cf2fd9f31a Permit XML entities to be escaped in template output.
Useful for creating XML documents directly from Hg logging. Can also be used for
HTML. For use in content, will escape '&', '<', and for completeness '>'
(although it is not strictly necessary). For use in attributes, will also escape
' and ". Will also replace nonprinting (ASCII) control characters with spaces,
since these are illegal in XML.
2008-01-28 22:19:12 -05:00
Patrick Mezard
1bee8eb741 convert: add shallow, single branch svn conversions via svn.startrev 2008-02-24 17:58:55 +01:00
Patrick Mezard
e6c6545487 convert: allow svn trunk/branches/tags detection to be skipped
- eluding convert.svn.branches defaults to "branches"
- convert.svn.branches= disables branches detection
- convert.svn.branches=/ is equivalent to former convert.svn.branches=
2008-02-24 17:58:53 +01:00
John Mulligan
868fd6b157 Add --all option to bundle command 2008-02-21 08:24:58 -05:00
Patrick Mezard
7a9633ffc5 Fix test-convert.out after 7258ee216b30 2008-02-23 19:37:44 +01:00
Patrick Mezard
613f127c0d convert: improve subversion source documentation 2008-02-23 16:43:33 +01:00
Dirkjan Ochtman
b1672f1ac2 hgweb: fix parameter mixup (issue1001) 2008-02-23 11:19:59 +01:00
Dirkjan Ochtman
6297ff3f5b tests: easier hg serve error diagnosis 2008-02-23 11:18:34 +01:00
Peter Arrenbrecht
7f8994bad6 util: make walkrepos() return .hg/patches if present 2008-02-21 20:56:06 +01:00
Thomas Arendsen Hein
94ab532ffb Allow "file://localhost/" in addition to "file:///" (issue728)
file://localhost/ URLs are generated by Mac OS X API calls like
[NSURL fileURLWithPath:].

Imported patch from Paul Bx.
2008-02-22 21:58:15 +01:00
Peter Arrenbrecht
7d5130edff mq: make qclone ask remote source repo for qbase using lookup protocol 2008-02-21 23:00:50 +01:00
Thomas Arendsen Hein
66db9ab9a2 Document log date ranges and mention 'hg help dates' for all commands (issue998) 2008-02-22 21:18:48 +01:00
Thomas Arendsen Hein
9db0aea4ab Add test case for backout on named branches (issue665) 2008-02-22 11:28:14 +01:00
Gilles Moris
09841be9f6 Reverse the way backout is doing the merge
Currently, backout is creating a backout revision as a child node of the
backed out node and will leave you at this new head. This has several
drawbacks:
* this changes the current head
* when there is a long history between the backed out node and the
current head, this will generate a huge number of diffs that are scary
at first sight, and not very natural to review before commit.
The change consists to switch back to the original node as soon as the
backout node (which becomes the new tip) has been created. Then the
--merge option can just merge this new tip in the current node.
* the current head/node is not changed from the user's point of view
* even without using the --merge option, the backout revision is still
easy to locate, as this is the tip
* the merge is much more intuitive as diffs of the merge is right you
are looking to backout
2008-02-21 08:52:52 +01:00
Alexis S. L. Carvalho
5cae264d5a tests: hide the name of the branch cache file 2008-02-21 16:22:31 -03:00
Alexis S. L. Carvalho
a34bc213b5 test-mq-pull-from-bundle: don't print the contents of $HGRCPATH 2008-02-21 16:22:31 -03:00
Alexis S. L. Carvalho
e8fbf94f2c repo.status: also compare flags for files in the lookup list.
We might be able to do something smarter about this in dirstate.status
for files in normallookup state, but that would require some extra
care to keep backwards compatibility.
2008-02-21 16:22:31 -03:00
Alexis S. L. Carvalho
c028f52c83 keyword: remove "identify" and "remove" from nokwcommands
These two commands care about the list of modified files returned
by repo.status and we may need to do a full content comparison to
populate that list.
2008-02-21 16:22:31 -03:00
Alexis S. L. Carvalho
ab8ab21710 test-glog: pass the list of files to commit
test-glog uses debugsetparents instead of update+merge to create
some funky DAGs, and so the dirstate contents won't be consistent
with the checked out revision.

Passing an explicit list of files to commit reduces a bit the
dependency on the dirstate.

Using a non-deprecated rawcommit might be better here.
2008-02-21 16:22:31 -03:00
Dirkjan Ochtman
9710ce5ef6 hgweb: no i18n in protocol responses 2008-02-21 15:56:35 +01:00
Dirkjan Ochtman
44000fbf43 improve changegroup.readbundle(), use it in hgweb 2008-02-21 17:02:28 +01:00
Stefan Rank
e62243ce74 Also search for .hgrc if mercurial.ini not found on windows 2008-02-20 21:31:42 +01:00
Dirkjan Ochtman
cdb32d9cc8 hgweb: use bundletypes from mercurial.changegroup 2008-02-21 15:00:25 +01:00
Bryan O'Sullivan
feae4e35dd Merge with crew 2008-02-20 13:38:16 -08:00
Dirkjan Ochtman
be3fb00c67 hgweb: separate protocol calls from interface calls (issue996)
The protocol functions are already pretty careful about not raising
exceptions to the caller, and have their own error handling. We can formalize
this a little bit to make it clearer (before, the exception handlers for
a limited number of exceptions coming from the interface bits would blow up
because some variables aren't instantiated for the protocol calls).
2008-02-20 10:50:10 +01:00
Alexis S. L. Carvalho
6b25d3970d update output of test-convert 2008-02-19 19:34:18 -03:00
Alexis S. L. Carvalho
aa51bf2928 repair.py: rewrite a loop, making it cleaner and faster 2008-02-19 19:20:10 -03:00
Alexis S. L. Carvalho
402b1dc8bc Speed up hg grep by avoiding useless manifest parsing
In the kernel repo (tip = 2b89f7111b96), a "hg grep mpm MAINTAINERS" goes
from ~165s to 0.7s.  This could get even a bit faster if we broke out of
the loop after the first match, but I'm not sure how that would interact
with the --follow code.

This is obviously an extreme example, but other cases should also benefit
from this patch.
2008-02-19 19:20:10 -03:00
Alexis S. L. Carvalho
26b304926b cmdutil.walkchangerevs: use '-1:0' instead ot 'tip:0'
This avoids a possibly expensive tag lookup.
2008-02-19 19:20:10 -03:00
Alexis S. L. Carvalho
bda2fe75b5 revlog.revision: avoid opening the datafile without need.
If there's no inline data, revlog.revision opens the data file every
time it's called.  This is useful if we're going to call chunk many
times, but, if we're going to call it only once, it's better to let
chunk open the file - if we're lucky, all the data we're going to need
is already cached and we won't need to even look at the file.
2008-02-19 19:20:10 -03:00
Bryan O'Sullivan
032bc4fcfa convert: document splicemap, allow setting of multiple parents 2008-02-19 10:53:40 -08:00
Thomas Arendsen Hein
6f399a19b1 merge backout 2008-02-18 19:21:33 +01:00
Thomas Arendsen Hein
4d33c02751 Backed out changeset 8105fa3c7347 (see issue971/msg5317) 2008-02-18 19:20:22 +01:00
Bryan O'Sullivan
dfa3e1ea9b profiling: allow CGI and FastCGI to be profiled 2008-02-01 13:09:45 -08:00
Dirkjan Ochtman
9098bb23f2 update copyright notice in version output 2008-02-01 10:31:15 +01:00
Dirkjan Ochtman
3d668210f2 hgweb: explicit response status 2008-02-01 10:31:13 +01:00
Dirkjan Ochtman
ac2a5adcee updating lsprof.py from remote repository 2008-02-01 10:31:09 +01:00
Christian Ebert
b5f8d75c94 highlight: update according to latest hgweb_mod changes
Also move encoding workaround completely into non binary condition.
2008-01-31 13:57:48 +01:00
Thomas Arendsen Hein
3d1d8b45c7 Fixed typo: Gnerating -> Generating 2008-02-01 00:25:32 +01:00
Armin Ronacher
14aa65e30c added \r for progress counting in churn extension 2008-01-31 23:42:21 +01:00
Matt Mackall
41e5c79455 templates: move filters to their own module
This eliminates just about all Mercurial dependencies in templater.py
2008-01-31 14:44:19 -06:00
Matt Mackall
a849fab9e4 templater: move email function to util 2008-01-31 14:44:19 -06:00
Matt Mackall
7b0d46c8cd templater: remove node import 2008-01-31 14:44:19 -06:00
Matt Mackall
9b6f4fc222 patchbomb: undo backout and fix bugs in the earlier patch 2008-01-31 14:44:19 -06:00
Jesse Glick
d21d195944 Infer a --repository argument from command arguments when reasonable.
In particular: if invoked without -R from a CWD not inside a repo, having been
passed one or more file paths as command arguments, where the nearest enclosing
repo of all of those paths is the same, quietly infer a -R option for that repo.
Otherwise abort with an error message as before.
2008-01-25 04:11:32 -05:00
Michele Cella
3d9c1412dd added an entry about the prefix option inside the hgrc man page 2008-01-22 23:07:23 +01:00
Michele Cella
76206039da tests for hg serve prefix option 2008-01-22 23:06:37 +01:00
Michele Cella
095d8aff18 hgweb: fixes to make hg serve prefix handling more robust 2008-01-22 22:13:29 +01:00
Matt Mackall
ba528333cb Merge with -stable 2008-01-31 14:44:00 -06:00
Matt Mackall
77a0b60046 win32: remove excessive flushing
Our Windows file code was flushing buffers from the operating system
to disk, rather than from the application to the operating system.
2008-01-30 17:30:34 -06:00