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
John Li <jli@circularly.org> [Wed, 22 Aug 2012 11:18:35 -0400] rev 17386
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.
Patrick Mezard <patrick@mezard.eu> [Tue, 21 Aug 2012 20:51:16 +0200] rev 17385
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]
Bryan O'Sullivan <bryano@fb.com> [Tue, 21 Aug 2012 13:12:56 -0700] rev 17384
Merge
Neil Kodner <neilk@fb.com> [Fri, 17 Aug 2012 15:12:01 -0700] rev 17383
templater: abort when a template filter raises an exception (issue2987)
Matt Mackall <mpm@selenic.com> [Tue, 21 Aug 2012 12:27:57 -0500] rev 17382
merge with stable