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