Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 16 Aug 2012 11:21:46 +0400] rev 17396
zsh completion: complete additional topics for `help`, not commands only
Patrick Mezard <patrick@mezard.eu> [Mon, 27 Aug 2012 21:10:11 +0200] rev 17395
Merge with stable
John Li <jli@circularly.org> [Mon, 27 Aug 2012 09:57:58 -0400] rev 17394
tests: merging bookmarked heads
45b5eb2941d0 fixed an error that occured when heads being merged were both
inactive bookmarks. Add a test for that case.
Matt Mackall <mpm@selenic.com> [Fri, 24 Aug 2012 17:51:47 -0500] rev 17393
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Mon, 06 Aug 2012 12:59:47 +0200] rev 17392
debuginstall: show directory for Python lib
Example new output
on Windows:
$ hg debuginstall
checking encoding (cp1252)...
checking Python lib (C:\Users\adi\hgrepos\hg-main\hg-python\lib)...
checking installed modules (C:\Users\adi\hgrepos\hg-main\mercurial)...
checking templates (C:\Users\adi\hgrepos\hg-main\mercurial\templates)...
checking commit editor...
C:\Program Files (x86)\Notepad++\notepad++.exe
checking username...
no problems detected
on Linux:
adi@kork-ubuntu64:~/hgrepos/hg-main$ ./hg debuginstall
checking encoding (UTF-8)...
checking Python lib (/usr/lib/python2.7)...
checking installed modules (/home/adi/hgrepos/hg-main/mercurial)...
checking templates (/home/adi/hgrepos/hg-main/mercurial/templates)...
checking commit editor...
checking username...
no problems detected
Ross Lagerwall <rosslagerwall@gmail.com> [Sat, 04 Aug 2012 07:14:40 +0200] rev 17391
util: replace util.nulldev with os.devnull
Python since 2.4 has supported os.devnull so having util.nulldev
is unnecessary.
Patrick Mezard <patrick@mezard.eu> [Sat, 04 Aug 2012 20:20:48 +0200] rev 17390
revset: add hidden() revset
Steve Borho <steve@borho.org> [Thu, 23 Aug 2012 18:19:19 -0500] rev 17389
wix: bump MSI based installers to use Python 2.7
We're somewhat forced to use Python 2.7 for the bdist packages, so we might
as well use 2.7 for the MSI installers as well.
Matt Mackall <mpm@selenic.com> [Fri, 24 Aug 2012 14:53:07 -0500] rev 17388
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 24 Aug 2012 14:52:45 -0500] rev 17387
tests: fix template test output