Martin Geisler <mg@aragost.com> [Wed, 10 Nov 2010 14:46:13 +0100] rev 12958
minirst: link to HelpStyleGuide in docstring
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 09 Nov 2010 13:43:35 +0900] rev 12957
util: clarify purpose of MBTextWrapper class
It's easy to get confused and scared of an Unicode monster when
skimming through this code: document that this is really just
about column-counting.
Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:29:23 -0600] rev 12956
merge with stable
Erik Zielke <ez@aragost.com> [Mon, 08 Nov 2010 10:56:47 +0100] rev 12955
run-test: fixed wrong parenthesis
Fixed wrong placement of end parenthesis, from b911cb80c671
Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:16:29 -0600] rev 12954
merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:16:17 -0600] rev 12953
merge with crew
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 09 Nov 2010 01:33:48 +0900] rev 12952
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 08 Nov 2010 22:45:56 +0900] rev 12951
graphmod: safer code when a changeset has two identical parents
While this situation should never under normal use, some real
life repos sometimes contain such changesets (older hg versions,
broken rebases, etc...)
hgweb was displaying an "Internal error" in this case, and graphlog
displayed a redundant branch all the way to null: it does not cost us
much to just ignore this extra parent when constructing the DAG.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:23:48 +0900] rev 12950
revlog: fix descendants() if nullrev is in revs
We were not returning the correct result if nullrev was in revs, as we
are checking parent(currentrev) != nullrev before yielding currentrev
test-convert-hg-startrev was wrong: if we start converting from rev -1 and
onwards, all the descendants of -1 (full repo) should be converted.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:16:07 +0900] rev 12949
revlog: if start is nullrev, end is always a descendant
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 22:03:28 +0900] rev 12948
mq: use sets instead of lists for speed
The code eventually converts data through sets to ensure unicity:
do it earlier to allow faster __contains__ lookups and avoid
`del l[l.index(x)]` kind of code.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:59:27 +0900] rev 12947
context: add __repr__ methods to workingfilectx and workingctx
Matt Mackall <mpm@selenic.com> [Sun, 07 Nov 2010 19:42:42 -0600] rev 12946
merge with crew
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:55:32 +0100] rev 12945
test-import: workaround for missing newline is no longer needed
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:44:46 +0100] rev 12944
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:41:42 +0100] rev 12943
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:41:41 +0100] rev 12942
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:41 +0100] rev 12941
tests: use (esc) markup for string-escape
This makes test output less ambiguous.
Failing test output will be escaped and marked up if necessary. A Python
string-escape compatible encoding is used, but not everything is encoded -
especially not \n and \t and '.
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:40 +0100] rev 12940
tests: (no-eol) markup for command output without trailing LF
Output chunks without a trailing LF will now work but get (no-eol) appended.
This change mostly moves code around so we can handle that an output line
starts with data from previous command, followed by salt and the next command.
Matt Mackall <mpm@selenic.com> [Sun, 07 Nov 2010 16:01:57 -0600] rev 12939
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Sun, 07 Nov 2010 18:21:29 +0100] rev 12938
opener: check hardlink count reporting (issue1866)
The Linux CIFS kernel driver (even in 2.6.36) suffers from a hardlink
count blindness bug (lstat() returning 1 in st_nlink when it is expected
to return >1), which causes repository corruption if Mercurial running
on Linux pushes or commits to a hardlinked repository stored on a Windows
share, if that share is mounted using the CIFS driver.
This patch works around issue1866 and improves the workaround done in
50523b4407f6 to fix issue761, by teaching the opener to lazily execute a
runtime check (new function checknlink) to see if the hardlink count
reported by nlinks() can be trusted.
Since nlinks() is also known to return varying count values (1 or >1)
depending on whether the file is open or not and depending on what client
and server software combination is being used for accessing and serving
the Windows share, we deliberately open the file before calling nlinks() in
order to have a stable precondition. Trying to depend on the precondition
"file closed" would be fragile, as the file could have been opened very
easily somewhere else in the program.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 04 Nov 2010 09:04:37 +0100] rev 12937
util: refactor opener
- Don't call atomictempfile or nlinks() if the path is malformed
(no basename). Let posixfile() raise IOError directly.
- atomictempfile already breaks up hardlinks, no need to poke
at the file with nlinks() if atomictemp.
- No need to copy the file contents to break hardlinks for 'w'rite
modes (w, wb, w+, w+b). Unlinking and recreating the file is faster.
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Nov 2010 18:15:17 +0100] rev 12936
revset: remove unnecessary debug statement
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Nov 2010 18:14:42 +0100] rev 12935
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)
- Handle 'subset' argument
- Stop returning the null rev from p1 and parents, as in the non-dirstate case
- Order parents as in the non-dirstate case (ascending revs)
Mads Kiilerich <mads@kiilerich.com> [Sat, 06 Nov 2010 00:31:44 +0100] rev 12934
tests: handle .t files without trailing LF
9a2de8dae27b made this simple test-test.t succeed silently:
$ printf ' $ true' > test-test.t
but did not give a usable .err in this case:
$ printf ' $ false' > test-test.t
The missing LF will now be fixed in the test output and it will thus give a
test failure and a solution in the .err file.
Matt Mackall <mpm@selenic.com> [Fri, 05 Nov 2010 15:38:23 -0500] rev 12933
merge with stable
Steve Losh <steve@stevelosh.com> [Fri, 05 Nov 2010 15:54:32 -0400] rev 12932
alias: fall back to normal error handling for ambigious commands (fixes issue2475)
Martin Geisler <mg@aragost.com> [Fri, 05 Nov 2010 15:35:39 +0100] rev 12931
merge with stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Fri, 05 Nov 2010 15:13:22 +0100] rev 12930
subrepo: test & fix svn subrepo removal
Kevin Bullock <kbullock@ringworld.org> [Thu, 04 Nov 2010 17:09:00 -0500] rev 12929
revsets: let parents() return parents of working dir
This patch makes the 'set' argument to revset function parents() optional.
Like p1() and p2(), if no argument is given, returns the parent(s) of the
working directory.
Morally equivalent to 'p1()+p2()', as expected.
Kevin Bullock <kbullock@ringworld.org> [Thu, 04 Nov 2010 16:59:03 -0500] rev 12928
revsets: let p1() and p2() return parents of working dir
This patch makes the 'set' argument to revset functions p1() and p2()
optional. If no argument is given, p1() and p2() return the first or second
parent of the working directory.
If the working directory is not an in-progress merge (no 2nd parent), p2()
returns the empty set. For a checkout of the null changeset, both p1() and
p2() return the empty set.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 04 Nov 2010 09:04:37 +0100] rev 12927
util: refactor opener
- Don't call atomictempfile or nlinks() if the path is malformed
(no basename). Let posixfile() raise IOError directly.
- atomictempfile already breaks up hardlinks, no need to poke
at the file with nlinks() if atomictemp.
- No need to copy the file contents to break hardlinks for 'w'rite
modes (w, wb, w+, w+b). Unlinking and recreating the file is faster.
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Nov 2010 22:56:38 +0000] rev 12926
keyword: turn regexes and escaped keywords into a propertycache
Matt Mackall <mpm@selenic.com> [Thu, 04 Nov 2010 16:21:28 -0500] rev 12925
commands: add revset support to most commands
Martin Geisler <mg@aragost.com> [Thu, 04 Nov 2010 18:19:10 +0100] rev 12924
convert: better ReST markup in docstring
Martin Geisler <mg@aragost.com> [Thu, 04 Nov 2010 18:11:10 +0100] rev 12923
convert: split docstring lists for easier translation
Erik Zielke <ez@aragost.com> [Thu, 04 Nov 2010 14:14:47 +0100] rev 12922
convert: use field list instead of option list in help
Use field list instead of option list in convert help, because the
option list format used, with defaults and type of argument is not
supported by docutils.
Martin Geisler <mg@aragost.com> [Thu, 04 Nov 2010 17:52:40 +0100] rev 12921
doc/Makefile: docs now also depend on extensions
After 0d09991f91ee the hg(1) manpage contains a section with help
extracted from the extensions, so we should depend on them too.
Christian Ebert <blacktrash@gmx.net> [Wed, 03 Nov 2010 14:37:41 +0100] rev 12920
keyword: function to look up changectx for expansion
Similarly rename variable in kwtemplater.overwrite().
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 02 Nov 2010 11:25:52 +0100] rev 12919
localrepo: make heads use the keyword args of the sorted builtin
Steve Borho <steve@borho.org> [Thu, 04 Nov 2010 11:33:57 -0500] rev 12918
import: add another line feed to message join string
Changeset descriptions are not guaranteed to have a trailing carriage
return.
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Nov 2010 22:34:16 +0100] rev 12917
tests: unify test-no-symlinks
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Nov 2010 21:11:07 +0100] rev 12916
patch: remove unused applydiff() sourcefile argument
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Nov 2010 21:11:05 +0100] rev 12915
patch: remove unused gitworkdone variable from iterhunks()
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Nov 2010 21:10:59 +0100] rev 12914
test-import: use printf instead of echo
Steve Borho <steve@borho.org> [Thu, 21 Oct 2010 16:04:34 -0500] rev 12913
import: --no-commit should update .hg/last-message.txt
The patch parser goes through all of that trouble extracting the
commit message from the patch file. It seems such a waste not to
use it.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 02 Nov 2010 09:47:47 +0100] rev 12912
merge with stable after 1.7 release
Matt Mackall <mpm@selenic.com> [Mon, 01 Nov 2010 17:40:17 -0500] rev 12911
Added signature for changeset 333421b9e0f9
Matt Mackall <mpm@selenic.com> [Mon, 01 Nov 2010 17:40:14 -0500] rev 12910
Added tag 1.7 for changeset 333421b9e0f9
Matt Mackall <mpm@selenic.com> [Mon, 01 Nov 2010 14:45:27 -0500] rev 12909
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 01 Nov 2010 16:04:15 -0200] rev 12908
i18n-pt_BR: synchronized with b19b4c1df066
Matt Mackall <mpm@selenic.com> [Mon, 01 Nov 2010 14:18:42 -0500] rev 12907
dirstate: skip optimization on case-folding FS (issue2440)
Mads Kiilerich <mads@kiilerich.com> [Mon, 01 Nov 2010 01:56:12 +0100] rev 12906
url: fix https client authentication through proxy
There is no tests for this, but the parameter order was obviously wrong.
Matt Mackall <mpm@selenic.com> [Mon, 01 Nov 2010 12:45:45 -0500] rev 12905
merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Mon, 01 Nov 2010 13:42:40 +0100] rev 12904
i18n-sv: synchronize with 13fb555677fe
Chia-Huan Wu <willie.tw@gmail.com> [Sun, 31 Oct 2010 22:29:21 +0100] rev 12903
i18n-zh_TW: synchronize with 15ca4bfecfe3
Yuya Nishihara <yuya@tcha.org> [Mon, 01 Nov 2010 01:31:09 +0900] rev 12902
i18n-ja: strip extra spaces next to punctuation mark at line ending
Wagner Bruna <wbruna@yahoo.com> [Sat, 30 Oct 2010 12:51:15 -0200] rev 12901
i18n-pt_BR: synchronized with 15ca4bfecfe3
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 12:13:52 -0500] rev 12900
commit: handle missing newline on last commit comment
Patrick Mezard <pmezard@gmail.com> [Mon, 01 Nov 2010 17:26:08 +0100] rev 12899
localrepo: do not modify ctx.remove() list in-place
Martin Geisler <mg@aragost.com> [Mon, 01 Nov 2010 16:22:41 +0100] rev 12898
test-rename: test with absolute paths
Martin Geisler <mg@aragost.com> [Mon, 01 Nov 2010 16:19:06 +0100] rev 12897
test-rename: fix \" -> " in comments
Steve Borho <steve@borho.org> [Sat, 30 Oct 2010 16:58:15 -0500] rev 12896
rebase: improve resolve failure message
Martin Geisler <mg@aragost.com> [Mon, 01 Nov 2010 10:24:07 +0100] rev 12895
run-tests: use regex when searching for $HGPORT in test output
This prevents spurious errors when a changeset hash happens to match
the port number. Before, this invocation gave a test failure:
$ ./run-tests.py test-log.t --port 24427
ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed
--- /home/mg/src/mercurial-crew/tests/test-log.t
+++ /home/mg/src/mercurial-crew/tests/test-log.t.err
@@ -626,12 +626,12 @@
$ hg log -b default
changeset: 2:c3a4f03cc9a7
- parent: 0:24427303d56f
+ parent: 0:$HGPORT303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
...
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 11:32:04 -0500] rev 12894
demandimport: back out 50a4e55aa278 (issue2467)
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:35 -0500] rev 12893
debugindex: add --format flag to allow debugging parentdelta
-f 1 shows extra data from revlogv1 (aka revlogng) including flags and size
(based on a patch by Pradeepkumar Gayam <in3xes@gmail.com>)
Kevin Bullock <kbullock@ringworld.org> [Fri, 29 Oct 2010 00:57:34 -0500] rev 12892
pager: make example of setting pager less silly
Mike Sperber <sperber@deinprogramm.de> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12891
convert: Work around p4 instability (issue2465)
The p4 command-line client sometimes fails upon doing "p4 describe"
when trying to produce a patch. (I'm guessing it's a bug in p4.)
However, "hg convert" doesn't even make use of the patch, and it can
be elided by adding "-s" to the p4 command line here.
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12890
revlog: choose best delta for parentdelta (issue2466)
When parentdelta is enabled, we choose the delta that has the minimum
distance to its base. Otherwise, base may be sufficiently far away to
require a full version, resulting in greatly reduced compression.
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12889
revlog: precalculate p1 and p2 revisions
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12888
revlog: extract delta building to a subfunction
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12887
revlog: simplify cachedelta handling
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:34 -0500] rev 12886
revlog: fix buildtext local scope
buildtext stores its result in _addrevision scope to avoid repeated builds
cachedelta is already visible
Matt Mackall <mpm@selenic.com> [Sat, 30 Oct 2010 02:47:24 -0500] rev 12885
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 29 Oct 2010 00:19:39 +0900] rev 12884
i18n-ja: synchronized with 6f6f6a9c2a41
Wagner Bruna <wbruna@yahoo.com> [Thu, 28 Oct 2010 09:52:05 -0200] rev 12883
i18n-pt_BR: synchronized with db2ff771204d
Reviewed formatting fixes from eda77c3e246a.
Martin Geisler <mg@aragost.com> [Thu, 28 Oct 2010 10:02:28 +0200] rev 12882
i18n-da: translate help for bookmarks extension
Martin Geisler <mg@lazybytes.net> [Thu, 28 Oct 2010 09:48:01 +0200] rev 12881
i18n, bookmarks: add comments for translators
Martin Geisler <mg@aragost.com> [Thu, 28 Oct 2010 09:43:56 +0200] rev 12880
i18n-da: synchronize with e1855dee28c1
Martin Geisler <mg@aragost.com> [Fri, 29 Oct 2010 14:06:06 +0200] rev 12879
qnew: distinguish between existing file and directory (issue2464)
Martin Geisler <mg@aragost.com> [Fri, 29 Oct 2010 15:25:21 +0200] rev 12878
qnew: give better feedback when doing 'hg qnew foo/' (issue2464)
Martin Geisler <mg@aragost.com> [Fri, 29 Oct 2010 12:50:08 +0200] rev 12877
opener: do not create "foo" directory when writing to "foo/"
The directories were not cleaned up when the subsequent open failed
and this would confuse things like qnew.
Martin Geisler <mg@aragost.com> [Fri, 29 Oct 2010 14:47:45 +0200] rev 12876
pager: backout 05077896ffe2 (issue2441)
Patrick Mezard <pmezard@gmail.com> [Thu, 28 Oct 2010 22:04:33 +0200] rev 12875
mq: qrename should not touch the dirstate if src is untracked (issue2460)
Patrick Mezard <pmezard@gmail.com> [Thu, 28 Oct 2010 21:25:53 +0200] rev 12874
patch: fix copies when patching over uncommitted changed (issue2459)
Matt Mackall <mpm@selenic.com> [Wed, 27 Oct 2010 16:54:46 -0500] rev 12873
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 26 Oct 2010 21:31:35 -0200] rev 12872
i18n-pt_BR: synchronized with 830be2c57626
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 26 Oct 2010 19:12:45 -0200] rev 12871
i18n-pt_BR: msgmerge with 830be2c57626
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 26 Oct 2010 18:47:45 -0200] rev 12870
merge with i18n
Martin Geisler <mg@lazybytes.net> [Tue, 26 Oct 2010 10:54:32 +0200] rev 12869
i18n-da: remove extra newline in translation
Martin Geisler <mg@lazybytes.net> [Tue, 26 Oct 2010 00:21:57 +0200] rev 12868
i18n-da: synchronize with 6137c5bba4d0
Matt Mackall <mpm@selenic.com> [Wed, 27 Oct 2010 15:35:23 -0500] rev 12867
minirst: use colwidth to match title lengths (issue2455)
Matt Mackall <mpm@selenic.com> [Wed, 27 Oct 2010 15:35:21 -0500] rev 12866
encoding: default ambiguous character to narrow
The current implementation of colwidth was treating 'A'mbiguous
characters as wide, which was incorrect in a non-East Asian context.
As per http://unicode.org/reports/tr11/#Recommendations, we should
instead default to 'narrow' if we don't know better. As character
width is dependent on the particular font used and we have no idea
what fonts are in use, this recommendation applies.
This introduces HGENCODINGAMBIGUOUS to get the old behavior back.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 26 Oct 2010 12:18:39 +0200] rev 12865
*: kill all unnecessary shebangs.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 26 Oct 2010 12:18:37 +0200] rev 12864
*: add executable bit to a few files that were missing it.
Gilles Moris <gilles.moris@free.fr> [Wed, 20 Oct 2010 15:32:35 +0200] rev 12863
log: do case insensitive search for --user option
timeless <timeless@gmail.com> [Tue, 26 Oct 2010 14:41:58 +0300] rev 12862
url: show realm/user when asking for username/password
timeless <timeless@gmail.com> [Tue, 26 Oct 2010 14:41:58 +0300] rev 12861
rebase: abort message should appear even with --quiet
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 27 Oct 2010 12:13:49 -0200] rev 12860
help: correct tip about deleting a subrepository
The extra detail is not necessary, and wrong for Mercurial
subrepositories, so remove it (suggested by Patrick Mézard).
Wagner Bruna <wbruna@yahoo.com> [Wed, 27 Oct 2010 12:12:51 -0200] rev 12859
revset: fix missing dot in docstring
Wagner Bruna <wbruna@yahoo.com> [Wed, 27 Oct 2010 12:03:08 -0200] rev 12858
help: fix typo in merge-tools topic
Martin Geisler <mg@lazybytes.net> [Wed, 27 Oct 2010 12:05:37 +0200] rev 12857
README: add small introduction
Martin Geisler <mg@lazybytes.net> [Wed, 27 Oct 2010 12:04:58 +0200] rev 12856
README: remove trailing blank line
Wagner Bruna <wbruna@yahoo.com> [Tue, 26 Oct 2010 23:51:01 -0200] rev 12855
i18n: translate revset predicate docstrings
Wagner Bruna <wbruna@yahoo.com> [Tue, 26 Oct 2010 23:07:14 -0200] rev 12854
i18n: extract docstrings from revset module
Mads Kiilerich <mads@kiilerich.com> [Wed, 27 Oct 2010 03:21:36 +0200] rev 12853
test-win32text.t: stabilize test output
The test sometimes failed because f4.bat wasn't dirty. I'm not sure whether it
should or shouldn't be dirty, but the extension is broken and deprecated and we
just want to see the deprecation warning, so now we just avoid showing the
dirtyness.
Mads Kiilerich <mads@kiilerich.com> [Wed, 27 Oct 2010 00:28:40 +0200] rev 12852
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
timeless <timeless@gmail.com> [Tue, 26 Oct 2010 14:41:58 +0300] rev 12851
bookmarks: improve English for diffbookmarks
Martin Geisler <mg@lazybytes.net> [Tue, 26 Oct 2010 18:01:35 +0200] rev 12850
mq: expand 'repo' -> 'repository' in error message
Martin Geisler <mg@lazybytes.net> [Tue, 26 Oct 2010 17:59:21 +0200] rev 12849
mq: mark strings that should not be translated
timeless <timeless@gmail.com> [Tue, 26 Oct 2010 14:41:58 +0300] rev 12848
qrestore: trying to improve the English
Kevin Bullock <kbullock@ringworld.org> [Wed, 20 Oct 2010 17:38:21 -0500] rev 12847
pull: silence spurious 'requesting all changes' message
When issuing `hg pull -r REV` in a repo with no common ancestor with the
remote repo, the message 'requesting all changes' is printed, even though only
the changese that are ancestors of REV are actually requested. This can be
confusing for users (see
http://www.selenic.com/pipermail/mercurial/2010-October/035508.html).
This silences the message if (and only if) the '-r' option was passed.
Pradeepkumar Gayam <in3xes@gmail.com> [Tue, 26 Oct 2010 02:38:14 +0530] rev 12846
templates: fix inconsistency in 'help' link
Yuya Nishihara <yuya@tcha.org> [Mon, 25 Oct 2010 01:11:52 +0900] rev 12845
test-patchbomb: add test for progress support (1ed2dc9d4368)
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Oct 2010 15:11:41 +0100] rev 12844
keyword: fix regressions introduced in d87f3ff904ba
- dirstate of overwritten files must be forced to normal
with kwexpand/kwshrink, not commit.
- recorded files must be weeded before overwriting.
- add test cases.
Martin Geisler <mg@lazybytes.net> [Mon, 25 Oct 2010 23:55:43 +0200] rev 12843
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net> [Mon, 25 Oct 2010 23:46:26 +0200] rev 12842
lsprof: remove #!-line from non-executable script
It triggered an rpmlint error, reported by Neal Becker.
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 20:10:18 +0200] rev 12841
doc/Makefile: do not include hg.1.gendoc.txt in MANIFEST
It is an intermediate file used to produce the hg.1 and .hg.1.html
files and is not useful for people who download the tarball. It will
be regenerated automatically by the Makefile if users want to rebuild
the documentation.
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 20:02:46 +0200] rev 12840
doc/Makefile: cleanup clean target
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 18:33:57 +0200] rev 12839
patchbomb: fix stray backslash in docstring
While both '\ ' and '\\ ' parse the same in Python, the difference
trips up hggettext so that it cannot find the docstring in the source
file and thus cannot write the right line number to i18n/hg.pot.
While the line number is not essential, it can be used to lookup the
original message.
Steve Borho <steve@borho.org> [Mon, 25 Oct 2010 14:34:49 -0500] rev 12838
help: improve wording of internal:merge and internal:fail
Steve Borho <steve@borho.org> [Mon, 25 Oct 2010 11:29:32 -0500] rev 12837
win32text: give deprecation warning
Users need to migrate to the EOL extension for various reasons.
Instructions for disabling the warning will be added to the
extension's wiki page.
Matt Mackall <mpm@selenic.com> [Mon, 25 Oct 2010 13:07:27 -0500] rev 12836
merge with i18n
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 16:27:27 +0200] rev 12835
i18n-da: synchronize with b814f67d41c0
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 16:24:07 +0200] rev 12834
i18n: merge with main
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 15:04:05 +0200] rev 12833
i18n-da: synchronized with 3d6ba8c2b1b8
Jens Bäckman <jens.backman@gmail.com> [Thu, 21 Oct 2010 16:57:17 +0200] rev 12832
synchronized with 3d6ba8c2b1b8
Matt Mackall <mpm@selenic.com> [Mon, 25 Oct 2010 13:06:37 -0500] rev 12831
traceback: point to BugTracker on the wiki
Steve Borho <steve@borho.org> [Mon, 25 Oct 2010 10:07:54 -0500] rev 12830
wix: add subrepos help text
Matt Mackall <mpm@selenic.com> [Sun, 24 Oct 2010 16:02:10 -0500] rev 12829
version: replace email address with url to reduce private mail
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 19:28:44 +0200] rev 12828
Add subrepos help topic
Edited by:
Martin Geisler <mg@lazybytes.net>
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 18:39:02 +0200] rev 12827
hgrc: document [subpaths] section
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 18:37:59 +0200] rev 12826
merge-tools.txt: 6 comes after 5
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 12:56:38 +0200] rev 12825
Test applying context diffs
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 12:55:29 +0200] rev 12824
merge-tools.txt: fix typos, simplify, renumber from 1.
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Oct 2010 12:52:37 +0200] rev 12823
hggettext: handle i18nfunctions declaration for docstrings translations
Patrick Mezard <pmezard@gmail.com> [Sat, 23 Oct 2010 19:22:42 +0200] rev 12822
Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com> [Sat, 23 Oct 2010 19:21:51 +0200] rev 12821
revsets: generate predicate help dynamically
Patrick Mezard <pmezard@gmail.com> [Sat, 23 Oct 2010 19:21:49 +0200] rev 12820
help: add topic rewriting hooks
They are useful when updating help topics dynamically from extensions.
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 17:30:08 +0200] rev 12819
minirst: ignore comments
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 17:45:49 +0200] rev 12818
help: add "revset" alias for "revsets" help topic
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 16:54:45 +0200] rev 12817
Makefile: var for documentation files
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 16:53:25 +0200] rev 12816
Makefile: remove underscore in var name
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 14:59:19 +0200] rev 12815
revset: add translator comments to i18n strings
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 00:18:10 +0200] rev 12814
gendoc: do not strip 'hg ' from synopsis
This was an old left-over from when the synopsis line was used as a
header. We now have the command name by itself as the header and the
synopsis as a literal block immediately after..
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 00:11:39 +0200] rev 12813
gendoc: support multi-line synopses
Martin Geisler <mg@lazybytes.net> [Sat, 23 Oct 2010 00:01:09 +0200] rev 12812
gendoc: re-add indentation to global option table
The indentation was lost in bdc1cf692447.
Patrick Mezard <pmezard@gmail.com> [Fri, 22 Oct 2010 22:58:17 +0200] rev 12811
test-transplant: test transplanted() revset
Steve Borho <steve@borho.org> [Fri, 22 Oct 2010 11:58:43 -0500] rev 12810
backout: add --tool argument for specifying merge tool
Mads Kiilerich <mads@kiilerich.com> [Fri, 22 Oct 2010 17:08:15 +0200] rev 12809
help: improve merge-tools topic, describe --tool and clarify details
This doesn't make it simpler, but it makes it more correct.
With help from erikz, mg and abuehl.
Mads Kiilerich <mads@kiilerich.com> [Fri, 22 Oct 2010 17:05:51 +0200] rev 12808
help: use Windows cmd compatible quoting in revset help
Martin Geisler <mg@lazybytes.net> [Fri, 22 Oct 2010 16:34:38 +0200] rev 12807
color: give hint to translators about untranslated keywords
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 21 Oct 2010 11:45:02 -0200] rev 12806
i18n: extract comments marked for translator hints
Comments marked with "i18n:", like:
# i18n: do not translate the field names
msg = _("Valid entries for the format field are topic, bar, number.")
will become available for translators in the .po files:
#. i18n: do not translate the field names
msgid "Valid entries for the format field are topic, bar, number."
msgstr ""
L. David Baron <dbaron@dbaron.org> [Thu, 21 Oct 2010 09:58:22 -0700] rev 12805
setup/hg: handle hg being a symlink when appending relative libdir to sys.path
Resolve symbolic links in the path to hg so that an hg that works when
invoked directly will also work when invoked via a symlink to it.
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 21:34:30 +0200] rev 12804
merge-tools: fixed typos
Spotted by Patrick Mézard.
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 21:26:32 +0200] rev 12803
commands: mark tip:0 as literal text
If left unquoted, this is seen as a link to '0' using protocol 'tip'
because of some over-eager link-finding magic in Docutils.
Georg Brandl <georg@python.org> [Thu, 21 Oct 2010 17:02:08 +0200] rev 12802
eol: add missing word in module docstring
Steve Borho <steve@borho.org> [Thu, 21 Oct 2010 10:13:03 -0500] rev 12801
demandimport: backout fe31f834a9ff
Using a keyword argument here breaks zipimporter for at least some
versions of Python2.6 on Windows.
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 11:23:26 +0200] rev 12800
dispatch: backout 0c605364373c
The parenthesis may need translation too: Laurens Holst pointed out
that Japanese uses full-width parentheses: () (U+FF08 U+FF09).
Martin Geisler <mg@lazybytes.net> [Thu, 21 Oct 2010 10:54:37 +0200] rev 12799
subrepo: svnsubrepo._wcrev should return str after 3d6ba8c2b1b8
Matt Mackall <mpm@selenic.com> [Thu, 21 Oct 2010 03:28:51 -0500] rev 12798
subrepo: fix status check on SVN subrepos (issue2445)
Mads Kiilerich <mads@kiilerich.com> [Thu, 21 Oct 2010 03:18:52 +0200] rev 12797
hgweb: let HTTPS serve use more compatible and less secure encryption
PROTOCOL_SSLv3 on the server side doesn't work everywhere. Sometimes the client
reports "EOF occurred in violation of protocol" (for example on Mac and Solaris).
The more compatible PROTOCOL_SSLv23 is now used instead. It works but is less
"secure" for some OpenSSL versions as it can fall back to weak encryption.
Azhagu Selvan SP <tamizhgeek@gmail.com> [Wed, 20 Oct 2010 18:15:47 +0530] rev 12796
mercurial.el: fix hg-outgoing path when 'default-push' is not defined
hg-outgoing path is set as 'default-push' which prevents it from working in
repos which only have 'default' defined.
Fix provided by Kyujin Shim at
http://alexott.net/en/writings/emacs-vcs/EmacsMercurial.html
Matt Mackall <mpm@selenic.com> [Wed, 20 Oct 2010 17:06:42 -0500] rev 12795
merge default into stable for 1.7 freeze
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 Oct 2010 23:48:33 +0200] rev 12794
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 20 Oct 2010 23:39:48 +0200] rev 12793
patchbomb: hide passwords potentially embedded in urls
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:45:08 -0500] rev 12792
wix: add vim syntax file for Mercurial unit tests
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:41:17 -0500] rev 12791
wix: add new help page templates
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 16:27:24 -0500] rev 12790
wix: add new merge-tools.txt help text
Steve Borho <steve@borho.org> [Wed, 20 Oct 2010 15:36:42 -0500] rev 12789
Merge with mpm
Steve Borho <steve@borho.org> [Tue, 19 Oct 2010 22:33:52 -0500] rev 12788
merge: implement --tool arguments using new ui.forcemerge configurable
ui.forcemerge is set before calling into merge or resolve commands, then unset
to prevent ui pollution for further operations.
ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the
given --tool is not found by the merge-tools machinery. This makes it possible
to do: hg resolve --tool="python mymerge.py" FILE
With this approach, HGMERGE and ui.merge are not harmed by --tool
Matt Mackall <mpm@selenic.com> [Wed, 20 Oct 2010 15:09:38 -0500] rev 12787
tests: fix up changed output
Wagner Bruna <wbruna@yahoo.com> [Fri, 15 Oct 2010 03:30:38 -0300] rev 12786
revset: disable subset optimization for parents() and children() (issue2437)
For the boolean operators, the subset optimization works by calculating
the cheaper argument first, and passing the subset to the second
argument to restrict the revision domain. This works well for filtering
predicates.
But parents() don't work like a filter: it may return revisions outside the
specified set. So, combining it with boolean operators may easily yield
incorrect results. For instance, for the following revision graph:
0 -- 1
the expression '0 and parents(1)' should evaluate as follows:
0 and parents(1) ->
0 and 0 ->
0
But since [0] is passed to parents() as a subset, we get instead:
0 and parents(1 and 0) ->
0 and parents([]) ->
0 and [] ->
[]
This also affects children(), p1() and p2(), for the same reasons.
Predicates that call these (like heads()) are also affected.
We work around this issue by ignoring the subset when propagating
the call inside those predicates.
Matt Mackall <mpm@selenic.com> [Wed, 20 Oct 2010 14:57:36 -0500] rev 12785
check-code: warning and fixes for whitespace in unified tests
Mads Kiilerich <mads@kiilerich.com> [Wed, 20 Oct 2010 20:19:34 +0200] rev 12784
hgweb: use Pythons ssl module for HTTPS serve when using Python 2.6 or later
pyOpenSSL apparently doesn't work for Python 2.7 and isn't very actively
maintained.
The built-in ssl module seems like a long-term winner, so we now use that with
Python 2.6 and higher.
Mads Kiilerich <mads@kiilerich.com> [Wed, 20 Oct 2010 20:19:32 +0200] rev 12783
hgweb: refactor all pyOpenSSL references into one class
Erik Zielke <ez@aragost.com> [Wed, 20 Oct 2010 17:47:46 +0200] rev 12782
gendoc: added styling for extension TOC
Uses CSS3 columns for the list of extensions, so it is not just a long
list of extension names.
Erik Zielke <ez@aragost.com> [Wed, 20 Oct 2010 17:45:09 +0200] rev 12781
gendoc: automatically create help for default extensions.
Adds a section in the hg.1 manpage and corresponding hg.1.html
file. Each extension is listed with its module docstring, followed by
the commands defined by that extendsion.
Creates help for extensions by extracting doc strings from the extension modules
and its commands.
Erik Zielke <ez@aragost.com> [Tue, 19 Oct 2010 13:50:03 +0200] rev 12780
gendoc: dedent documentation from docstrings
When getting docstrings from the source they are indented to look good
in the code. This indentation interferes with how the text is parsed
by rst. Therefore this indentation is removed.
Erik Zielke <ez@aragost.com> [Tue, 19 Oct 2010 13:43:40 +0200] rev 12779
extensions.load: return module
Makes extensions.load return the module that
it has loaded.
This is done so that callers can get information on this module, which
e.g. can be used for generating docs.
Erik Zielke <ez@aragost.com> [Tue, 19 Oct 2010 13:39:34 +0200] rev 12778
help: different section separators
Changes the characters used as section separators, so different ones
are used for module docstring and command docstring.
This is done because the section from the docstring will be at
different levels in the restructured text output, therefore
different symbols have to be used.
Martin Geisler <mg@lazybytes.net> [Wed, 20 Oct 2010 18:08:37 +0200] rev 12777
gendoc: add subsection for each command
Martin Geisler <mg@lazybytes.net> [Wed, 20 Oct 2010 18:07:50 +0200] rev 12776
gendoc: move section commands to module scope
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 20 Oct 2010 12:29:55 -0200] rev 12775
mq: mark string for i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 20 Oct 2010 12:29:41 -0200] rev 12774
cmdutil: mark string for i18n
timeless <timeless@gmail.com> [Thu, 14 Oct 2010 10:56:39 +0300] rev 12773
test-ssh: handle very slow ssh transfer rate
Kevin Bullock <kbullock@ringworld.org> [Tue, 19 Oct 2010 12:40:09 -0500] rev 12772
bookmarks: add paragraph on pushing and pulling to help
Text adapted from http://mercurial.selenic.com/wiki/BookmarksExtension
Erik Zielke <ez@aragost.com> [Wed, 20 Oct 2010 16:54:34 +0200] rev 12771
help: help topic for merge tools
I have made a help topic for merge tools. The text in the topic is
based on the http://mercurial.selenic.com/wiki/MergeProgram page from
the wiki, along with some extra information on the internal merge tools.
Martin Geisler <mg@lazybytes.net> [Wed, 20 Oct 2010 10:13:04 +0200] rev 12770
check-code: find trailing whitespace
timeless <timeless@gmail.com> [Wed, 20 Oct 2010 10:07:38 +0200] rev 12769
convert: kill trailing whitespace
timeless <timeless@gmail.com> [Wed, 20 Oct 2010 10:02:54 +0200] rev 12768
convert: fix typo in comment
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 18 Oct 2010 18:31:38 -0200] rev 12767
strip: support revision sets
Augie Fackler <durin42@gmail.com> [Sat, 16 Oct 2010 18:09:47 -0500] rev 12766
interhg: use uisetup() instead of module-load side effects
This fixes an infinite recursion bug caused by visiting a bad subpage
of the help handler repeatedly, which caused the wrapper for the
templater's escape filter to get installed twice and resulted in
infinite recursion.
Steve Borho <steve@borho.org> [Mon, 18 Oct 2010 23:20:14 -0500] rev 12765
merge: when --tool is specified, disable HGMERGE by setting to empty string
HGMERGE has different semantics than ui.merge. HGMERGE should hold the name
on an executable in your path, or an absolute tool path. As such, it's not
safe to simply copy the user's specified --tool value into HGMERGE. Instead,
we disable HGMERGE by setting it to an empty string.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 18 Oct 2010 14:10:36 +0900] rev 12764
ui: only fix config if the relevant section has changed
In particular, when extensions add hooks, or add non-ui and non-paths
configuration items during their setups, we really have no reason
to re-"fix" the config dictionaries.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 19 Oct 2010 23:15:31 +0900] rev 12763
test-tags: use printf instead of echo '...\n'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 Oct 2010 22:24:26 +0200] rev 12762
discovery: findincoming() is no longer used
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 Oct 2010 19:25:35 +0200] rev 12761
discovery: use set instead of dict
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 17 Oct 2010 16:16:12 +0200] rev 12760
discovery: remove unused "base" argument from find.*incoming()
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 17:16:39 -0500] rev 12759
discovery: do not use the implicit updating of the "base" arg
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 19 Oct 2010 20:20:10 +0900] rev 12758
tags: do not fail if tags.cache is corrupted (issue2444)
This file is not critical for hg, so we can safely
swallow the ValueError
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 10 Oct 2010 09:50:25 -0500] rev 12757
merge: make 'diverging renames' diagnostic a more helpful note.
See the Hg Book on why we actually want to detect this case:
http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290
Before:
$ hg up deadbeef
warning: detected divergent renames of X to:
...
After:
$ hg up deadbeef
note: possible conflict - X was renamed multiple times to:
...
No functionality change.
Erik Zielke <ez@aragost.com> [Mon, 18 Oct 2010 14:37:52 +0200] rev 12756
gendoc: refactor get_cmd
Refactors the get_cmd to take the table as argument, instad
of just referencing the global table, thereby enabling reuse
for extension command tables.
Erik Zielke <ez@aragost.com> [Mon, 18 Oct 2010 14:37:50 +0200] rev 12755
mq: switched to `` around * * *
So it can be parsed by rst.
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Oct 2010 00:45:34 +0200] rev 12754
Revert: capitalization doc fix
Mads Kiilerich <mads@kiilerich.com> [Tue, 19 Oct 2010 03:56:20 +0200] rev 12753
subrepo: abort instead of pushing/pulling to the repo itself
_abssource will now abort (or return None) in the rare cases where no push/pull
path can be found.
Mads Kiilerich <mads@kiilerich.com> [Tue, 19 Oct 2010 03:55:28 +0200] rev 12752
subrepo: rename relpath to subrelpath and introduce reporelpath
Mads Kiilerich <mads@kiilerich.com> [Tue, 19 Oct 2010 03:55:06 +0200] rev 12751
mdiff: carriage return (\r) is also ignorable whitespace
Steve Borho <steve@borho.org> [Fri, 15 Oct 2010 23:00:45 -0500] rev 12750
merge: add --tool argument to merge and resolve
These arguments are shorthand for --config ui.merge, but they also
override HGMERGE if it is found in the user's environment.
timeless <timeless@gmail.com> [Sun, 17 Oct 2010 14:00:01 +0300] rev 12749
patchbomb: move command option help from the extension (patchbomb) to the command (email)
Steve Losh <steve@stevelosh.com> [Sun, 17 Oct 2010 13:24:37 -0400] rev 12748
alias: fail gracefully when invalid global options are given (issue2442)
This patch modifies the check for shell aliases to prevent crashing when an invalid
global option is given.
When an invalid global option is given the check will simply return and let the
normal error handling for this case happen.
Paul Molodowitch <pm@stanfordalumni.org> [Thu, 07 Oct 2010 13:44:17 -0700] rev 12747
bookmarks: better fix for issue2016 (lookup infinite recursion)
741290486877 partially reverted by Patrick Mézard <pmezard@gmail.com>
timeless <timeless@gmail.com> [Mon, 02 Aug 2010 07:15:47 +0300] rev 12746
merge/progress: marking strings for localization
timeless <timeless@gmail.com> [Mon, 02 Aug 2010 07:15:47 +0300] rev 12745
verify/progress: using gerund to indicate action and adding units
timeless <timeless@gmail.com> [Tue, 20 Jul 2010 20:53:48 +0200] rev 12744
progress: dropping superfluous space from units
Adrian Buehlmann <adrian@cadifra.com> [Sat, 16 Oct 2010 18:09:01 +0200] rev 12743
check-code: add 'no tab indent' check for unified tests
and fix the offending tests accordingly
Mads Kiilerich <mads@kiilerich.com> [Sun, 17 Oct 2010 04:14:06 +0200] rev 12742
url: validity (notBefore/notAfter) is checked by OpenSSL (issue2407)
Removing the check from our code makes https with cacerts check work with
Python < 2.6.
Mads Kiilerich <mads@kiilerich.com> [Sun, 17 Oct 2010 04:13:50 +0200] rev 12741
test-https: test web.cacerts functionality
Mads Kiilerich <mads@kiilerich.com> [Sun, 17 Oct 2010 04:13:35 +0200] rev 12740
serve: fix https mode and add test
The https mode failed in super because BaseRequestHandler is an old-style
class.
This introduces the first test of https client/server functionality - and
"hghave ssl". The test is currently only run on Python 2.6.
Augie Fackler <durin42@gmail.com> [Sat, 16 Oct 2010 17:29:04 -0500] rev 12739
hgweb: don't send a body or illegal headers during 304 response
Without this fix, mod_wsgi and spawning get in a wedged state after
sending a 304 response. Not sending a body fixed that problem. The
header change was discovered by using wsgiref.validate.validator to
check for other errors.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 16 Oct 2010 22:40:46 +0200] rev 12738
merge with stable
Augie Fackler <durin42@gmail.com> [Tue, 12 Oct 2010 11:02:45 -0500] rev 12737
test-url: skip test when ssl module is unavailable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 16 Oct 2010 18:50:53 +0200] rev 12736
revset: use 'requires' instead of 'wants' in error message
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 15 Oct 2010 05:21:51 +0200] rev 12735
outgoing: unify common graphlog.outgoing and hg.outgoing code
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 14 Oct 2010 22:41:43 +0200] rev 12734
bundlerepo: unify common code into a new getremotechanges
The pattern where we fetch incoming remote changes and return
them as a local bundlerepo seems common. It's nicer to have this
code unified.
Augie Fackler <durin42@gmail.com> [Tue, 12 Oct 2010 23:33:43 -0500] rev 12733
revset id(): fix error text to say "id wants..." instead of "rev wants..."
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Oct 2010 22:53:17 +0200] rev 12732
keyword: only use expensive fctx.cmp when needed
Restrict expensive cmp to cases when:
- comparing against working directory
and
- encode filters active
or
- path is configured for keyword expansion
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Oct 2010 22:47:50 +0200] rev 12731
context: narrow down filter special case in filectx.cmp()
cmp via filelog when encode filters are present, but only when
actually comparing to the working directory.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 14 Oct 2010 21:36:00 +0200] rev 12730
incoming: unify code for incoming and graphlog.incoming
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 14 Oct 2010 21:37:00 +0200] rev 12729
incoming: rename variable
Groundwork so that incoming and graphlog.incoming code look the same and get
easier to unify.
Mads Kiilerich <mads@kiilerich.com> [Thu, 14 Oct 2010 01:28:29 +0200] rev 12728
import: only the first hg patch marker should be processed (issue2417)
Proper use of the hgpatch state variable had been lost in the final edits of
d7452292f9d3 - now it works more like intended.
Gilles Moris <gilles.moris@free.fr> [Fri, 10 Sep 2010 10:28:18 +0200] rev 12727
backout: provide linear backout as a default (without --merge option)
This changes backouts changeset to retain linear history, .e. it is committed
as a child of the working directory parent, not the reverted changeset
parent.
The default behavior was previously to just commit a reverted change as a
child of the backed out changeset - thus creating a new head. Most of
the time, you would use the --merge option, as it does not make sense to
keep this dangling head as is.
The previous behavior could be obtained by using 'hg update --clean .' after a
'hg backout --merge'.
The --merge option itself is not affected by this change. There is also
still an autocommit of the backout if a merge is not needed, i.e. in case
the backout is the parent of the working directory.
Previously we had (pwd = parent of the working directory):
pwd older
backout auto merge
backout --merge auto commit
With the new linear approach:
pwd older
backout auto commit
backout --merge auto commit
auto: commit done by the backout command
merge: backout also already committed but explicit merge and commit needed
commit: user need to commit the update/merge
Augie Fackler <durin42@gmail.com> [Mon, 11 Oct 2010 10:07:42 -0500] rev 12726
update: use revsingle to enable use of revsets as update targets (issue1993)
Augie Fackler <durin42@gmail.com> [Tue, 12 Oct 2010 11:02:45 -0500] rev 12725
test-url: skip test when ssl module is unavailable
Augie Fackler <durin42@gmail.com> [Tue, 12 Oct 2010 11:02:05 -0500] rev 12724
test-url: remove trailing whitespace
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Oct 2010 12:49:23 +0100] rev 12723
keyword: code cleanup
- move preselection of expansion candidates for rollback
and record into helper function
- same overwrite order in rollback and record:
1. modified, 2. added
- self.wlock() inside kwrepo class instead of repo.wlock()
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Oct 2010 22:59:29 +0900] rev 12722
tests: asciify output of test-encoding-align.t
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Oct 2010 22:57:25 +0900] rev 12721
tests: accept \-escaped test output
It changes tsttest to accept expected outputs in python-style \-escapes.
It aims to avoid trouble with outputs for non-ascii, color and progress
tests.
Matt Mackall <mpm@selenic.com> [Tue, 12 Oct 2010 16:26:03 -0500] rev 12720
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 12 Oct 2010 08:30:15 -0500] rev 12719
parentdelta: compress.py extension is no longer necessary
Using `hg --config format.parentdelta=True clone --pull src dst` is equivalent.
Matt Mackall <mpm@selenic.com> [Tue, 12 Oct 2010 16:25:38 -0500] rev 12718
merge with stable
Brodie Rao <brodie@bitheap.org> [Fri, 01 Oct 2010 10:15:04 -0500] rev 12717
convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411)
This is a followup to 4481f8a93c7a, which only fixed the conversion of
patches with UTF-8 metadata.
This patch allows a changelog to have any bytes with values
0x7F-0xFF. It parses the XML changelog as Latin-1 and uses
converter_source.recode() to decode the data as UTF-8/Latin-1.
Caveats:
- Since the convert extension doesn't provide any way to specify the
source encoding, users are still limited to UTF-8 and Latin-1.
- etree will still complain if the changelog has bytes with values
0x00-0x19. XML only allows printable characters.
Augie Fackler <durin42@gmail.com> [Mon, 11 Oct 2010 09:44:19 -0500] rev 12716
revset: add id() and rev() to allow explicitly referring to changes by hash or rev
Augie Fackler <durin42@gmail.com> [Sun, 10 Oct 2010 12:41:36 -0500] rev 12715
revset: rename tagged() to tag() and allow it to take an optional tag name
Augie Fackler <durin42@gmail.com> [Sun, 10 Oct 2010 12:40:25 -0500] rev 12714
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com> [Sun, 10 Oct 2010 12:03:28 -0500] rev 12713
hgweb help: fix double help links
Adrian Buehlmann <adrian@cadifra.com> [Mon, 11 Oct 2010 11:17:48 +0200] rev 12712
tests: add testcase for --config format.dotencode=false
Matt Mackall <mpm@selenic.com> [Mon, 11 Oct 2010 14:39:13 -0500] rev 12711
fetch: fix and document exit codes (issue2356)
Adrian Buehlmann <adrian@cadifra.com> [Sun, 10 Oct 2010 23:32:09 +0200] rev 12710
doc: add [format] dotencode description
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 27 Jul 2010 23:07:30 +0900] rev 12709
filectx: use ctx.size comparisons to speed up ctx.cmp
Comparing sizes is cheaper than comparing file contents, as it does not
involve reading the file on disk or from the filelog.
It is however not always possible: some extensions, or encode filters,
change data when extracting it to the working directory.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 10 Oct 2010 18:58:45 +0200] rev 12708
localrepo: use propertycaches to access encode/decode filters
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 10 Oct 2010 19:10:16 +0200] rev 12707
localrepo: load filter patterns outside of _filter
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 10 Oct 2010 19:07:58 +0200] rev 12706
localrepo: have _loadfilter return the loaded filter patterns
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Oct 2010 13:26:29 -0500] rev 12705
merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Oct 2010 12:47:11 -0500] rev 12704
wireproto/http: drain the incoming bundle in case of errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Oct 2010 12:45:36 -0500] rev 12703
wireproto: introduce pusherr() to deal with "unsynced changes" error
The behaviour between http and ssh still differ:
- the "unsynced changes" is seen as a remote output in the http cases
- but it is correctly seen as a push error for ssh
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Oct 2010 12:44:33 -0500] rev 12702
wireproto: redirect the output earlier
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 11 Oct 2010 12:44:11 -0500] rev 12701
wireproto: return in finally was messing with the return inside the block
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 11 Oct 2010 13:51:10 +0200] rev 12700
tests: use a glob for all of the host, might not be localhost
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 11 Oct 2010 13:49:53 +0200] rev 12699
commands: add move alias for the rename command
svn provides move, and it's also a standard tool on Windows.
Matt Mackall <mpm@selenic.com> [Sun, 10 Oct 2010 18:02:52 -0500] rev 12698
util: make wrap() require a width argument
This keeps hgweb's help engine from poking at file descriptors that
don't exist.
Brodie Rao <brodie@bitheap.org> [Sat, 09 Oct 2010 16:55:33 -0500] rev 12697
showconfig: don't accept multiple sections and one config item
Showconfig now behaves as documented and only accepts one section.name argument
or a number of section names.
Matt Mackall <mpm@selenic.com> [Sun, 10 Oct 2010 17:35:28 -0500] rev 12696
hgweb: another fix for the help termwidth bug
Brodie Rao <brodie@bitheap.org> [Sun, 10 Oct 2010 12:21:49 -0500] rev 12695
pager: don't run pager if nothing is written to stdout/stderr
This decides when to run the pager based on the first call to
ui.write() and ui.write_err(). This has the side effect of not the
output of subprocesses that write output before hg does.
Brodie Rao <brodie@bitheap.org> [Sun, 10 Oct 2010 12:21:48 -0500] rev 12694
pager: add global --pager=<auto/boolean> option
Brodie Rao <brodie@bitheap.org> [Sun, 10 Oct 2010 12:21:36 -0500] rev 12693
color: add global option in extsetup() instead of globally
This prevents side effects from occurring when importing the color
extension.
Matt Mackall <mpm@selenic.com> [Sun, 10 Oct 2010 11:05:06 -0500] rev 12692
hgweb: more ui fiddling
Augie Fackler <durin42@gmail.com> [Sun, 10 Oct 2010 10:42:44 -0500] rev 12691
hgweb: fix hgweb_mod as well as hgwebdir_mod
Augie Fackler <durin42@gmail.com> [Sun, 10 Oct 2010 10:07:17 -0500] rev 12690
hgwebdir_mod: use fake termwidth to avoid mod_wsgi's wrath
Augie Fackler <durin42@gmail.com> [Sun, 10 Oct 2010 10:06:36 -0500] rev 12689
termwidth: move to ui.ui from util
Kevin Bullock <kbullock@ringworld.org> [Thu, 07 Oct 2010 23:34:21 -0500] rev 12688
help: improve description of update --check
Adrian Buehlmann <adrian@cadifra.com> [Sat, 09 Oct 2010 21:54:50 +0200] rev 12687
store: encode first period or space in filenames (issue1713)
- Mac OS X has problems with filenames starting with '._'
(e.g. '.FOO' -> '._f_o_o' is now encoded as '~2e_f_o_o')
- Explorer of Windows Vista and Windows 7 strip leading spaces of
path elements of filenames when copying trees
Above problems are avoided by encoding the first space (as '~20') or
period (as '~2e') of all path elements.
This introduces a new entry 'dotencode' in .hg/requires, that is,
a new repository filename layout (inside .hg/store).
Newly created repositories require 'dotencode' by default. Specifying
[format]
dotencode = False
in a config file will use the old format instead.
Prior Mercurial versions will abort with the message
abort: requirement 'dotencode' not supported!
when trying to access a local repository that requires 'dotencode'.
New 'dotencode' repositories can be converted to the previous
repository format with
hg --config format.dotencode=0 clone --pull repoA repoB
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Tue, 14 Sep 2010 23:00:39 +0200] rev 12686
demandimport: fix an obscure corner-case.
Python's __import__() function has 'level' as the fourth argument, not the
third. The code path in question probably never worked.
(This was seen trying to run Mercurial in PyPy. Fixing this made it
die somewhere else...)
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 00:38:57 +0100] rev 12685
keyword: enforce subn method via boolean switch
There are only 2 patterns to choose, and so far only 1 case
where kwtemplater.re_kw.subn is applied on data read from
the working directory: when recording added files.
With this change the code reflects more closely the boolean
character of the switch and underlines the special case.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 00:30:09 +0100] rev 12684
keyword: fix weeding of expansion candidates when recording
Rearrange tests to check this, i.e. that there are changes
in other files, not only the recorded one.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 10 Oct 2010 09:48:37 -0500] rev 12683
copies: don't detect copies as "divergent renames"
(For the purposes of this patch copy is defined as a rename where the
source continues to exist.)
Augie Fackler <durin42@gmail.com> [Sat, 09 Oct 2010 11:02:11 -0500] rev 12682
strip: add --keep flag to avoid modifying wc during strip
Fixes issue1564.
Brodie Rao <brodie@bitheap.org> [Sat, 09 Oct 2010 17:02:28 -0500] rev 12681
update: use higher level wording for "crosses branches" error
When using "hg update" to update to a revision on another branch, if
the user has uncommitted changes in the working directory, hg aborts
with the following message:
abort: crosses branches (use 'hg merge' to merge or use 'hg update
-C' to discard changes)
If the user isn't trying to update to tip and they follow the command
examples verbatim, they would end up updating to the wrong revision.
This patch removes the command examples in favor of just telling the
user to either merge or use --clean:
abort: crosses branches (merge branches or use --clean to discard
changes)
hg also aborts if the user tries to use "hg update" to get to tip
(without specifying a revision) and tip is on another branch:
abort: crosses branches (use 'hg merge' or use 'hg update -c')
This message is changed in the same fashion:
abort: crosses branches (merge branches or use --check to force
update)
Augie Fackler <durin42@gmail.com> [Sat, 09 Oct 2010 17:58:48 -0500] rev 12680
hgweb: add help link to templates missed in ead4e21f49f1
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 09 Oct 2010 17:58:54 -0500] rev 12679
test-convert-svn-encoding.t: ignore that subversion %-encodes $TESTTMP
Use a glob instead of expecting $TESTTMP.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 16:27:10 -0500] rev 12678
run-tests.py: remove support for .bat files
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 16:25:28 -0500] rev 12677
run-tests.py: do not install hg when the tests do no exist
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Oct 2010 15:40:29 -0500] rev 12676
setup.py: write libdir as a python string literal
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Oct 2010 15:13:08 -0500] rev 12675
patch: fails immediately upon malformed hunk
patch(1) does silently ignore malformed hunks but this is not something we want
to copy.
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Oct 2010 15:13:08 -0500] rev 12674
patch: always raise PatchError with a message, simplify handling
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Oct 2010 15:13:08 -0500] rev 12673
patch: simplify externalpatch() arguments
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Oct 2010 15:13:08 -0500] rev 12672
util: remove needbinary(), no longer used for external patching
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Oct 2010 15:13:08 -0500] rev 12671
patch: remove internal patcher fallback and NoHunk error
By now the internal patcher is probably more reliable than anything we might
find on the command line.
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Oct 2010 15:13:08 -0500] rev 12670
patch: remove unused patchmeta.lineno
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Oct 2010 15:13:08 -0500] rev 12669
patch: remove unused flags from readgitpatch()
Mads Kiilerich <mads@kiilerich.com> [Sat, 09 Oct 2010 15:06:22 -0500] rev 12668
test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP
Use a glob instead of expecting $TESTTMP.
Martin Geisler <mg@lazybytes.net> [Sat, 09 Oct 2010 22:05:24 +0200] rev 12667
revsets: fix stray * in help topic
Augie Fackler <durin42@gmail.com> [Sat, 09 Oct 2010 12:27:14 -0500] rev 12666
web: add a help view for getting hg help output
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 15:00:30 -0500] rev 12665
fix indentation error
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
Wagner Bruna <wbruna@yahoo.com> [Sat, 25 Sep 2010 22:53:31 -0300] rev 12568
i18n-pt_BR: update to new Portuguese ortography
Wagner Bruna <wbruna@yahoo.com> [Sat, 25 Sep 2010 22:53:27 -0300] rev 12567
i18n-pt_BR: minor rewording
Wagner Bruna <wbruna@yahoo.com> [Sat, 25 Sep 2010 22:53:21 -0300] rev 12566
i18n-pt_BR: assorted typo fixes
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 24 Sep 2010 19:47:50 -0300] rev 12565
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 24 Sep 2010 19:47:00 -0300] rev 12564
i18n-pt_BR: synchronized with 84ceedcfeb6a
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 24 Sep 2010 19:26:01 -0300] rev 12563
merge with i18n stable
Christoph Mewes <christoph@webvariants.de> [Fri, 24 Sep 2010 02:17:54 +0200] rev 12562
i18n-de: parentrevspec extension
Christoph Mewes <christoph@webvariants.de> [Fri, 24 Sep 2010 02:08:26 +0200] rev 12561
i18n-de: pager extension and missing parts of extdiff
Christoph Mewes <christoph@webvariants.de> [Fri, 24 Sep 2010 01:41:56 +0200] rev 12560
i18n-de: added missing strings in acl
Christoph Mewes <christoph@webvariants.de> [Thu, 23 Sep 2010 01:19:40 +0200] rev 12559
i18n-de: minor changes
Christoph Mewes <christoph@webvariants.de> [Thu, 23 Sep 2010 01:09:09 +0200] rev 12558
i18n-de: notify extension
Christoph Mewes <christoph@webvariants.de> [Thu, 23 Sep 2010 00:28:45 +0200] rev 12557
i18n-de: mq extension
Martin Roppelt <m.p.roppelt@web.de> [Wed, 22 Sep 2010 13:34:40 +0200] rev 12556
i18n-de: deleted outdated messages with msgattrib, allowed language header
Christoph <christoph@webvariants.de> [Wed, 22 Sep 2010 16:32:02 +0200] rev 12555
merge
Christoph Mewes <christoph@webvariants.de> [Wed, 22 Sep 2010 04:32:55 +0200] rev 12554
i18n-de: keyword extension
Christoph Mewes <christoph@webvariants.de> [Wed, 22 Sep 2010 01:04:43 +0200] rev 12553
i18n-de: interhg extension
Christoph Mewes <christoph@webvariants.de> [Wed, 22 Sep 2010 01:04:25 +0200] rev 12552
i18n-de: more inotify
Martin Roppelt <m.p.roppelt@web.de> [Wed, 22 Sep 2010 09:45:14 +0200] rev 12551
i18n-de: delete language duplicate, update last-translator
Martin Roppelt <m.p.roppelt@web.de> [Wed, 22 Sep 2010 09:40:11 +0200] rev 12550
i18n-de: fix formatting
Martin Roppelt <m.p.roppelt@web.de> [Wed, 22 Sep 2010 09:22:42 +0200] rev 12549
merge stable into default
Martin Roppelt <m.p.roppelt@web.de> [Wed, 22 Sep 2010 08:54:00 +0200] rev 12548
i18n-de: fix broken translations, 66 defuzzied, 14 new translations
Martin Roppelt <m.p.roppelt@web.de> [Tue, 21 Sep 2010 15:45:51 +0200] rev 12547
i18n-de: update pot
Christoph <christoph@webvariants.de> [Tue, 21 Sep 2010 23:05:28 +0000] rev 12546
l10n: sig, glog, cia, hgk, highlight, inotify, interhg
New status: 1851 messages complete with 302 fuzzies and 745 untranslated.
Transmitted-via: Transifex (www.transifex.net).
Wagner Bruna <wbruna@yahoo.com> [Tue, 21 Sep 2010 01:55:53 -0300] rev 12545
merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Tue, 21 Sep 2010 01:51:56 -0300] rev 12544
i18n-pt_BR: synchronized with 5be733b20bd1
Christoph <christoph@webvariants.de> [Tue, 21 Sep 2010 00:25:25 +0000] rev 12543
l10n: churn, color, convert and eol extension done
New status: 1793 messages complete with 306 fuzzies and 799 untranslated.
Transmitted-via: Transifex (www.transifex.net).
Martin Geisler <mg@lazybytes.net> [Sat, 18 Sep 2010 22:03:33 +0200] rev 12542
i18n-da: synchronized with 2eadea60ae67
Christoph <christoph@webvariants.de> [Sat, 18 Sep 2010 09:07:57 +0000] rev 12541
l10n: primarily added separate translations for template markers
New status: 1583 messages complete with 423 fuzzies and 892 untranslated.
Transmitted-via: Transifex (www.transifex.net).
Christoph <christoph@webvariants.de> [Sat, 18 Sep 2010 01:16:31 +0000] rev 12540
l10n: based on a fresh pot file
New status: 1459 messages complete with 435 fuzzies and 1004 untranslated.
Transmitted-via: Transifex (www.transifex.net).
Erik Zielke <ez@aragost.com> [Thu, 23 Sep 2010 15:18:10 +0200] rev 12539
mq: removed return from callers to patchheader.qseries
Some callers to patchheader.qseries returned the value
further, but pathcheader.qseries does not explicitly
return anything. It was confusing this was returned
further
Erik Zielke <ez@aragost.com> [Thu, 23 Sep 2010 16:56:32 +0200] rev 12538
mq: added return 0 on success
I have added return 0 on success in docstrings of
the different not deprecated mq commands.
Adrian Buehlmann <adrian@cadifra.com> [Sun, 26 Sep 2010 23:48:30 +0200] rev 12537
tests: fix tabs/indentation in test-strip-cross.t
Steve Losh <steve@stevelosh.com> [Tue, 24 Aug 2010 18:25:33 -0400] rev 12536
alias: only allow global options before a shell alias, pass later ones through
This patch refactors the dispatch code to change how arguments to shell aliases
are handled.
A separate "pass" to determine whether a command is a shell alias has been
added. The rough steps dispatch now performs when a command is given are these:
* Parse all arguments up to the command name.
* If any arguments such as --repository or --cwd are given (which could change
the config file used, and therefore the definition of aliases), they are
taken into account.
* We determine whether the command is a shell alias.
* If so, execute the alias. The --repo and --cwd arguments are still in effect.
Any arguments *after* the command name are passed unchanged through to the
shell command (and interpolated as normal.
* If the command is *not* a shell alias, the dispatching is effectively "reset"
and reparsed as normal in its entirety.
The net effect of this patch is to make shell alias commands behave as you
would expect.
Any arguments you give to a shell alias *after* the alias name are passed
through unchanged. This lets you do something like the following:
[alias]
filereleased = !$HG log -r 'descendants(adds("$1")) and tagged()' -l1 $2 $3 $4 $5
$ hg filereleased hgext/bookmarks.py --style compact
Previously the `--style compact` part would fail because Mercurial would
interpret those arguments as arguments to the alias command itself (which
doesn't take any arguments).
Also: running something like `hg -R ~/src/hg-crew filereleased
hgext/bookmarks.py` when `filereleased` is only defined in that repo's config
will now work.
These global arguments can *only* be given to a shell alias *before* the alias
name. For example, this will *not* work in the above situation:
$ hg filereleased -R ~/src/hg-crew hgext/bookmarks.py
The reason for this is that you may want to pass arguments like --repository to
the alias (or, more likely, their short versions like -R):
[alias]
own = !chown $@ `$HG root`
$ hg own steve
$ hg own -R steve
Matt Mackall <mpm@selenic.com> [Mon, 27 Sep 2010 10:39:22 -0500] rev 12535
tests: fix test-fetch port number variability
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:20:24 -0500] rev 12534
tests: unify test-convert-tagsbranch-topology
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:18:53 -0500] rev 12533
tests: unify test-convert-tla
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:18:28 -0500] rev 12532
tests: unify test-convert-mtn
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:17:19 -0500] rev 12531
tests: unify test-convert-splicemap
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:16:46 -0500] rev 12530
tests: unify test-convert-git
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 17:14:35 -0500] rev 12529
tests: unify test-convert-filemap
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:54:28 -0500] rev 12528
tests: unify test-convert-datesort
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:53:06 -0500] rev 12527
tests: unify test-convert-hg-svn
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:48:57 -0500] rev 12526
tests: unify test-convert-hg-source
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:47:59 -0500] rev 12525
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:45:51 -0500] rev 12524
tests: unify test-convert-darcs
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:43:48 -0500] rev 12523
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 16:39:52 -0500] rev 12522
tests: unify test-convert-cvs-synthetic
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 15:42:48 -0500] rev 12521
tests: unify test-convert-cvs-detectmerge
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 15:33:09 -0500] rev 12520
tests: unify test-convert-cvs-branch
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:50:58 -0500] rev 12519
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:39:34 -0500] rev 12518
tests: unify test-convert-clonebranches
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:37:47 -0500] rev 12517
tests: unify test-convert-bzr-treeroot
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:37:30 -0500] rev 12516
tests: unify test-convert-bzr-merges
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:36:49 -0500] rev 12515
tests: unify test-convert-bzr-ghosts
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:36:32 -0500] rev 12514
tests: unify test-convert-bzr-directories
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:35:43 -0500] rev 12513
tests: unify test-convert-bzr-114
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:35:24 -0500] rev 12512
tests: unify test-convert-bzr
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:33:08 -0500] rev 12511
tests: unify test-convert-authormap
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 14:32:13 -0500] rev 12510
tests: unify test-convert
Steve Losh <steve@stevelosh.com> [Sun, 26 Sep 2010 20:43:43 -0400] rev 12509
contrib/vim: add a syntax file for unified tests
This syntax file adds:
* Highlighting of comments, output, and commands (with sh highlighting
in commands).
* Folding for output and blocks of commands+output.
* Setting tab/indent settings to 2 spaces, because that's what's defined by the
unified test file format.
Martin Geisler <mg@aragost.com> [Mon, 27 Sep 2010 10:20:19 +0200] rev 12508
merge with stable
Erik Zielke <ez@aragost.com> [Mon, 27 Sep 2010 09:19:48 +0200] rev 12507
mq: removed -m from qpush help (Issue2401)
The -m option became deprecated in changeset bcf90e712dc3,
but the option still appeared in the help line for the qpush
command
Brodie Rao <brodie@bitheap.org> [Sun, 26 Sep 2010 16:11:04 -0500] rev 12506
subrepos: add missing self argument to abstractsubrepo.checknested
Brodie Rao <brodie@bitheap.org> [Sun, 26 Sep 2010 16:01:13 -0500] rev 12505
test-pull: convert regexes to globs
Brodie Rao <brodie@bitheap.org> [Sun, 26 Sep 2010 14:35:52 -0500] rev 12504
test-ssh: test absolute path that exists
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 13 Sep 2010 10:33:49 -0300] rev 12503
subrepo: improve lookup error messages
Martin Geisler <mg@lazybytes.net> [Sun, 26 Sep 2010 22:22:59 +0200] rev 12502
run-tests: move build/ directory to HGTMP
Before, running a test would give you a build/ directory in the root
of your Mercurial source tree. The directory had a full copy of the
the source, so a grep in '**/*.py' would find files inside build/.
Martin Geisler <mg@lazybytes.net> [Sun, 26 Sep 2010 21:37:42 +0200] rev 12501
setup: slight simplification
Brodie Rao <brodie@bitheap.org> [Sat, 25 Sep 2010 19:47:45 -0500] rev 12500
Makefile: remove the build folder manually
Given a system Python version of 2.6, the following won't clean up build:
$ make local PYTHON=python2.7
$ make clean
Distutils only cleans up build subdirectories for the current Python
version.
This patch cleans up the build folder even if PYTHON=python2.7 isn't
specified to clean.
Brodie Rao <brodie@bitheap.org> [Sat, 25 Sep 2010 19:38:27 -0500] rev 12499
Makefile: remove all .so files during clean
This ensures .so files in hgext are cleaned up.
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 12498
keyword: support rollback by restoring expansion to previous values
Prevent spurious differences in the working directory
after a rollback.
Add tests for several rollback situations.
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 12497
keyword: do not expand at all during diff
Always shrink and never expand keywords during a diff operation.
Avoid user distraction e.g. because of spurious differences
appearing in the commit editor.
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 12496
keyword: restore restricted read mode value after overwriting
Even though just enforcing expansion after overwriting files in
the working directory caused no problems that we know of, this avoids
a potential source of problems (e.g. in collaboration other extensions)
at no costs.
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 12495
test-keyword: fix typo, rephrase
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12494
tests: unify test-win32text
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12493
tests: unify test-template-engine
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12492
tests: unify test-strip-cross
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12491
tests: unify test-static-http
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12490
tests: unify test-ssh-clone-r
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12489
tests: unify test-ssh
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12488
tests: unify test-simplemerge-cmd
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12487
tests: unify test-share
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12486
tests: unify test-schemes
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12485
tests: unify test-rollback
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12484
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12483
tests: unify test-push-http
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12482
tests: unify test-pull-pull-corruption2
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12481
tests: unify test-pull-pull-corruption
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12480
tests: unify test-pull-http
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12479
tests: unify test-progress
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12478
tests: unify test-profile
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12477
tests: unify test-patch-offset
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12476
tests: unify test-parseindex
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12475
tests: unify test-parentrevspec
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:49 -0500] rev 12474
tests: unify test-notify-changegroup
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:44:42 -0500] rev 12473
tests: unify test-notify
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12472
tests: unify test-oldcgi
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12471
tests: unify test-newercgi
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12470
tests: unify test-newcgi
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12469
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12468
tests: unify test-mq-qrefresh-replace-log-message
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12467
tests: unify test-mq-qpush-fail
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12466
tests: unify test-mq-qnew
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12465
tests: unify test-mq-qimport-fail-cleanup
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12464
tests: unify test-mq-qimport
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12463
tests: unify test-mq-qclone-http
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12462
tests: unify test-mq-header-from
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12461
tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12460
tests: unify test-merge-tools
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12459
tests: unify test-merge-symlinks
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12458
tests: unify test-mactext
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12457
tests: unify test-inotify-lookup
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12456
tests: unify test-inotify-issue1556
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12455
tests: unify test-inotify-issue1542
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12454
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12453
tests: unify test-inotify-issue1208
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12452
tests: unify test-inotify-dirty-dirstate
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12451
tests: unify test-inotify-debuginotify
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12450
tests: unify test-inotify
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12449
tests: unify test-http-proxy
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:21 -0500] rev 12448
tests: unify test-http-clone-r
Matt Mackall <mpm@selenic.com> [Sun, 26 Sep 2010 13:43:08 -0500] rev 12447
tests: unify test-http-branchmap