Matt Mackall <mpm@selenic.com> [Sat, 09 Oct 2010 14:50:20 -0500] rev 12664
merge: handle no file parent in backwards merge (issue2364)
Matt Mackall <mpm@selenic.com> [Sat, 09 Oct 2010 14:52:58 -0500] rev 12663
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 12:28:16 -0500] rev 12662
ui.paths: expand paths directly in fixconfig (issue2373)
var and home expansion should be done first.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 17 Aug 2010 15:44:38 +0200] rev 12661
setup/hg: always load Mercurial from where it was installed.
This provides two new features:
- Mercurial may be installed into a non-standard location without
having to set PYTHONPATH.
- Multiple installations can use Mercurial from different locations.
Brodie Rao <brodie@bitheap.org> [Sat, 09 Oct 2010 11:55:25 -0500] rev 12660
revsets: add a sample query to the help for getting active branches
Brodie Rao <brodie@bitheap.org> [Sat, 09 Oct 2010 11:54:42 -0500] rev 12659
revsets: add descriptions for sample queries in the help
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 09 Oct 2010 11:53:48 -0500] rev 12658
mq: silence spurious output.
When using a versioned patch repository, you would get a spurious
warning when deleting and adding the same patch.
Before:
$ hg qdelete --keep 3.diff
$ hg qimport --existing 3.diff
adding 3.diff to series file
3.diff already tracked!
After:
$ hg qdelete --keep 3.diff
$ hg qimport --existing 3.diff
adding 3.diff to series file
Brodie Rao <brodie@bitheap.org> [Sat, 09 Oct 2010 11:27:29 -0500] rev 12657
revsets: clarify in the help that head() returns named branch heads
Adrian Buehlmann <adrian@cadifra.com> [Sat, 09 Oct 2010 11:16:35 +0200] rev 12656
tests: add testcase for 208fc9ad6a48 to test-alias.t
The testsuite lacks a testcase for the bug introduced in 208fc9ad6a48.
This patch amends 301d7626e0ff (which fixed 208fc9ad6a48) by adding a
testcase for that bug.
With 208fc9ad6a48, test-alias.t (as modified by this patch) fails
with "hg tglog: invalid arguments".
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 09 Oct 2010 10:36:50 -0500] rev 12655
mq: handle deleting the same patch twice in one command (issue2427)
Augie Fackler <durin42@gmail.com> [Sat, 09 Oct 2010 09:55:52 -0500] rev 12654
progress: make sure stderr has isatty before calling (issue2191)
Benjamin Pollack <benjamin@bitquabit.com> [Sat, 09 Oct 2010 18:04:36 +0200] rev 12653
windows: handle spaces in path to Python (issue2074)
Martin Geisler <mg@lazybytes.net> [Fri, 08 Oct 2010 23:23:49 +0200] rev 12652
minirst: pull admonition titles out formatblock function
Martin Geisler <mg@lazybytes.net> [Fri, 08 Oct 2010 23:19:26 +0200] rev 12651
minirst: refactor/simplify findblocks
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 09 Oct 2010 15:41:53 +0200] rev 12650
inotify: raise correct error if server is already started in a deep repository
When path is too long to be an Unix socket address, we create a socket in a
temporary directory and link from the long path to the shorter one.
But checks in server code at startup were insufficient in this case, and used
to raise an unclear "tried linking .hg/inotify.sock to a temporary socket but
.hg/inotify.sock already exists"
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 08 Oct 2010 21:43:21 +0200] rev 12649
setup: user-friendly error message if Python headers are missing
Mads Kiilerich <mads@kiilerich.com> [Sat, 09 Oct 2010 07:13:51 -0500] rev 12648
test-keyword: ignore subject in notify hook mails
Long tmpdir names caused truncation of subject anyway, and that made $TESTTMP
replacement fail.
Mads Kiilerich <mads@kiilerich.com> [Sat, 09 Oct 2010 07:13:49 -0500] rev 12647
test-keyword: fix test glob to ACL/SELinux flag
Mads Kiilerich <mads@kiilerich.com> [Sat, 09 Oct 2010 07:13:47 -0500] rev 12646
test-notify: fix fix for line continuation in long mail header lines
Continued lines can also start with space.
Note that this hack also incorrectly patches the diff output.
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 23:39:44 -0500] rev 12645
import: don't strip '#' lines from patch descriptions (issue 2417)
Previously no '# ' lines came through the parser.
Now only the first '# ' lines are processed, from '# HG changeset patch' and to
the first line not starting with '# '.
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:11 -0500] rev 12644
test-notify: stabilize output
test-notify is made a bit more stable by stripping "all" folders away instead
of just 3.
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:11 -0500] rev 12643
tests: reintroduce ":$HGPORT" in test output
This reduces the number of patterns that must be adjusted when writing tests.
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:11 -0500] rev 12642
tests: remove the last traces of $HGTMP
$HGTMP isn't needed - and if we need something like that then $TESTTMP is more
appropriate.
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:10 -0500] rev 12641
tests: remove filtertmp.py and helpers.sh
These nice starts ended up being replaced with globs.
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:10 -0500] rev 12640
tests: remove redundant globs
Many globs now just match $TESTTMP and is no longer needed.
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:10 -0500] rev 12639
tests: replace test tmp directory with $TESTTMP in test output
This reduces the number of patterns that must be adjusted when writing tests.
Matt Mackall <mpm@selenic.com> [Fri, 08 Oct 2010 20:12:40 -0500] rev 12638
keyword: fix test glob
Brodie Rao <brodie@bitheap.org> [Mon, 04 Oct 2010 15:07:12 -0500] rev 12637
dispatch: properly handle relative path aliases used with -R (issue2376)
This ensures the repo config is read relative to the repo root during
dispatch.
Brodie Rao <brodie@bitheap.org> [Mon, 04 Oct 2010 14:26:38 -0500] rev 12636
dispatch: remove superfluous try/except when reading local ui config
ui.readconfig() already handles IOError in this case.
Brodie Rao <brodie@bitheap.org> [Mon, 04 Oct 2010 14:26:37 -0500] rev 12635
test-globalopts: test hg -R file:// and hg -R path-alias
Eduard-Cristian Stefan <alexandrul.ct@gmail.com> [Wed, 06 Oct 2010 23:07:52 +0300] rev 12634
hgk: remember main window position
Steve Losh <steve@stevelosh.com> [Fri, 08 Oct 2010 16:10:00 -0400] rev 12633
alias: back up and restore commands.norepo before checking for shell aliases
Brodie Rao <brodie@bitheap.org> [Fri, 08 Oct 2010 16:08:46 -0500] rev 12632
tests: unify test-check-code
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12631
keyword: switch kwtemplater.record in kw_dorecord()
Obsoletes the need for a global recordcommands variable.
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12630
keyword: specific regular expressions depending on read mode
More safeguarding against accidental (un)expansion:
Reading filelog: act only on \$(kw1|kw2|..)\$ as keywords are always
stored unexpanded.
Reading wdir: act only on \$(kw1|kw2|..): [^$\n\r]*? \$ as we only
are interested in expanded keywords in this situation.
Note: we cannot use ..): [^$\n\r]+? \$ because e.g.
the {branch} template might be empty.
hg record is a special case as we read from the working directory and
need one regex each for modified and added files. Therefore test
recording an added file.
This way we finally also forbid sequences like $Id: $ being treated
as keywords.
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12629
test-keyword: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12628
keyword: disable expansion in kwfilelog.read() if file renamed in node
Simplifies kwfilelog.cmp() and avoids fiddling with/importing revlog.
Reorder imports alphabetically.
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12627
keyword: make iskwfile() a weeding method in lieu of a boolean
Update iskwfile docstring.
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12626
keyword: support copy and rename
copy/rename destinations being unversioned and possibly ignored by
the extension should not contain expanded keywords.
Files copied/renamed from an ignored source are not touched.
Add tests covering both of the above cases, plus the corner case of
cp symlink foo; hg cp -A symlink foo (where foo becomes a regular file).
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Oct 2010 18:39:46 +0100] rev 12625
keyword: refactor kwtemplater.overwrite()
Make kwexpand, kwshrink restricted commands - i.e. read from
filelog without expansion for substition in kwtemplater.overwrite,
and set/unset restricted mode for overwrite() in in kwcommitctx
and the dorecord wrapper.
Preselect candidates when working on changed files (rollback, record)
outside kwtemplater class, and remove 6th argument from overwrite().
Avoid duplicate substitution/search in overwrite():
Only go into restricted read mode when reading from filelog.
rollback and record read from the working directory, where
restricted mode would already shrink keywords before overwrite()
either expands or shrinks them again.
This ensures that the usual automatic operations on keywords
are turned off during overwrite() and only overwrite() itself
acts on them.
Reduce manifest calculation to the cases where it is needed.
Move helper function for expansion removal outside kwtemplater class.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Oct 2010 18:00:19 -0500] rev 12624
revlog.addgroup(): always use _addrevision() to add new revlog entries
This makes parentdelta clone support pulling.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Oct 2010 18:00:16 -0500] rev 12623
revlog._addrevision(): allow text argument to be None, build it lazily
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 08 Oct 2010 18:00:15 -0500] rev 12622
changegroupsubset: use readdelta() fast path when delta is against a parent
Patrick Mezard <pmezard@gmail.com> [Fri, 08 Oct 2010 17:00:38 -0500] rev 12621
run-tests: handle .tst not ending with an LF
Martin Geisler <mg@lazybytes.net> [Fri, 08 Oct 2010 22:42:32 +0200] rev 12620
minirst: small code cleanup
Brodie Rao <brodie@bitheap.org> [Fri, 08 Oct 2010 14:02:23 -0500] rev 12619
cat: fix cat without -r, broken by 0ae35296fbf4
The default revision for revsingle() is now '.' instead of None. This
preserves the behavior of cat prior to it using revsingle().
Matt Mackall <mpm@selenic.com> [Thu, 07 Oct 2010 18:24:29 -0500] rev 12618
revsets: introduce revsingle helper
revsingle returns a context for the last revision of the supplied revspec
Matt Mackall <mpm@selenic.com> [Thu, 07 Oct 2010 18:05:04 -0500] rev 12617
revsets: make revpair revsets-aware
revpair returns the first and last members of the computed revset(s)
Matt Mackall <mpm@selenic.com> [Thu, 07 Oct 2010 11:45:17 -0500] rev 12616
revset: lower precedence of minus infix (issue2361)
Henrik Stuart <hg@hstuart.dk> [Tue, 05 Oct 2010 20:25:51 +0200] rev 12615
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Tue, 05 Oct 2010 11:34:13 +0200] rev 12614
revset: fix #branch in urls for outgoing()
hg log -r 'outgoing(..)' ignored #branch in some cases.
This patch fixes it.
The cases where it misbehaved are now covered by the added
test-revset-outgoing.t
Martin Geisler <mg@lazybytes.net> [Fri, 01 Oct 2010 23:16:11 +0200] rev 12613
heads: mention STARTREV in synopsis and help for --rev
Before this change, "hg help heads" said
hg heads [-ac] [-r REV] [REV]...
[...]
If STARTREV is specified, only those heads that are descendants
of STARTREV will be displayed.
[...]
-r --rev REV show only heads which are descendants of REV
[...]
which made little sense since there are two things called REV in the
synopsis and nothing called STARTREV.
A little digging reveals that the "[-r REV]" part of the synopsis was
introduced in 8e503fa54d2d, changed to "[-r STARTREV]" in
2bcef677a6c3, and then changed back to "[-r REV]" in 4b02fc71bbba.
The last change seems to be based on a patch[1] on our mailinglist
that actually *inserted* STARTREV again in the help for the command
line option itself. For some reason, the patch was changed to remove
STARTREV from the synopsis.
This change finally makes the help consistent by putting STARTREV back
into the help in all places where it is needed:
hg heads [-ac] [-r STARTREV] [REV]...
[...]
If STARTREV is specified, only those heads that are descendants
of STARTREV will be displayed.
[...]
-r --rev STARTREV show only heads which are descendants of STARTREV
[...]
This was not possible until 40c06bbf58be, which introduced the
possibility of naming the meta variables for each option.
[1]: http://mercurial.markmail.org/message/qgc55gd4fam4ogvz
Matt Mackall <mpm@selenic.com> [Fri, 01 Oct 2010 10:29:33 -0500] rev 12612
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Oct 2010 10:18:57 -0500] rev 12611
Added signature for changeset 93d8bff78c96
Matt Mackall <mpm@selenic.com> [Fri, 01 Oct 2010 10:18:53 -0500] rev 12610
Added tag 1.6.4 for changeset 93d8bff78c96
Matt Mackall <mpm@selenic.com> [Fri, 01 Oct 2010 10:16:52 -0500] rev 12609
merge with i18n
Adrian Buehlmann <adrian@cadifra.com> [Fri, 01 Oct 2010 16:10:06 +0200] rev 12608
tests: unify test-rebase*
Martin Geisler <mg@aragost.com> [Fri, 01 Oct 2010 16:43:03 +0200] rev 12607
merge with stable
Martin Geisler <mg@aragost.com> [Fri, 01 Oct 2010 16:39:55 +0200] rev 12606
test-url: refactor with shorter lines
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 12605
keyword: use workingctx to detect modified and added files after rollback
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 12604
keyword: rename variable "cfiles" to "changed" for clarity
Brodie Rao <brodie@bitheap.org> [Mon, 27 Sep 2010 13:13:34 -0500] rev 12603
tests: unify test-casefolding
Martin Geisler <mg@aragost.com> [Fri, 01 Oct 2010 16:08:46 +0200] rev 12602
url: mark certificate error string for translation
Wagner Bruna <wbruna@yahoo.com> [Fri, 01 Oct 2010 11:15:19 -0300] rev 12601
i18n-pt_BR: synchronized with f2937d6492c5
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 01 Oct 2010 11:15:10 -0300] rev 12600
merge with i18n stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 Oct 2010 17:24:18 +0900] rev 12599
i18n-ja: synchronized with e356c5c21b15
Matt Mackall <mpm@selenic.com> [Thu, 30 Sep 2010 19:10:19 -0500] rev 12598
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 30 Sep 2010 19:09:58 -0500] rev 12597
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 30 Sep 2010 14:07:57 -0300] rev 12596
i18n-pt_BR: synchronized with 552e0cfbddbd
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Oct 2010 00:54:03 +0200] rev 12595
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Oct 2010 00:48:51 +0200] rev 12594
test-doctest: test the modules that contains doctests
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Oct 2010 00:48:50 +0200] rev 12593
doc: clarify that https cert verification requires web.cacerts
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Oct 2010 00:46:59 +0200] rev 12592
url: verify correctness of https server certificates (issue2407)
Pythons SSL module verifies that certificates received for HTTPS are valid
according to the specified cacerts, but it doesn't verify that the certificate
is for the host we connect to.
We now explicitly verify that the commonName in the received certificate
matches the requested hostname and is valid for the time being.
This is a minimal patch where we try to fail to the safe side, but we do still
rely on Python's SSL functionality and do not try to implement the standards
fully and correctly. CRLs and subjectAltName are not handled and proxies
haven't been considered.
This change might break connections to some sites if cacerts is specified and
the certificates (by our definition) isn't correct. The workaround is to
disable cacerts which in most cases isn't much worse than it was before with
cacerts.
Erik Zielke <ez@aragost.com> [Thu, 30 Sep 2010 13:38:21 +0200] rev 12591
test-subrepo-recursion: remove empty defaults section
Erik Zielke <ez@aragost.com> [Thu, 30 Sep 2010 12:37:45 +0200] rev 12590
mq: Removed extra ... in short help for qdelete
Update to 57ad5c4e4213, which left a ... too much, after removing
-r [REV]
Erik Zielke <ez@aragost.com> [Mon, 27 Sep 2010 11:27:58 +0200] rev 12589
mq: removed short option in help for deprecated options
Removed help for deprecated short option for:
-n NAME for qpush
-n NAME for qpop
-r REV for qdelete|qremove|qrm
Erik Zielke <ez@aragost.com> [Tue, 28 Sep 2010 13:09:22 +0200] rev 12588
test-subrepo-recursion: deleted default arguments
Deleted default arguments from test-sub-repo-recursion. Rationale is
that it is confusing to read, when the arguments aren't at each
command in the test
Erik Zielke <ez@aragost.com> [Thu, 30 Sep 2010 09:49:40 +0200] rev 12587
tests: removed test names in tests
The name of the test files is replaced with a glob * expression,
thereby the tests does not depend on the filename of the file they are
in.
Adrian Buehlmann <adrian@cadifra.com> [Tue, 28 Sep 2010 19:29:14 +0200] rev 12586
tests: fix 05210e955bef merge error in test-git-import.t
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Sep 2010 01:33:31 +0200] rev 12585
test-convert-cvs-detectmerge: add sleep so cvs notices changes
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Sep 2010 01:32:51 +0200] rev 12584
init: expand destination url as a configured paths
Most commands expands configured paths when repositories are specified, just as
the urls help says. Clone also expands the destination path. Clone is morally
equivalent to init + push/pull, so init should also expand the destination path
- and that is what this patch makes it do.
There is no really good usecases for this and in most cases it doesn't matter,
but consistency is nice, and otherwise we would have to document the exception.
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Sep 2010 01:32:50 +0200] rev 12583
mq: explain qpush -f better
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Sep 2010 01:32:50 +0200] rev 12582
serve: let --web-conf help reference hgweb
Juan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com> [Tue, 28 Sep 2010 19:36:05 +0200] rev 12581
transplant: add the transplanted revset predicate
This adds support to identify a particular transplanted changeset or set
of changesets. The argument is optional. Examples:
hg log -r 'transplanted(1234 or 2345)'
hg log -r 'transplanted()'
Mads Kiilerich <mads@kiilerich.com> [Tue, 28 Sep 2010 03:01:35 +0200] rev 12580
test-convert-cvs-branch: add sleep so cvs notices changes
Mads Kiilerich <mads@kiilerich.com> [Tue, 28 Sep 2010 02:58:00 +0200] rev 12579
graphlog: style with header and footer (issue2395)
The glog command didn't emit header and footer from the style, as demonstrated
by "hg glog --style xml". Asciiart combined with xml markup hardly makes sense,
but header and footer might however be useful for adding for example html pre
tags around the graph.
Mads Kiilerich <mads@kiilerich.com> [Tue, 28 Sep 2010 02:57:59 +0200] rev 12578
test-serve: use service that works on more platforms
Follow-up to ba8850911703: echo is ambiguous on OS/X, and Solaris have neither
http nor gopher. daytime seems to be available everywhere.
Patrick Mezard <pmezard@gmail.com> [Tue, 28 Sep 2010 01:11:24 +0200] rev 12577
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Tue, 28 Sep 2010 00:41:08 +0200] rev 12576
patch: test and document a bit binary to regular file upgrade
Patrick Mezard <pmezard@gmail.com> [Tue, 28 Sep 2010 00:41:07 +0200] rev 12575
patch: upgrade to git patch when removing binary file
Otherwise it may cause data loss when removing binary files in mq with
--git=auto.
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Sep 2010 22:47:10 +0200] rev 12574
patch: fix rename text to binary file (issue2400)
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 27 Sep 2010 22:49:30 +0200] rev 12573
tests: show skip reason instead of "irrelevant" with unified tests, too
parsehghaveoutput expects just the test output, not the merged test/output,
so for skipped unified tests e.g.:
Skipped test-convert-darcs.t: missing feature: irrelevant
was shown instead of:
Skipped test-convert-darcs.t: missing feature: darcs client
Matt Mackall <mpm@selenic.com> [Mon, 27 Sep 2010 10:48:50 -0500] rev 12572
merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 27 Sep 2010 10:48:21 -0500] rev 12571
merge with iin
Ry4an Brase <ry4an-hg@ry4an.org> [Mon, 20 Sep 2010 14:56:08 -0500] rev 12570
Correct Content-Type header values for archive downloads.
The content type for both .tar.gz and .tar.bz2 downloads was
application/x-tar, which is correct for .tar files when no
Content-Encoding is present, but is not correct for .tar.gz and .tar.bz2
files unless Content-Encoding is set to gzip or x-bzip2, respectively.
However, setting Content-Encoding causes browsers to undo that encoding
during download, when a .gz or .bz2 file is usually the desired
artifact. Omitting the Content-Encoding header is preferred to avoid
having browsers uncompress non-render-able files.
Additionally, the Content-Disposition line indicates a final desired
filename with .tar.gz or .tar.bz2 extension which makes providing a
Content-Encoding header inappropriate.
With the current configuration browsers (Chrome and Firefox thus far)
are registering the application/x-tar Content-Type and not .tar
extension and appending that extension, yielding filename.tar.gz.tar as
a final on-disk artifact. This was originally reported here:
http://stackoverflow.com/questions/3753659
I've changed the .tar.gz and .tar.bz2 Content-Type values to
application/x-gzip and application/x-bzip2, respectively. Which yields
correctly named download artifacts on Firefox, Chrome, and IE.
Matt Mackall <mpm@selenic.com> [Mon, 27 Sep 2010 10:47:36 -0500] rev 12569
merge with iin