tests: merging bookmarked heads
45b5eb2941d0 fixed an error that occured when heads being merged were both
inactive bookmarks. Add a test for that case.
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
util: replace util.nulldev with os.devnull
Python since 2.4 has supported os.devnull so having util.nulldev
is unnecessary.
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.
merge: handle case when heads are all bookmarks
If all heads are bookmarks, merge fails to find what node to merge
with (throws an IndexError while indexing into the non-bookmark heads
list) as of
4a02cf4fbb2e. This catches that case and prints an error
to specify a rev explicitly.
verify: do not choke on valid changelog without manifest
Before this change:
$ hg init
$ hg branch foo
$ hg ci -m branchfoo
$ hg verify
checking changesets
checking manifests
0: empty or missing manifest
crosschecking files in changesets and manifests
checking files
0 files, 1 changesets, 0 total revisions
1 integrity errors encountered!
(first damaged changeset appears to be 0)
[1]
templater: abort when a template filter raises an exception (
issue2987)
i18n-ru: synchronized with
c6f88e7f95b7