Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 20:15:03 -0300] rev 4868
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 19:56:16 -0300] rev 4867
archive: make the %r escape work.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 19:56:16 -0300] rev 4866
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.
Edouard Gomez <ed.gomez@free.fr> [Sat, 12 May 2007 00:41:30 +0200] rev 4865
Fix inconsistency for the stream_out capability in hgweb
During some experiments of mine, the uncompressed cloning could not
be enabled for hgweb.cgi nor hgwebdir.cgi though the server claimed
to be stream_out capable.
The only solution was to enable it using the user's .hgrc file.
This solution is not acceptable when publishing the repos through
an HTTP server because the CGI runs as a www dedicated user whose's
home hgrc file may not be accessible to users publishing their repos
through their userdir.
For such cases we could end up with this typical debug output:
hg --debug clone --uncompressed http://server/hg/project
destination directory: project
sending capabilities command
capabilities: lookup changegroupsubset stream=1
unbundle=HG10GZ,HG10BZ,HG10UN
sending stream_out command
abort: operation forbidden by server
The error lies in the fact the hgweb object defines new accessors
to the repo configuration that trust things by default (untrusted=True)
but the streamclone:stream_out function uses the usual accessors to the
repo.ui object, which do not trust by default (untrusted=False)
Fix this inconsistency, adding a new parameter to the stream_out function.
hgweb then forces a "trust by default" behavior.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 19:56:16 -0300] rev 4864
improve warning for hg add foo; hg mv foo bar
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 18:15:21 -0300] rev 4863
util._hgexecutable: default to 'hg'
This should make hooks work even if util.set_hgexecutable is not called
(e.g. hgweb.cgi).
Fixes issue625.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 17:40:41 -0300] rev 4862
archive: add symlink support
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 17:40:41 -0300] rev 4861
archive: use util.opener when archiving files.
This simplifies the code a bit and makes it easier to support symlinks.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 17:40:41 -0300] rev 4860
localrepo.wwrite: use opener.symlink
This makes us fall back to regular files if symlinks are not supported.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 17:40:41 -0300] rev 4859
Add symlink method to util.opener.
Differences from os.symlink:
- the symlink name is relative to the opener base directory
- if a file with that name already exists, it's removed
- if necessary, parent directories are created
- if the system (OS or filesystem) doesn't support symlinks, a
regular file is created. Its contents are the symlink target.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 17:40:41 -0300] rev 4858
turn util.opener into a class
Wesley J. Landaker <wjl@icecavern.net> [Tue, 10 Jul 2007 10:54:54 -0600] rev 4857
Make {urlbase} work in templates when https is used.
Brendan Cully <brendan@kublai.com> [Wed, 11 Jul 2007 00:53:44 -0700] rev 4856
replace .hgtags instead of appending to it when doing a raw commit
Brendan Cully <brendan@kublai.com> [Wed, 11 Jul 2007 00:34:35 -0700] rev 4855
handle nonexistent .hgtags in raw _tag
Brendan Cully <brendan@kublai.com> [Wed, 11 Jul 2007 00:04:15 -0700] rev 4854
Export extra in _tag so convert can set the branch of a tag
Brendan Cully <brendan@kublai.com> [Tue, 10 Jul 2007 10:06:24 -0700] rev 4853
archive: abort on empty repository. Fixes #624.
Brendan Cully <brendan@kublai.com> [Tue, 10 Jul 2007 09:52:32 -0700] rev 4852
mq: improve qclone error handling when patch directory is not a repository.
Lee Cantey <lcantey@gmail.com> [Mon, 09 Jul 2007 22:35:10 -0700] rev 4851
Fix test-debugcomplete for new --certificate option
Brendan Cully <brendan@kublai.com> [Mon, 09 Jul 2007 22:12:28 -0700] rev 4850
Add SSL support to hg serve, activated via --certificate option
Lee Cantey <lcantey@gmail.com> [Mon, 09 Jul 2007 10:59:49 -0700] rev 4849
Correct inadvertent line ending change.
Lee Cantey <lcantey@gmail.com> [Mon, 09 Jul 2007 10:46:41 -0700] rev 4848
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.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Jul 2007 19:59:02 +0200] rev 4847
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.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 08 Jul 2007 19:46:04 +0200] rev 4846
Allow filectx.annotate to return the line number of first appearance.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Jul 2007 13:44:41 +0200] rev 4845
Check for conflict markers in hgmerge (issue471)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Jul 2007 12:59:58 +0200] rev 4844
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Jul 2007 12:58:19 +0200] rev 4843
Fixed double slash for doc install path introduced by using $DESTDIR (issue620)
$MANDIR already is an absolute path so the extra / isn't needed.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Jul 2007 12:52:08 +0200] rev 4842
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.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Jul 2007 10:43:57 +0200] rev 4841
Strip whitespace from changeset description in changeset_templater.
changeset_printer already does this, too.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Jul 2007 09:54:42 +0200] rev 4840
Removed deprecated hg:// and old-http:// protocols (issue406)
Brendan Cully <brendan@kublai.com> [Sat, 07 Jul 2007 21:55:56 -0700] rev 4839
hgwebdir: check for repo foo before browsing subdirectories of foo/
Brendan Cully <brendan@kublai.com> [Sat, 07 Jul 2007 15:09:28 -0700] rev 4838
Merge with crew
Brendan Cully <brendan@kublai.com> [Sat, 07 Jul 2007 15:09:08 -0700] rev 4837
hgweb: browse subdirectories before checking whether parent directory is also a repository
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Jul 2007 20:52:31 +0200] rev 4836
Use a prefix for debuginstall tempfiles.
This way you know where the files came from if they don't get removed.
Brendan Cully <brendan@kublai.com> [Fri, 06 Jul 2007 10:29:09 -0700] rev 4835
python 2.3 does not have sorted
Brendan Cully <brendan@kublai.com> [Fri, 06 Jul 2007 10:22:22 -0700] rev 4834
Sort changelog extra dict to avoid possible nondeterminism
Brendan Cully <brendan@kublai.com> [Fri, 06 Jul 2007 10:11:48 -0700] rev 4833
Last change broke new-style URLs
Brendan Cully <brendan@kublai.com> [Fri, 06 Jul 2007 09:15:17 -0700] rev 4832
hgwebdir: do not walk up the given path looking for a repository. It is there or it isn't.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 06 Jul 2007 08:55:36 +0200] rev 4831
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 06 Jul 2007 08:48:28 +0200] rev 4830
merge with crew-stable
Lee Cantey <lcantey@gmail.com> [Thu, 05 Jul 2007 15:40:29 -0700] rev 4829
Add html docs and use for help shortcut
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 19:56:16 -0700] rev 4828
hgwebdir: show only trailing part of path when browsing subdirectories
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 19:47:04 -0700] rev 4827
gitweb: add notfound template
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 19:44:06 -0700] rev 4826
hgweb: let hgwebdir browse subdirectories
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 16:14:01 -0700] rev 4825
convert: svn code movement (no actual changes)
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 15:01:31 -0700] rev 4824
convert: svn: avoid parsing already-seen logentries due to branch following
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 14:32:18 -0700] rev 4823
Merge with main
Matt Mackall <mpm@selenic.com> [Thu, 05 Jul 2007 16:17:01 -0500] rev 4822
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 05 Jul 2007 16:15:57 -0500] rev 4821
Merge with crew-stable
Matt Mackall <mpm@selenic.com> [Thu, 05 Jul 2007 16:01:07 -0500] rev 4820
merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
Matt Mackall <mpm@selenic.com> [Thu, 05 Jul 2007 15:37:23 -0500] rev 4819
extensions: untangle some recursive dependencies
OHASHI Hideya <ohachige@gmail.com> [Tue, 03 Jul 2007 00:13:52 +0900] rev 4818
interhg extension allows you to change changelog text like InterWiki.
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Jun 2007 02:11:54 +0200] rev 4817
setup.py not executable: change instructions at beginning of file
Matt Mackall <mpm@selenic.com> [Thu, 05 Jul 2007 15:36:56 -0500] rev 4816
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 05 Jul 2007 13:34:18 -0500] rev 4815
merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 14:31:13 -0700] rev 4814
convert: svn: some improvements in memory usage
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 12:45:41 -0700] rev 4813
convert: svn: remove svn_paths wrappers