D6695: transplant: added support for --abort flag

2019-08-15 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Let's rename this to `transplant --stop` instead. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6695 To: taapas1128, #hg-reviewers Cc: pulkit, mjpieters,

D6695: transplant: added support for --abort flag

2019-08-08 Thread pulkit (Pulkit Goyal)
pulkit added a comment. Sorry for missing this earlier, but what happens when we are transplanting mutliple revisions and we have conflicts in a revision after the first one? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL

D6695: transplant: added support for --abort flag

2019-08-08 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > pulkit wrote in test-transplant.t:466 > A better candidate here will be to show `hg status -v` as that will show > whether there is an unfinished transplant or not. This one is not done. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6695: transplant: added support for --abort flag

2019-08-08 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 16162. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6695?vs=16159=16162 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6695 AFFECTED

D6695: transplant: added support for --abort flag

2019-08-08 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > transplant.py:417 > +"""logic to abort an interrupted transplant""" > +if repo.vfs.exists('transplant/journal'): > +startctx = repo['.'] `canresume` above can be used for doing this check. REPOSITORY rHG Mercurial

D6695: transplant: added support for --abort flag

2019-08-08 Thread taapas1128 (Taapas Agrawal)
taapas1128 marked 4 inline comments as done. taapas1128 updated this revision to Diff 16159. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6695?vs=16069=16159 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL

D6695: transplant: added support for --abort flag

2019-08-07 Thread pulkit (Pulkit Goyal)
pulkit added inline comments. INLINE COMMENTS > transplant.py:416 > > +def clear(self): > +"""clear the state file if it exists""" We already have `self.unlog` doing the same here. > transplant.py:421 > + > +def abort(self, ui ,repo): > +"""logic to abort an

D6695: transplant: added support for --abort flag

2019-07-26 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 16069. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6695?vs=16068=16069 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6695 AFFECTED

D6695: transplant: added support for --abort flag

2019-07-26 Thread taapas1128 (Taapas Agrawal)
taapas1128 updated this revision to Diff 16068. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6695?vs=16067=16068 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6695 AFFECTED

D6695: transplant: added support for --abort flag

2019-07-25 Thread taapas1128 (Taapas Agrawal)
taapas1128 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This adds fuctionality for `--abort` flag to `transplant`. A new method `abort` is added to `transplanter` class containing logic to abort