Commit Graph

4854 Commits

Author SHA1 Message Date
Alexis S. L. Carvalho
05dd580e30 merge with crew-stable 2007-07-11 20:15:03 -03:00
Alexis S. L. Carvalho
e4f786c463 archive: make the %r escape work. 2007-07-11 19:56:16 -03:00
Alexis S. L. Carvalho
3b07689b6a serve: respect settings from .hg/hgrc
create_server was looking only at the root ui object, ignoring any
settings from .hg/hgrc.  To keep respecting command-line arguments,
commands.serve must also call repo.ui.setconfig.
2007-07-11 19:56:16 -03:00
Wesley J. Landaker
034dcaed92 Make {urlbase} work in templates when https is used. 2007-07-10 10:54:54 -06:00
Brendan Cully
cd69031532 replace .hgtags instead of appending to it when doing a raw commit 2007-07-11 00:53:44 -07:00
Brendan Cully
c685e57a99 handle nonexistent .hgtags in raw _tag 2007-07-11 00:34:35 -07:00
Brendan Cully
7530fee196 Export extra in _tag so convert can set the branch of a tag 2007-07-11 00:04:15 -07:00
Brendan Cully
5421e55633 archive: abort on empty repository. Fixes #624. 2007-07-10 10:06:24 -07:00
Brendan Cully
98b8fae908 mq: improve qclone error handling when patch directory is not a repository. 2007-07-10 09:52:32 -07:00
Lee Cantey
04ba8da4cb Fix test-debugcomplete for new --certificate option 2007-07-09 22:35:10 -07:00
Brendan Cully
4654693aa4 Add SSL support to hg serve, activated via --certificate option 2007-07-09 22:12:28 -07:00
Lee Cantey
1515fb9031 Correct inadvertent line ending change. 2007-07-09 10:59:49 -07:00
Lee Cantey
244b7b7c94 Fix for win32text corrupting files that have CRLF line endings. (issue302)
Also generate a warning when encountering this condition.

From Shun-ichi Goto in attachment win32text-patch3.txt for issue 302.
2007-07-09 10:46:41 -07:00
Thomas Arendsen Hein
5a9970a155 Add --line-number option to hg annotate (issue506)
Line numbers are separated from the last annotation element with a colon,
like with many other commands, e.g. (hg) grep or compiler errors.

Idea and tests by FUJIWARA Katsunori.
2007-07-08 19:59:02 +02:00
FUJIWARA Katsunori
03774e057f Allow filectx.annotate to return the line number of first appearance. 2007-07-08 19:46:04 +02:00
Thomas Arendsen Hein
5501bd63c6 Check for conflict markers in hgmerge (issue471) 2007-07-08 13:44:41 +02:00
Thomas Arendsen Hein
a5d49326c9 merge with crew-stable 2007-07-08 12:59:58 +02:00
Thomas Arendsen Hein
28e90ca5c4 Fixed double slash for doc install path introduced by using $DESTDIR (issue620)
$MANDIR already is an absolute path so the extra / isn't needed.
2007-07-08 12:58:19 +02:00
Thomas Arendsen Hein
898f48cc24 hg log: Move filtering implicit parents to own method and use it in templater.
Extended test repo in test-command-template to contain changeset to test this.
2007-07-08 12:52:08 +02:00
Thomas Arendsen Hein
a0ef6536ad Strip whitespace from changeset description in changeset_templater.
changeset_printer already does this, too.
2007-07-08 10:43:57 +02:00
Thomas Arendsen Hein
d486a44410 Removed deprecated hg:// and old-http:// protocols (issue406) 2007-07-08 09:54:42 +02:00
Brendan Cully
d2d845d908 hgwebdir: check for repo foo before browsing subdirectories of foo/ 2007-07-07 21:55:56 -07:00
Brendan Cully
61aceec68e Merge with crew 2007-07-07 15:09:28 -07:00
Brendan Cully
5d30097ec4 hgweb: browse subdirectories before checking whether parent directory is also a repository 2007-07-07 15:09:08 -07:00
Thomas Arendsen Hein
78616ff36e Use a prefix for debuginstall tempfiles.
This way you know where the files came from if they don't get removed.
2007-07-07 20:52:31 +02:00
Brendan Cully
864d59c393 python 2.3 does not have sorted 2007-07-06 10:29:09 -07:00
Brendan Cully
ee78cfbb39 Sort changelog extra dict to avoid possible nondeterminism 2007-07-06 10:22:22 -07:00
Brendan Cully
4750025032 Last change broke new-style URLs 2007-07-06 10:11:48 -07:00
Brendan Cully
d31b7d1fa4 hgwebdir: do not walk up the given path looking for a repository. It is there or it isn't. 2007-07-06 09:15:17 -07:00
Thomas Arendsen Hein
e7f3af8440 merge with crew-stable 2007-07-06 08:55:36 +02:00
Thomas Arendsen Hein
ef171537f6 merge with crew-stable 2007-07-06 08:48:28 +02:00
Brendan Cully
2216ff4225 hgwebdir: show only trailing part of path when browsing subdirectories 2007-07-05 19:56:16 -07:00
Brendan Cully
4a11a49eda gitweb: add notfound template 2007-07-05 19:47:04 -07:00
Brendan Cully
10f4d33bdf hgweb: let hgwebdir browse subdirectories 2007-07-05 19:44:06 -07:00
Brendan Cully
27d64c4447 convert: svn code movement (no actual changes) 2007-07-05 16:14:01 -07:00
Lee Cantey
b7b57a0fbc Add html docs and use for help shortcut 2007-07-05 15:40:29 -07:00
Brendan Cully
58d7e42923 convert: svn: avoid parsing already-seen logentries due to branch following 2007-07-05 15:01:31 -07:00
Brendan Cully
ed4c3cf173 Merge with main 2007-07-05 14:32:18 -07:00
Brendan Cully
24a607c530 convert: svn: some improvements in memory usage 2007-07-05 14:31:13 -07:00
Matt Mackall
e3e7be0bf0 Merge with stable 2007-07-05 16:17:01 -05:00
Matt Mackall
aa6e63596e Merge with crew-stable 2007-07-05 16:15:57 -05:00
Matt Mackall
d00f8a1d6c merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
2007-07-05 16:01:07 -05:00
Matt Mackall
dc9134201b extensions: untangle some recursive dependencies 2007-07-05 15:37:23 -05:00
Brendan Cully
ddffa36984 convert: svn: remove svn_paths wrappers 2007-07-05 12:45:41 -07:00
Brendan Cully
d1cc733573 convert: svn: use revmap to parse only new revisions in incremental conversions 2007-07-05 12:41:58 -07:00
Brendan Cully
39cf515050 convert: export revmap to source.
Sources may be able to use it to optimise their own log fetching
2007-07-05 12:24:26 -07:00
Brendan Cully
6209ccf2e8 convert: svn: defer get_log parsing until after get_log completes.
According to the documentation, it is not safe to perform any other
operation on the ra object until get_log completes.
2007-07-05 12:18:01 -07:00
Brendan Cully
d2a6fef145 convert: move some code into common init function 2007-07-05 12:08:48 -07:00
Brendan Cully
af7fe0cb7b Merge with crew 2007-07-05 12:00:43 -07:00
Brendan Cully
6417597754 alias: remove dead code 2007-07-05 12:00:26 -07:00