Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Jul 2007 09:08:29 -0300] rev 4895
convert: manually set encoding to UTF-8
Right now the backends assume we're working in UTF-8 and there's
no good way to ignore the encoding when adding revisions.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Jul 2007 09:08:29 -0300] rev 4894
hg parents: don't pass an OS-specific path to repo.filectx
The only reason to use the matcher code instead of calling util.canonpath
directly is to be able to use "path:canonical/path/to/file" patterns.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Jul 2007 08:22:43 +0200] rev 4893
merge with main
Bryan O'Sullivan <bos@serpentine.com> [Mon, 16 Jul 2007 20:15:03 -0700] rev 4892
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
This also fixes an asymmetry bug in which we called the pretag hook if we
were going to create a local tag, but didn't call the tag hook afterwards.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 16 Jul 2007 18:01:20 -0700] rev 4891
issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com> [Mon, 16 Jul 2007 16:50:47 -0700] rev 4890
mq: autodetect an existing git patch during qrefresh (issue 491)
Matt Mackall <mpm@selenic.com> [Mon, 16 Jul 2007 17:39:03 -0500] rev 4889
contexts: improve filectx eq test
Matt Mackall <mpm@selenic.com> [Mon, 16 Jul 2007 17:30:34 -0500] rev 4888
Merge with -stable
Bryan O'Sullivan <bos@serpentine.com> [Mon, 16 Jul 2007 14:43:47 -0700] rev 4887
patchbomb: add --desc, to specify a file containing a series description
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 15 Jul 2007 21:05:38 +0200] rev 4886
merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 15 Jul 2007 14:57:20 +0200] rev 4885
Merge with crew-stable.
Matt Mackall <mpm@selenic.com> [Sun, 15 Jul 2007 14:43:38 -0500] rev 4884
merge: fix unnecessary rename merges on linear update (issue631)
If one side's revision is identical to the ancestor, we skip the rest
of the copy detection logic.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 15 Jul 2007 21:04:07 +0200] rev 4883
convert: Use clone's behaviour for the default destionation name.
Adjusted the documentation for this and for the fact that the destionation is
created even if a name is specified.
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
Wesley J. Landaker <wjl@icecavern.net> [Tue, 10 Jul 2007 10:54:54 -0600] rev 4867
Make {urlbase} work in templates when https is used.
Brendan Cully <brendan@kublai.com> [Wed, 11 Jul 2007 00:53:44 -0700] rev 4866
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 4865
handle nonexistent .hgtags in raw _tag
Brendan Cully <brendan@kublai.com> [Wed, 11 Jul 2007 00:04:15 -0700] rev 4864
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 4863
archive: abort on empty repository. Fixes #624.
Brendan Cully <brendan@kublai.com> [Tue, 10 Jul 2007 09:52:32 -0700] rev 4862
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 4861
Fix test-debugcomplete for new --certificate option
Brendan Cully <brendan@kublai.com> [Mon, 09 Jul 2007 22:12:28 -0700] rev 4860
Add SSL support to hg serve, activated via --certificate option
Lee Cantey <lcantey@gmail.com> [Mon, 09 Jul 2007 10:59:49 -0700] rev 4859
Correct inadvertent line ending change.
Lee Cantey <lcantey@gmail.com> [Mon, 09 Jul 2007 10:46:41 -0700] rev 4858
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 4857
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 4856
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 4855
Check for conflict markers in hgmerge (issue471)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Jul 2007 12:59:58 +0200] rev 4854
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Jul 2007 09:54:42 +0200] rev 4853
Removed deprecated hg:// and old-http:// protocols (issue406)
Brendan Cully <brendan@kublai.com> [Sat, 07 Jul 2007 21:55:56 -0700] rev 4852
hgwebdir: check for repo foo before browsing subdirectories of foo/
Brendan Cully <brendan@kublai.com> [Sat, 07 Jul 2007 15:09:28 -0700] rev 4851
Merge with crew
Brendan Cully <brendan@kublai.com> [Sat, 07 Jul 2007 15:09:08 -0700] rev 4850
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 4849
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 4848
python 2.3 does not have sorted
Brendan Cully <brendan@kublai.com> [Fri, 06 Jul 2007 10:22:22 -0700] rev 4847
Sort changelog extra dict to avoid possible nondeterminism
Brendan Cully <brendan@kublai.com> [Fri, 06 Jul 2007 10:11:48 -0700] rev 4846
Last change broke new-style URLs
Brendan Cully <brendan@kublai.com> [Fri, 06 Jul 2007 09:15:17 -0700] rev 4845
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 4844
merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 19:56:16 -0700] rev 4843
hgwebdir: show only trailing part of path when browsing subdirectories
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 19:47:04 -0700] rev 4842
gitweb: add notfound template
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 19:44:06 -0700] rev 4841
hgweb: let hgwebdir browse subdirectories
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 16:14:01 -0700] rev 4840
convert: svn code movement (no actual changes)
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 15:01:31 -0700] rev 4839
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 4838
Merge with main
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 14:31:13 -0700] rev 4837
convert: svn: some improvements in memory usage
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 19:56:16 -0300] rev 4836
archive: make the %r escape work.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 11 Jul 2007 19:56:16 -0300] rev 4835
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 4834
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 4833
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 4832
util._hgexecutable: default to 'hg'
This should make hooks work even if util.set_hgexecutable is not called
(e.g. hgweb.cgi).
Fixes issue625.