Fri, 14 Jul 2017 03:16:06 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 03:16:06 +0200] rev 2746
branching: merge with stable
Fri, 14 Jul 2017 02:46:28 +0200 prev: allow to update to 't0' from 't1'
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 02:46:28 +0200] rev 2745
prev: allow to update to 't0' from 't1' When on the first changeset of a topic, one can move back one changeset to end up on t0. The new working copy parent to not belong to the topic, but the topic is still active. The next commit will create a new root to the active topic. You can get the same result using `hg up t0`
Fri, 14 Jul 2017 02:42:33 +0200 topic: add a 'topicidx()' to context
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 02:42:33 +0200] rev 2744
topic: add a 'topicidx()' to context This will be useful for the `t0` logic in `hg prev`
Fri, 14 Jul 2017 02:41:53 +0200 prev: retrieve the 'no-topic' result is a clear and reusable option
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 02:41:53 +0200] rev 2743
prev: retrieve the 'no-topic' result is a clear and reusable option We'll use it more, so let us make it pretty first.
Fri, 14 Jul 2017 02:35:12 +0200 prev: add '_getcurrenttopic' helper and use it
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 02:35:12 +0200] rev 2742
prev: add '_getcurrenttopic' helper and use it We'll add more spot where this information is used.
Fri, 14 Jul 2017 02:34:42 +0200 prev: explicitly use 'p1' as a variable name
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 02:34:42 +0200] rev 2741
prev: explicitly use 'p1' as a variable name This make the code clearer.
Fri, 14 Jul 2017 01:53:56 +0200 topic: rename the internal topic option
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 01:53:56 +0200] rev 2740
topic: rename the internal topic option we'll use it more widely so I give it a more generic name. It is an internal option so not wories regarding compatibility.
Fri, 14 Jul 2017 01:49:43 +0200 prev: extract the code computing the destination
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 01:49:43 +0200] rev 2739
prev: extract the code computing the destination This make the handling of the result simpler. The test agree as one return code is fixed.
Fri, 14 Jul 2017 01:32:34 +0200 prev: issue a proper error when reaching repository root
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 01:32:34 +0200] rev 2738
prev: issue a proper error when reaching repository root (and adds the associated test)
Fri, 14 Jul 2017 01:21:32 +0200 prev: stop creating a repository at the root of 'test-repo.t'
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 01:21:32 +0200] rev 2737
prev: stop creating a repository at the root of 'test-repo.t' We run the test in a subdirectory now, this usually avoid various kind of future issue.
Fri, 14 Jul 2017 01:12:20 +0200 prev: extract the function performing the update
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 01:12:20 +0200] rev 2736
prev: extract the function performing the update That code is fairly independant so let us isolate it to simplify the rest of the code.
Fri, 14 Jul 2017 01:01:22 +0200 prev: simplify the bookmark preserving logic
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 14 Jul 2017 01:01:22 +0200] rev 2735
prev: simplify the bookmark preserving logic We can use 'None' as a special value and have a simpler code.
(0) -1000 -300 -100 -12 +12 +100 +300 +1000 tip