Sat, 12 Mar 2016 12:36:25 +0000 compat: adapt to change in mercurial core
Pierre-Yves David <pierre-yves.david@fb.com> [Sat, 12 Mar 2016 12:36:25 +0000] rev 1878
compat: adapt to change in mercurial core The code around merge destination have been changed in core, we do some basic adaptation to make sure we don't crash. Further rework to adapt//take advantage of core change would probably be useful but this is not the point of this commit.
Thu, 31 Dec 2015 11:23:19 -0500 topic: handle merge.update function signature change
Augie Fackler <raf@durin42.com> [Thu, 31 Dec 2015 11:23:19 -0500] rev 1877
topic: handle merge.update function signature change I think this is backwards compatible with how it used to be called, but I didn't worry about it too much either.
Fri, 11 Dec 2015 13:12:23 -0500 Merge.
Augie Fackler <raf@durin42.com> [Fri, 11 Dec 2015 13:12:23 -0500] rev 1876
Merge.
Fri, 11 Dec 2015 13:09:29 -0500 test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com> [Fri, 11 Dec 2015 13:09:29 -0500] rev 1875
test-topic-dest: test fixes I should have put in the previous change I split a bigger change from marmoute that included some rebase support that I wanted to discuss more, but I didn't correctly commit my fixes to the tests before pushing. Oops.
Fri, 11 Dec 2015 12:53:20 -0500 topic: fix changing topics of commits that have an amend_source
Augie Fackler <raf@durin42.com> [Fri, 11 Dec 2015 12:53:20 -0500] rev 1874
topic: fix changing topics of commits that have an amend_source Includes a test for this specific case, but we should probably spend more time squinting at the interactions between the current topic wrapper function and commitctx for memctx instances.
Fri, 11 Dec 2015 12:53:38 -0500 topic: remove useless call to c.parents()
Augie Fackler <raf@durin42.com> [Fri, 11 Dec 2015 12:53:38 -0500] rev 1873
topic: remove useless call to c.parents()
Fri, 11 Dec 2015 12:56:23 -0500 topic: fix up change logic a little and add debug logging
Augie Fackler <raf@durin42.com> [Fri, 11 Dec 2015 12:56:23 -0500] rev 1872
topic: fix up change logic a little and add debug logging
Wed, 21 Oct 2015 01:09:15 +0200 merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 21 Oct 2015 01:09:15 +0200] rev 1871
merge: use topic to pick default destination If the topic have multiple heads, reduce that. Otherwise, pick the branch we are on.
Wed, 21 Oct 2015 01:12:32 +0200 topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 21 Oct 2015 01:12:32 +0200] rev 1870
topic: introduce a 'ngtip' concept The concept is to be massively used in naming and default destination logic. The name is horrible so that people find a better one.
Thu, 08 Oct 2015 21:09:47 -0700 template: test that topic is accessible through template
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 08 Oct 2015 21:09:47 -0700] rev 1869
template: test that topic is accessible through template This comes free with the namespace feature but it is good to have.
Fri, 23 Oct 2015 13:40:44 +0100 test: adapt to newer mercurial
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 23 Oct 2015 13:40:44 +0100] rev 1868
test: adapt to newer mercurial
Thu, 08 Oct 2015 20:43:15 -0700 patch: import topic from patch header
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 08 Oct 2015 20:43:15 -0700] rev 1867
patch: import topic from patch header If the used Mercurial supports it, we import topic from patch headers.
(0) -1000 -300 -100 -12 +12 +100 +300 +1000 +3000 tip