Mads Kiilerich <madski@unity3d.com> [Thu, 15 Oct 2015 21:36:47 +0200] rev 26735
contrib: offer Python 2.7.10
Mads Kiilerich <madski@unity3d.com> [Thu, 15 Oct 2015 21:35:49 +0200] rev 26734
contrib: drop Python < 2.6 from Makefile.python
Mads Kiilerich <madski@unity3d.com> [Fri, 16 Oct 2015 11:37:34 +0200] rev 26733
mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 15 Oct 2015 14:53:32 -0700] rev 26732
exchange: don't print error codes after clone bundle failure
We don't appear to print error codes elsewhere. The error codes are
inconsistent between at least Linux and OS X and are more trouble than
they are worth. Humans care about the error string more than the code
anyway.
A glob was also added to pave over differences in error strings between
Linux and OS X.
Augie Fackler <augie@google.com> [Wed, 14 Oct 2015 14:53:15 -0400] rev 26731
debian: install bash completion as hg and not mercurial (issue4900)
Augie Fackler <augie@google.com> [Wed, 14 Oct 2015 12:57:33 -0400] rev 26730
merge-tools: allow marking a mergetool as completely disabled
Very often in my life I'm finding that the only configured merge tool
present on the system is vimdiff[0], and it's currently impossible (as
far as I can tell) short of specifying `ui.merge = `[1] to actually
*disable* a merge tool. This allows vimdiff-haters to put:
[merge-tools]
vimdiff.disable = yes
in their ~/.hgrc and never see vimdiff again. I'm stopping short of
putting this as a commented out entry in the sample new user hgrc
(seen when a user runs `hg config --edit` with no ~/.hgrc) for now,
but I might come back and do that later.
0: vimdiff is at an awkward intersection: it's usually installed by
the vim package which is often installed as a vi substitute, so it's
mere presence doesn't imply me wanting it, unlike (say) kdiff3.
1: There's a related problem I ran into today where specifying
`ui.merge = :merge` failed because :merge isn't a command, which I
think is a regression. I'll try and figure that out and at least file
a bug.