Greg Ward <greg-hg@gerg.ca> [Fri, 18 Dec 2009 15:05:42 -0500] rev 10097
glog: fix "incompatible option" error message.
Options like 'only_branch' should be presented to the user as
'--only-branch'.
Matt Mackall <mpm@selenic.com> [Fri, 18 Dec 2009 14:27:30 -0600] rev 10096
Merge with crew
Frank Kingswood <frank@kingswood-consulting.co.uk> [Tue, 15 Dec 2009 10:37:23 +0000] rev 10095
convert: implement two hooks in builtin cvsps
Matt Mackall <mpm@selenic.com> [Wed, 16 Dec 2009 17:39:42 -0600] rev 10094
Merge with crew
Martin Geisler <mg@lazybytes.net> [Thu, 17 Dec 2009 00:32:26 +0100] rev 10093
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Dec 2009 23:59:50 +0100] rev 10092
doc/Makefile: Fix rst2html detection
Displaying the output from the failing call to "which" didn't prevent
make from doing stupid things later. We now only search for "rst2html"
and fallback to "rst2html.py". If neither name is found, make will
eventually abort when we try to use $(RST2HTML).
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 11 Dec 2009 16:17:39 +0900] rev 10091
inotify: completely ignore events on the repository root
They can only be events on the top directory object. Those events are
meaningless for us: permission changes, repository-wide moves...
And they break the assertion that all events happen in repo/*.
Just ignore them.
Fixes one of the failures of run-test.py --inotify test-permissions
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 11 Dec 2009 15:58:09 +0900] rev 10090
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
stat() is not reliable when several events happen quickly. Which means
that if two hg actions occur in the same second, stat() result will not
reflect the second change. And only _one_ invalidate() call was done.
Also ignore the events that occur when wlock is held, since wlock release
will trigger a full rescan anyway.
Fixes 17 run-tests.py --inotify tests.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 27 Nov 2009 09:23:10 +0900] rev 10089
inotify: follow new files if they are regular or a symlink.
Fixes run-tests.py --inotify symlink-basic
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Dec 2009 12:09:25 +0100] rev 10088
run-tests.py: Show paths to failing tests, .err and .out
I think this is very convenient when investigating and fixing test failures,
but perhaps it must be tweaked further to show paths if and only if
it is appropriate.
Matt Mackall <mpm@selenic.com> [Wed, 16 Dec 2009 16:46:12 -0600] rev 10087
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 16 Dec 2009 16:42:58 -0600] rev 10086
convert: make hg sink cleanup safer
Martin Geisler <mg@lazybytes.net> [Wed, 16 Dec 2009 22:58:57 +0100] rev 10085
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Fri, 11 Dec 2009 15:25:33 +0900] rev 10084
graphlog: fix output when both a limit and a path are provided
Limit was interpreted as absolute, from the topmost revision, without
counting the number of revisions matching a given file.
Which caused "glog -lN file" to show sometimes less than N csets if
the file was not modified in all of the N previous csets.
glog will now match the behavior of log.
Patrick Mezard <pmezard@gmail.com> [Wed, 16 Dec 2009 22:18:15 +0100] rev 10083
mercurial.iss: update locale location