Wed, 31 May 2017 14:28:14 +0200 test-compat: merge with mercurial-4.0 branch mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 31 May 2017 14:28:14 +0200] rev 2533
test-compat: merge with mercurial-4.0 branch The new 'olog' command is not working with 3.9 so we skill all mentions of it in the tests. This also apply to the topic extensions.
Wed, 31 May 2017 14:23:45 +0200 test-compat: merge with mercurial-4.1 mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 31 May 2017 14:23:45 +0200] rev 2532
test-compat: merge with mercurial-4.1 hg log has no trouble field in mercurial 4.0, output fixed.
Wed, 31 May 2017 14:21:18 +0200 test-compat: merge with stable mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 31 May 2017 14:21:18 +0200] rev 2531
test-compat: merge with stable Nothing special to report, minor test-metaedit.t output change.
Wed, 31 May 2017 14:12:33 +0200 merge with default stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 31 May 2017 14:12:33 +0200] rev 2530
merge with default
Wed, 31 May 2017 12:09:24 +0200 compat: fix stablerange for mercurial 3.9
Boris Feld <boris.feld@octobus.net> [Wed, 31 May 2017 12:09:24 +0200] rev 2529
compat: fix stablerange for mercurial 3.9 Lrudict.get change of api between mercurial 3.9 and mercurial 4.2. Bypass this limitation by using lrudict.__getitem__ and catch the KeyError directly.
Tue, 30 May 2017 22:09:28 +0200 template: fix successors and precursors templates
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 22:09:28 +0200] rev 2528
template: fix successors and precursors templates In mercurial 4.1-, the gen argument is expected to be an iterator and not an iterable, fix successors and precursors templates.
Tue, 30 May 2017 19:59:57 +0200 lint: remove double newline in test file
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 19:59:57 +0200] rev 2527
lint: remove double newline in test file Test file test-stablesort-criss-cross.t contained two double newline, I remove them.
Tue, 30 May 2017 19:43:14 +0200 template: fix precursors template for older mercurial version
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 19:43:14 +0200] rev 2526
template: fix precursors template for older mercurial version In mercurial 4.1 and below templatekw._hybrid require the gen argument to be different than None. Manually compute the same default output for these older mercurial versions.
Tue, 30 May 2017 13:16:43 +0200 compatibility: backport mercurial 176d1a0ce385
Boris Feld <boris.feld@octobus.net> [Tue, 30 May 2017 13:16:43 +0200] rev 2525
compatibility: backport mercurial 176d1a0ce385 Backport obsstore.relevantmarkers change for including previously forgotten pruned obs markers. Target mercurial version lesser than 4.3. This impact multiple tests. All test changes has been manually checked. Since the computation of relevant obsmarkers have changed, we are bumping the cache schema version. So that caches get recomputed.
Tue, 30 May 2017 17:39:00 +0200 evolve: fix import order
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 30 May 2017 17:39:00 +0200] rev 2524
evolve: fix import order
(0) -1000 -300 -100 -10 +10 +100 +300 +1000 tip