Hey everyone! This is my final blog post here. GSoC 19 has finally come to its end. This week I mostly worked on hg abort --update

What did I do this week?

This week I worked on writing intensive-tests for hg update --abort
As suggested by @mharbison72 I worked on cases where we need to take considerations of subrepos and check cases where a subrepo is dirty and cases where more than one subrepo is present and conflicts for one or more of them is resolved but not all conflicts are resolved so as to check the unmark feature. The patch is still under review but it too will soon get accepted.

Did you get stuck anywhere?
I did not get on anything major this week . I did have to perfect the code considering some endpoint cases but it came around fine enough.

Finally, I would like to  thank Pulkit for reviewing the patches and solving the doubts despite having a busy schedule, Martin and other people in the community for teaching the basic etiquettes and facts required to be a better open-source contributor and solving the doubts no matter how silly they were.

Adios !

Hello everyone! This is one of the last blogposts. This week I worked on the last features I needed to add in my GSoC period i.e. hg update --abort

What did I do this week?
As stated in the previous week I worked on hg transplant --abort. As suggested by @Pulkit it was modified to --stop flag and finally got it merged [1]. I also resolved most of the hg continue series of patches.
Later this week I was finally able to deduce a logic for hg update --abort and sent a patch for that [2]. It is still under review though.

What is coming up next?

As almost all patches are dealt with I will modify the patch for hg update --abort as suggested by the community and get that merged.
I will also the continue patches for evolve at the beginning of the next week and get them merged too.
This issue has been one of the most requested features and I am really happy that I could work on this and get it resolved. Also in this week, I will be working on my GSoC 19 blog which is supposed to be attached as prescribed by final product submission guidelines.

Did you get stuck anywhere?
I got stuck regarding the logic of hg update --abort for long enough but a deeper understanding of mergestate and associated functions help me deduce a logic which was not functional initially but later this week I was able to make it work. I am still adding more extensive test cases for it to make the feature perfect. It is one of the most interesting features that I have worked on this summer which involved developing a deeper understanding of the merge and update workflow.

Hey everyone!! This is what I did this week. In this phase, I worked mostly on getting my previous patches on hg continue merged and on hg update --abort.

What did I do this week?
This week I was asked to make some modifications on the patches that I previously sent regarding hg continue . I had to refactor things for graft and clean up the code. Further, I had to modify the code for transplant too. I also worked on hg transplant --abort and it is still under review.
The code for hg update --abort is still under progress.
What is coming up next?

This week I am planning to get hg continue series and hg transplant --abort merged. Also, I would like to get hg update --abort to a decent review level.

Did you get stuck anywhere?
This week I did not get into any major problem. While refactoring code for graft I did face the problem of not being able to remove opts as the argument from updateopts function. However, I later realized that opts were not being loaded properly which was causing the bug . I will try to resolve this bug this week.

Hey everyone! This is what I did this week. In this phase, I worked mostly on the understanding of mergestate for developing a patch for hg update --abort. This is the last part that I need to complete before GSoC deadline.

What did I do this week?

As stated previously I worked on evolve and was able to get my patches for hg abort for evolve repository merged which included adding support for hg evolve and hg pick. Also, I worked on hg continue support and was able to add support for evolve. I will submit the patch for that once pick is also complete.
As for hg update --abort I went through the code for hg resolve -u and
also -at:local. I learned what merge state stores and started writing the code adding --abort flag for hg update.
I also received reviews for the continue patches I sent to the core repo and modified my patches according to that.

What is coming up next?

This week I am planning to complete support for hg continue for evolve. Also, I would send my first patch for hg update --abort.

Did you get stuck anywhere?

I got stuck with the logic of abort flag but @Pulkit pointed me to go through the code and documentation of mergestate which helped me get a better understanding of the workflow.

Greetings everyone! Update for this week is as follows. In this phase, I sent the remaining patches required to complete hg continue support for core Mercurial repository.

What did I do this week?
As stated in the previous week I sent patches for hg continue for for graft, transplant and histedit. [1] [2] [3] [4]
I also created logic for hg transplant --abort[5] as asked by @Pulkit and added its support to hg abort plan [6]. These patches are still to be merged and under review.

What is coming up next?

This week I am planning to complete support for hg continue for evolve. Also, I will start my work on logic for hg update --abort which is one of the most demanded features for Mercurial.
My patches for hg abort for evolve merged as they still left to get reviews as most of the people in the community are busy with the new version release.

Did you get stuck anywhere?

I did get stuck when I started with the logic for aborting a transplant but @Pulkit again helped me out of the situation and suggested that I should look into the recover method of the transplanter class.