Commit Graph

8838 Commits

Author SHA1 Message Date
Cédric Duval
06cac940ef help: adding a new help topic about extensions
Currently listing non-enabled extensions and a short introductory text.

Thanks to Dan Villiom Podlaski Christiansen for the preliminary
proof-of-concept code for listing available extensions.
2009-06-20 20:55:43 +02:00
Matt Mackall
995038fe46 bookmarks: add appropriate locking (issue1691)
- make updates of bookmark state locked and atomic
- wrap commit so that commit and bookmarks happen under the same lock
2009-06-20 16:42:51 -05:00
Matt Mackall
7849adbee8 filemerge: fix internal:dump 2009-06-20 16:42:51 -05:00
Benoit Boissinot
a082a7dc75 hgweb: deny cloning a subpath of a repo 2009-06-20 16:42:51 -05:00
Matt Mackall
067d110f29 hgweb: web.encoding should override encoding.encoding (issue1183) 2009-06-20 13:00:25 -05:00
Matt Mackall
9d8806e3c3 bdiff: fix compile with GCC -ansi (issue1690) 2009-06-20 11:50:51 -05:00
Matt Mackall
689cdd2284 tags: silence warning about unknown tags
This is mostly a nuisance and can happen legitimately with pull -r, etc.
2009-06-20 10:53:47 -05:00
Matt Mackall
c2f64c423c rollback: minor clarification (issue828) 2009-06-20 09:00:02 -05:00
Matt Mackall
1ca56aef1e update: add --check option 2009-06-20 08:29:41 -05:00
Matt Mackall
0524b599b7 tags: drop nested function 2009-06-18 23:08:33 -05:00
Matt Mackall
2d1077e9a8 tags: generate contexts directly 2009-06-18 23:04:54 -05:00
Matt Mackall
caca0c5d48 tags: reverse and simplify head-walking 2009-06-18 20:50:35 -05:00
Matt Mackall
536867428a tags: simplify rev handling 2009-06-18 20:50:33 -05:00
Matt Mackall
45eb44ee7b tags: fold in _hgtagsnodes 2009-06-18 20:49:50 -05:00
FUJIWARA Katsunori
0c065c08fa compare grep result between target and its parent
I found that typical case is that grep target is added at (*) revision
in the tree shown below.

     +--- 1(*) --- 3
     0
     +--- 2 ------ 4

Now, I expect 'hg grep --all' to show only rev:1 which is first
appearance of target line.

But 'hg grep --all' will tell:

  target line dis-appeared at 3 => 4
  target line     appeared at 2 => 3
  target line dis-appeared at 1 => 2
  target line     appeared at 0 => 1

because current 'hg grep' implementation compares not between target
revision and its parent, but between neighbor revisions in walkthrough
order.

I checked performance of this patch by "hg grep --follow --all
walkchangerevs" on whole Mercurial repo, and patched version could
complete as fast as un-patched one.
2009-05-19 16:49:54 +09:00
Henrik Stuart
eb1e0babd5 url: let host port take precedence when connecting to HTTPS
Fixes use of HTTPS connections on non-standard ports.
2009-06-20 17:09:49 +02:00
Henrik Stuart
972f154635 url: support client certificate files over HTTPS (issue643)
This extends the httpshandler with the means to utilise the auth
section to provide it with a PEM encoded certificate key file and
certificate chain file. This works also with sites that both require
client certificate authentication and basic or digest password
authentication, although the latter situation may require the user to
enter the PEM password multiple times.
2009-06-20 10:58:57 +02:00
Henrik Stuart
b843569ec5 acl: support for getting authenticated user from web server (issue298)
Previously, the acl extension just read the current system user, which
is fine for direct file system access and SSH, but will not work for
HTTP(S) as that would return the web server process user identity
rather than the authenticated user. An empty user is returned if the
user is not authenticated.
2009-06-07 20:31:38 +02:00
Henrik Stuart
45e3728174 hgweb: escape REMOTE_HOST when passing url for addchangegroup
If DNS lookups are turned off on the web server, REMOTE_HOST may be
populated with REMOTE_ADDR, which, if the remote is an IPv6 hosts will
contain colons, thus interfering with the separator character. This is
solved by URL quoting the REMOTE_HOST string.
2009-06-07 20:15:37 +02:00
Dirkjan Ochtman
73679ffc0d tests: fix test for convert detection of p4 repos 2009-06-19 14:00:41 +02:00
Dirkjan Ochtman
605b944edf kill trailing whitespace 2009-06-19 13:47:50 +02:00
Peter Arrenbrecht
fd55ac9c4d graphmod/webcommands: use generic DAG walks
Changes graph() to colorededges(), which operates on the new
generic DAG walks and adds color and edge information needed
by the web graph.

