Patrick Mezard <pmezard@gmail.com> [Sun, 15 Jul 2007 14:57:20 +0200] rev 4883
Merge with crew-stable.
Patrick Mezard <pmezard@gmail.com> [Sun, 15 Jul 2007 14:09:56 +0200] rev 4882
test-symlink-basic: require symlinks availability
Patrick Mezard <pmezard@gmail.com> [Sat, 14 Jul 2007 18:34:06 +0200] rev 4881
Add hghave utility and run-tests.py support.
hghave detects system features like symlinks availability at run-time. Tests can be skipped by starting them with:
"$TESTDIR/hghave" symlink || exit 80
The 80 exit status triggers hghave output handling by run-tests.py. Also, tests output can be locally patched on the fly to match reference output.
Patrick Mezard <pmezard@gmail.com> [Sat, 14 Jul 2007 14:01:11 +0200] rev 4880
run-tests: extract correct status when script terminates with exit
Matt Mackall <mpm@selenic.com> [Sat, 14 Jul 2007 13:34:40 -0500] rev 4879
Merge with -stable
Matt Mackall <mpm@selenic.com> [Sat, 14 Jul 2007 12:44:47 -0500] rev 4878
diff: correctly handle combinations of whitespace options
Giorgos Keramidas <keramida@ceid.upatras.gr> [Mon, 09 Jul 2007 17:41:14 +0300] rev 4877
hg grep: handle re.compile errors & update tests/test-grep
Jesse Glick <jesse.glick@sun.com> [Thu, 12 Jul 2007 10:55:49 -0400] rev 4876
typo fix
jon.christopher@Rigaku.com [Sat, 14 Jul 2007 11:27:58 -0500] rev 4875
Re: mercurial.el and hg-version-other-window
hg-version-other window is unimplemented in mercurial.el. The version
below works for me, YMMV.
Christian Ebert <blacktrash@gmx.net> [Fri, 06 Jul 2007 12:02:43 +0200] rev 4874
Use isinstance instead of type == type
Brendan Cully <brendan@kublai.com> [Fri, 13 Jul 2007 08:28:57 -0700] rev 4873
convert: record the source revision in the changelog
Wesley J. Landaker <wjl@icecavern.net> [Thu, 12 Jul 2007 22:55:44 -0700] rev 4872
Use wsgi.url_scheme instead of ad-hoc CGI checks.
Instead of each place in hgweb_mod that needs to check for SSL or get
the protocol scheme (http vs. https) doing it ad-hoc, make them just
look at the wsgi.url_scheme which because of previous patches is now
always set correctly.
Brendan Cully <brendan@kublai.com> [Thu, 12 Jul 2007 22:44:16 -0700] rev 4871
cosmetics
Wesley J. Landaker <wjl@icecavern.net> [Thu, 12 Jul 2007 13:58:36 -0600] rev 4870
Make hg serve set the wsgi.url_scheme property correctly.
This fixes the bug where hg serve with SSL will always detect the wrong
urlbase for templates. This is also part of unifying the CGI interface
and hg serve interface to both use standard wsgi.
Wesley J. Landaker <wjl@icecavern.net> [Thu, 12 Jul 2007 13:55:20 -0600] rev 4869
Handle CGI SSL detection via HTTPS environment better.
Some servers send on/off, 0/1, yes/no, and may be upper or lower case.
This fix will handle all of those permutations. It was inspired by the
detection done in in some other wsgi python web applications I looked at.
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