Thu, 23 Aug 2012 18:19:19 -0500 wix: bump MSI based installers to use Python 2.7 stable
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.
Fri, 24 Aug 2012 14:53:07 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 24 Aug 2012 14:53:07 -0500] rev 17388
merge with stable
Fri, 24 Aug 2012 14:52:45 -0500 tests: fix template test output
Matt Mackall <mpm@selenic.com> [Fri, 24 Aug 2012 14:52:45 -0500] rev 17387
tests: fix template test output
Wed, 22 Aug 2012 11:18:35 -0400 merge: handle case when heads are all bookmarks stable
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.
Tue, 21 Aug 2012 20:51:16 +0200 verify: do not choke on valid changelog without manifest stable
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]
Tue, 21 Aug 2012 13:12:56 -0700 Merge
Bryan O'Sullivan <bryano@fb.com> [Tue, 21 Aug 2012 13:12:56 -0700] rev 17384
Merge
Fri, 17 Aug 2012 15:12:01 -0700 templater: abort when a template filter raises an exception (issue2987)
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)
Tue, 21 Aug 2012 12:27:57 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 21 Aug 2012 12:27:57 -0500] rev 17382
merge with stable
Tue, 21 Aug 2012 12:27:47 -0500 merge with i18n
Matt Mackall <mpm@selenic.com> [Tue, 21 Aug 2012 12:27:47 -0500] rev 17381
merge with i18n
Mon, 13 Aug 2012 16:09:35 +0400 i18n-ru: synchronized with c6f88e7f95b7
Alexander Sauta <demosito@gmail.com> [Mon, 13 Aug 2012 16:09:35 +0400] rev 17380
i18n-ru: synchronized with c6f88e7f95b7
Tue, 21 Aug 2012 12:26:53 -0500 merge heads in stable stable
Matt Mackall <mpm@selenic.com> [Tue, 21 Aug 2012 12:26:53 -0500] rev 17379
merge heads in stable
Fri, 17 Aug 2012 14:37:59 -0500 commit: normalize filenames when checking explicit files (issue3576) stable
Matt Mackall <mpm@selenic.com> [Fri, 17 Aug 2012 14:37:59 -0500] rev 17378
commit: normalize filenames when checking explicit files (issue3576)
Sat, 18 Aug 2012 16:35:36 +0200 test-status.t: test ui.slash on Windows
Patrick Mezard <patrick@mezard.eu> [Sat, 18 Aug 2012 16:35:36 +0200] rev 17377
test-status.t: test ui.slash on Windows
Thu, 16 Aug 2012 13:57:43 +0200 manifest: remove redundant sorted() call for --all
Adrian Buehlmann <adrian@cadifra.com> [Thu, 16 Aug 2012 13:57:43 +0200] rev 17376
manifest: remove redundant sorted() call for --all repo.store.datafiles() is now already sorted (for all types of stores). A follow-up to 4cbb1137941d.
Wed, 15 Aug 2012 16:33:26 -0700 Merge from crew-stable
Bryan O'Sullivan <bryano@fb.com> [Wed, 15 Aug 2012 16:33:26 -0700] rev 17375
Merge from crew-stable
Wed, 15 Aug 2012 16:31:25 -0700 store: only one kind of OSError means "nonexistent entry" stable
Bryan O'Sullivan <bryano@fb.com> [Wed, 15 Aug 2012 16:31:25 -0700] rev 17374
store: only one kind of OSError means "nonexistent entry"
Wed, 15 Aug 2012 16:30:32 -0700 store: sort the results of fncachestore.datafiles() stable
Bryan O'Sullivan <bryano@fb.com> [Wed, 15 Aug 2012 16:30:32 -0700] rev 17373
store: sort the results of fncachestore.datafiles()
Wed, 15 Aug 2012 23:03:40 +0200 Merge with stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 23:03:40 +0200] rev 17372
Merge with stable
Wed, 15 Aug 2012 22:50:23 +0200 fileset: fix generator vs list bug in fast path stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 22:50:23 +0200] rev 17371
fileset: fix generator vs list bug in fast path $ hg debugfileset 'a or b' would only return a or b but not both because the base file list was a generator instead of a replayable sequence.
Wed, 15 Aug 2012 22:28:32 +0200 debugfileset: implement --rev, more tests stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 22:28:32 +0200] rev 17370
debugfileset: implement --rev, more tests
Wed, 15 Aug 2012 22:09:09 +0200 test-fileset: test remaining predicates stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 22:09:09 +0200] rev 17369
test-fileset: test remaining predicates - exec - symlink - size - resolved / unresolved - subrepo
Wed, 15 Aug 2012 19:25:45 +0200 fileset: do not traceback on invalid grep pattern stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 19:25:45 +0200] rev 17368
fileset: do not traceback on invalid grep pattern
Wed, 15 Aug 2012 22:29:32 +0200 fileset: matchctx.existing() must consider ignored files stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 22:29:32 +0200] rev 17367
fileset: matchctx.existing() must consider ignored files When running: $ hg debugfileset 'binary() and ignored()' getfileset() was correctly retrieving ignored files but matchctx.existing() was not taking them in account. Just add them along with unknown files.
Wed, 15 Aug 2012 22:29:09 +0200 fileset: matchctx.existing() must consider unknown files stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 22:29:09 +0200] rev 17366
fileset: matchctx.existing() must consider unknown files By default, unknown files are ignored. If the 'unknown()' predicate appears in the syntax tree, then they are taken in account. Unfortunately, matchctx.existing() was filtering against non-deleted context files, which does not include unknown files. So: $ hg debugfileset 'binary() and unknown()' would not return existing binary unknown files.
Wed, 15 Aug 2012 21:44:00 +0200 fileset: exclude deleted files from matchctx.existing() stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 21:44:00 +0200] rev 17365
fileset: exclude deleted files from matchctx.existing() Running: $ hg debugfileset 'binary()' would traceback if there were one deleted file in the working directory. It happened because matchctx.existing() was filtering files against the ctx.__contains__() but deleted files are still considered part of workingctx.
Wed, 15 Aug 2012 18:04:50 +0200 test-fileset: test file status predicates stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 18:04:50 +0200] rev 17364
test-fileset: test file status predicates
Wed, 15 Aug 2012 19:02:04 +0200 fileset: actually implement 'minusset' stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 19:02:04 +0200] rev 17363
fileset: actually implement 'minusset' $ hg debugfileset 'a* - a1' was tracing back because 'minus' symbol was not supported.
Wed, 15 Aug 2012 17:39:03 +0200 tests: test filesets with test-fileset.t stable
Patrick Mezard <patrick@mezard.eu> [Wed, 15 Aug 2012 17:39:03 +0200] rev 17362
tests: test filesets with test-fileset.t
Wed, 15 Aug 2012 12:12:21 +0200 merge with stable
Sune Foldager <cryo@cyanite.org> [Wed, 15 Aug 2012 12:12:21 +0200] rev 17361
merge with stable
Wed, 15 Aug 2012 12:04:50 +0200 rollback: write dirstate branch with correct encoding stable
Sune Foldager <cryo@cyanite.org> [Wed, 15 Aug 2012 12:04:50 +0200] rev 17360
rollback: write dirstate branch with correct encoding
(0) -10000 -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 +10000 +30000 tip