This is in preparation of adding DAG walk filters, like the
linear run collapser in the next patch. The idea is to have
a bunch of changelog walkers that return basic data. Then we
can filter this data. Finally we add edge and formatting info
suitable for the output media we want to target (glog, hgweb).
2009-06-19 13:44:23 +02:00
Peter Arrenbrecht
5eb219567b graphmod: rename a bunch of vars in graph() 2009-05-16 07:12:12 +02:00
Peter Arrenbrecht
e798ecda43 graphmod/graphlog: make dag walks carry data as type, payload 2009-06-19 13:22:32 +02:00
Peter Arrenbrecht
f70b873a2e graphlog: rename grapher to asciiedges 2009-05-16 07:12:12 +02:00
Peter Arrenbrecht
2a5e57ab1b graphlog: move and rename graphabledag to asciiformat 2009-05-16 07:11:41 +02:00
Peter Arrenbrecht
4f16f2b978 graphmod/graphlog: extract nodelistwalk 2009-06-19 13:14:45 +02:00
Peter Arrenbrecht
6b4a9cc835 graphmod/graphlog: move log walks to graphmod 2009-06-19 13:14:01 +02:00
Peter Arrenbrecht
46c6deb9d6 graphmod: code cleanup and doc fix 2009-05-14 17:32:31 +02:00
Dirkjan Ochtman
7daf0cc9cd merge: rename -S/--show option to -P/--preview 2009-06-19 13:58:48 +02:00
Dirkjan Ochtman
12ed4dc982 mq: unify code for qdel -r and qfin 2009-06-19 13:58:22 +02:00
Dirkjan Ochtman
d6eb9e3f55 mq: warn about finalizing patches without cset message 2009-06-19 12:37:29 +02:00
Matt Mackall
fed8f4af82 filemerge: add internal:dump
This create foo.{local,other,base} files for people to manually merge
files while littering their working directory.
2009-06-18 16:56:03 -05:00
Matt Mackall
48da4c1c20 filemerge: add internal:prompt target 2009-06-18 16:56:02 -05:00
Frank Kingswood
d0ec83933c convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Convert now handles errors from p4 during conversion more gracefully.
If keyword expansion is enabled in a P4 file then keywords will be
unexpanded in hg.
Added testcase for p4 filetypes and keyword (un)expansion.
This testcase ignores UTF and Apple files to avoid binary data.

Edited by pmezard: fixed collation issue on OSX
2009-06-18 10:39:04 +01:00
Chia-Huan Wu
085ef907eb i18n-zh_TW: Traditional Chinese translation 2009-06-18 21:13:56 +02:00
Martin Geisler
0dfb08009d patchbomb: update test output to match 51f46ab5ceb5 2009-06-18 15:04:20 +02:00
Cédric Duval
e9c53f7deb patchbomb: do not assume the presence of angle brackets around msg-id
RFC 5322 states:
  "Semantically, the angle bracket characters are not part of the
   msg-id; the msg-id is what is contained between the two angle bracket
   characters."

Hence it should be correct to pass a message Id with no angle brackets
to --in-reply-to. Adding them if missing.
2009-06-17 20:54:26 +02:00
Christian Ebert
623f4a4a00 keyword: concise help title 2009-06-18 01:21:26 +01:00
Cédric Duval
d66dcc4318 interhg: upgrade comments to online help and improve them
Some inspiration taken from the wiki page of the extension.
2009-06-18 08:18:52 +02:00
Cédric Duval
66894ecd9d churn: improve description
Thanks to Martin Geisler and timeless for the suggested improvements.
2009-06-16 22:24:46 +02:00
Cédric Duval
32cb7a3823 doc: fix regexp for determining the man page section
Preceding a .* pattern with an other dot serves little purpose,
better anchor the regexp to the start of the file name.
2009-06-10 19:59:44 +02:00
Greg Ward
7ad75fed52 Fix test-convert-cvsnt-mergepoints so it works reliably.
Specifically, always run 'cvs commit' with -f option to force commit;
add one strategic sleep which seems to be necessary for post-merge
clobber-and-commit (-f doesn't force a commit there?).
2009-06-15 20:35:19 -04:00
Greg Ward
2b10164cb6 test-convert-cvsnt-mergepoints: make it work on OS X.
- don't create file 'cvs' where directory 'CVS' already exists
2009-06-15 20:35:19 -04:00
Greg Ward
357a69bec3 test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12.
- factor out cvsci function (similar to other test-convert-cvs* scripts)
- add filterpath function (also similar to other scripts)
- generally munge the output of CVS
- add lots of output to make it easier to follow when things go wrong

This doesn't make the test pass reliably under CVS 1.11; it just makes
it behave the same as under CVS 1.12, i.e. sometimes it passes and
sometimes it fails.  Failure is more frequent with faster hardware.
2009-06-15 20:35:19 -04:00
Greg Ward
bc8b9b1849 Rename CVSNT "mergepoints" test and make it executable.
- rename test-convert-cvs-builtincvsps-cvsnt-mergepoints
  (and related files) to test-convert-cvsnt-mergepoints
- this ensures that the test will be run, but does NOT make
  it pass: in particularly, it fails regularly for me due
  to the inconsistent behaviour of CVS itself
- expect "Branchpoints:" in debugcvsps output
2009-06-15 20:35:19 -04:00
Colin Caughie
53aca7b1bf Fixed patch.eol bug that truncated all patched lines to one character
Also updated the import-eol test to test with lines longer than one character,
and also empty lines.
2009-06-16 16:22:42 +01:00
Matt Mackall
5870ebfbb8 subrepo: add a test 2009-06-15 02:51:10 -05:00
Matt Mackall
459bbfbb56 subrepo: basic push support 2009-06-15 02:46:20 -05:00
Matt Mackall
430046de97 subrepo: add update/merge logic 2009-06-15 02:45:38 -05:00