- Mar 16, 2018
-
-
Pulkit Goyal authored
-
Pulkit Goyal authored
rev numbers can change, so it's better to show changeset hash.
-
Pulkit Goyal authored
This patch adds functionality to `hg prev` to prompt user to choose one parent to update when multiple parents exist. Surprisingly there were no tests for this case before this patch, I added one with this patch.
-
Pulkit Goyal authored
In the cmdnext function, there are some conditionals which returns early and some which sets a result value to be returned later. Let's return from all the conditionals early. There are if, elif and else involved, so it's sure we will end up in one of the conditional, each conditional will return, so it's guranteed that we are returning the correct value and returning everytime.
-
Pulkit Goyal authored
This patch makes `hg next --evolve` prompt user to choose a child to evolve and update when multiple of them exists. This is improvement over previous behavior where we used to error out saying ambiguous next unstable changeset and told user to manually use `hg evolve -r rev`. While writing this patch, I am personally very happy to have this feature as I have encountered this stage many times and I wanted `next --evolve` to take care of that. It uses the revselectionprompt thing added in earlier patches.
-
Pulkit Goyal authored
This patch moves the logic which evolves the children and updates to it in `hg next --evolve` to it's own function as we want to use that again.
-
Pulkit Goyal authored
This patch adds functionality to prompt user and ask the children to which next should move to incase of multiple childrens. This is a very nice UI because otherwise user has to lookup changeset hash, and then manually do `hg update` to that. In this case we show hash and description so user can choose which one to update easily. It is using the interactive revision choosing functionality added in a previous patch.
-
Pulkit Goyal authored
Rev numbers can change, hence we should show rev hash instead of rev numbers in dry-run.
-
- Mar 17, 2018
-
-
Pulkit Goyal authored
The part of code which is touched decides on evolution of merge changeset. We need proper handling of each case there, so before adding logic, let's add conditional for each case so that upcoming patches are easy to understand.
-
- Mar 19, 2018
-
-
Pulkit Goyal authored
This patch adds three more cases related to stabilization of orphaned merge commits.
-
Pierre-Yves David authored
Spotted by Pulkit Goyal.
-
Pierre-Yves David authored
Message is a bit long, but should be less scary.
-
- Mar 14, 2018
-
-
Pulkit Goyal authored
This patch adds functionality to prompt user to select a revision when there exists multiple stabilization destination because of split on multiple branches. Test are also added for the feature. I am not sure whether this is the best message which we can show, if people have suggestions I will like to improve the messages shown in prompt.
-
Pulkit Goyal authored
The tests in test-unstable.t files are now moved to their dedicated file with all the cases to that in that file. Let's delete them from here.
-
- Mar 16, 2018
-
-
Pulkit Goyal authored
This patch moves the logic to update to children changeset during `hg next` in a separate function because we want to re-use the logic when we will prompt user to choose a changeset in case of multiple childrens.
-
- Mar 14, 2018
-
-
Pulkit Goyal authored
This patch adds a utility function to interactively prompt user to choose a revision to proceed in cases when there are multiple revisions which are candidates. The function will be used in `hg evolve`, `hg next`, `hg prev` etc. If user feedback will be good, I plan to move it to core and use it at more possible places.
-
Pulkit Goyal authored
There are some similar tests lying around in the test suite but they are not well arranged. I wanted the test suite to be a goto reference for all the behaviors till the time we get all of them documented.
-
- Mar 19, 2018
-
-
Boris Feld authored
Mercurial core 2090044a288d added a new revbranchcache part which changed some exchange-related outputs. Glob them to ease merging with old Mercurial versions branches.
-
- Mar 16, 2018
-
-
Martin von Zweigbergk authored
-
- Mar 13, 2018
-
-
Pulkit Goyal authored
This patch more tests related to stabilization of orphaned merge commit. Stabilization of a merge changeset with both the parents is not supported right now and prints a message on how to do that. Maybe we should do that internally as a part of `hg evolve` but I need to think about this.
-
Pulkit Goyal authored
As demonstrated by tests added in previous patch, if one of the parent of a merge changeset has a new version and merge changeset gets, running `hg evolve` to stabilize that if results in conflicts will lead to lose of other parent of that merge changeset when we resolve conflicts and do `hg evolve --continue`. This patch fixes the behavior, by checking whether we are continuing evolving a merge changeset and if yes, setting the dirstate parents according to that.
-
Pulkit Goyal authored
This patch adds a new test file named test-evolve-orphan-merge.t which contains test cases when `hg evolve` try to stabilize a merge changeset which was orphan. This file contains 20-30% of all the cases as we have got something to fix before we add tests for rest of the cases. Going by this approach will make sure we don't live unfixed cases in the test file and the test files does not become a pile of hacks which are used to get in state when we fix the bugs.
-
Pulkit Goyal authored
Before this patch, we go all the way down to obsmarker creation logic and gets an error saying that changeset cannot obsolete itself. We should be more smart here and error out early saying we cannot grab that changeset.
-
- Mar 03, 2018
-
-
Pulkit Goyal authored
The pctx variable is used outside of the if-else but it was initialized under the conditional statements. Added test for the case when the initialization inside the if-else broke `hg grab --continue`.
-
- Mar 14, 2018
-
-
Pierre-Yves David authored
The approach we used in 4.5 works again :-)
-
Pierre-Yves David authored
Mercurial core 0b18604db95e changed the way permissions are registered.
-
Pierre-Yves David authored
This make use compatible with whatever changes on this side.
-
- Mar 07, 2018
-
-
Pierre-Yves David authored
-
- Feb 23, 2018
-
-
Anton Shestakov authored
-
- Mar 05, 2018
-
-
Pierre-Yves David authored
(guess who forgot to amend)...
-
- Mar 04, 2018
-
-
Boris Feld authored
The operation is helpful when debugging a case where we don't know how we ended up in this case while effect-flag are useful to understand what semantic changes happens to a changeset. Add the operation when displaying an obs-marker in the following form: `rewritten as X using amend` The other proposal is interesting but seems harder to internationalize and might requires update each time we introduce new operation: `Amended as X` Let's use the first proposal right now.
-
- Dec 19, 2017
-
-
Sean Farley authored
This seems fine since we topic never impact public only caches.
-
- Mar 04, 2018
-
-
Pierre-Yves David authored
Since showlist is deprecated, let us use compatlist.
-
Pierre-Yves David authored
Since showlist is deprecated, let us use compatlist.
-
Pierre-Yves David authored
This will help use to support the new template API.
-
Boris Feld authored
-
Pierre-Yves David authored
-
Pierre-Yves David authored
The template registration have significantly changed in core:7b74afec6772. We take simpler approach to define the alias in a way that works for all versions.
-
- Dec 06, 2017
-
-
Sean Farley authored
-
- Mar 03, 2018
-
-
Pierre-Yves David authored
Unconditionally disabling bundle1 is a problem for larger hosting website. We adopt a less aggressive approach and only disable it the default would be used.
-