D2409: graft: add no-commit mode (issue5631)

This revision was automatically updated to reflect the committed changes. Closed by commit rHG622f79e3a1cb: graft: add no-commit mode (issue5631) (authored by khanchi97, committed by ). CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D2409?vs=9301&id=9311#toc REPOSITORY rHG Mercurial

D2409: graft: add no-commit mode (issue5631)

pulkit accepted this revision. pulkit added a comment. landed REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2409 To: khanchi97, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel _

D2409: graft: add no-commit mode (issue5631)

khanchi97 updated this revision to Diff 9301. khanchi97 edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2409?vs=8961&id=9301 REVISION DETAIL https://phab.mercurial-scm.org/D2409 AFFECTED FILES mercurial/commands.py

D2409: graft: add no-commit mode (issue5631)

pulkit added a comment. The patch mostly looks good to me. Added some minor nits. It will be great if you can add test where we graft multiple revs with --no-commit flag. INLINE COMMENTS > test-graft.t:1551 > + $ hg ci -qAm2 > + $ hg log > + changeset: 2:db815d6d32e6 We should print a

D2409: graft: add no-commit mode (issue5631)

khanchi97 updated this revision to Diff 8961. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2409?vs=8958&id=8961 REVISION DETAIL https://phab.mercurial-scm.org/D2409 AFFECTED FILES mercurial/commands.py tests/test-completion.t tests/test-graft.t

D2409: graft: add no-commit mode (issue5631)

khanchi97 updated this revision to Diff 8958. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2409?vs=8955&id=8958 REVISION DETAIL https://phab.mercurial-scm.org/D2409 AFFECTED FILES mercurial/commands.py tests/test-graft.t CHANGE DETAILS diff --gi

D2409: graft: add no-commit mode (issue5631)

pulkit requested changes to this revision. pulkit added a comment. This revision now requires changes to proceed. Please add tests where we are grafting multiple revisions using the --no-commit flag. INLINE COMMENTS > commands.py:2225 > +if opts.get('edit'): > +raise erro

D2409: graft: add no-commit mode (issue5631)

khanchi97 updated this revision to Diff 8955. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2409?vs=8953&id=8955 REVISION DETAIL https://phab.mercurial-scm.org/D2409 AFFECTED FILES mercurial/commands.py tests/test-graft.t CHANGE DETAILS diff --gi

D2409: graft: add no-commit mode (issue5631)

pulkit requested changes to this revision. pulkit added inline comments. This revision now requires changes to proceed. INLINE COMMENTS > commands.py:2245 > revs = [repo[node].rev() for node in nodes] > +if opts.get('no_commit'): > +statedata['no_commit']

D2409: graft: add no-commit mode (issue5631)

khanchi97 added a comment. In https://phab.mercurial-scm.org/D2409#57814, @pulkit wrote: > In https://phab.mercurial-scm.org/D2409#56200, @khanchi97 wrote: > > > @pulkit do we have new state format pushed in? > > > Yep, you can go ahead and rebase this patch to make it use the ne

D2409: graft: add no-commit mode (issue5631)

khanchi97 updated this revision to Diff 8953. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2409?vs=6538&id=8953 REVISION DETAIL https://phab.mercurial-scm.org/D2409 AFFECTED FILES mercurial/commands.py tests/test-graft.t CHANGE DETAILS diff --gi

D2409: graft: add no-commit mode (issue5631)

pulkit added a comment. In https://phab.mercurial-scm.org/D2409#56200, @khanchi97 wrote: > @pulkit do we have new state format pushed in? Yep, you can go ahead and rebase this patch to make it use the new statefile format. REPOSITORY rHG Mercurial REVISION DETAIL https://pha

D2409: graft: add no-commit mode (issue5631)

pulkit added a comment. In https://phab.mercurial-scm.org/D2409#56200, @khanchi97 wrote: > In https://phab.mercurial-scm.org/D2409#44682, @pulkit wrote: > > > In https://phab.mercurial-scm.org/D2409#43891, @khanchi97 wrote: > > > > > pulkit: Can you please review it? I have made th

D2409: graft: add no-commit mode (issue5631)

khanchi97 added a comment. In https://phab.mercurial-scm.org/D2409#44682, @pulkit wrote: > In https://phab.mercurial-scm.org/D2409#43891, @khanchi97 wrote: > > > pulkit: Can you please review it? I have made the requested changes. > > > I am sorry but I will like this to wait bef

D2409: graft: add no-commit mode (issue5631)

pulkit added a comment. In https://phab.mercurial-scm.org/D2409#43891, @khanchi97 wrote: > pulkit: Can you please review it? I have made the requested changes. I am sorry but I will like this to wait before we land the new state format thing. I don't want to put more information i

D2409: graft: add no-commit mode (issue5631)

khanchi97 added a comment. pulkit: Can you please review it? I have made the requested changes. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2409 To: khanchi97, #hg-reviewers Cc: pulkit, mercurial-devel ___ Mercurial

D2409: graft: add no-commit mode (issue5631)

khanchi97 added a comment. I have added tests to show the behavior of --no-commit with other flags. INLINE COMMENTS > pulkit wrote in commands.py:2309 > To be honest I am not fan of storing data in such format, but that's how we > store data right now. I have finally a series in review where

D2409: graft: add no-commit mode (issue5631)

khanchi97 updated this revision to Diff 6538. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2409?vs=6325&id=6538 REVISION DETAIL https://phab.mercurial-scm.org/D2409 AFFECTED FILES mercurial/commands.py tests/test-graft.t CHANGE DETAILS diff --gi

D2409: graft: add no-commit mode (issue5631)

pulkit added inline comments. INLINE COMMENTS > commands.py:2309 > +else: > +repo.vfs.write('graftstate', 'False\n') > nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] To be honest I am not fan of storing data in such format, but tha

D2409: graft: add no-commit mode (issue5631)

khanchi97 added a comment. What I did to store `--no-commit` flag in `graftstate` is: Add a flag `True/False` in 1st line of `graftstate` and keep it updated from previous value in `graftstate` for every iteration in `revs`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercuri

D2409: graft: add no-commit mode (issue5631)

khanchi97 updated this revision to Diff 6325. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2409?vs=6132&id=6325 REVISION DETAIL https://phab.mercurial-scm.org/D2409 AFFECTED FILES mercurial/commands.py tests/test-graft.t CHANGE DETAILS diff --gi

D2409: graft: add no-commit mode (issue5631)

pulkit added a comment. Sorry for getting a bit late for reviewing this. I was mostly traveling for last few days. In https://phab.mercurial-scm.org/D2409#40102, @khanchi97 wrote: > Hello Pulkit, > After spending some time with graft implementation, I hope now I have a good under

Re: D2409: graft: add no-commit mode (issue5631)

Hello there, Can I get a little review on this :) On Tue, Feb 27, 2018 at 1:58 AM, khanchi97 (Sushil khanchi) < phabrica...@mercurial-scm.org> wrote: > khanchi97 updated this revision to Diff 6132. > > REPOSITORY > rHG Mercurial > > CHANGES SINCE LAST UPDATE > https://phab.mercurial-scm.org/D

D2409: graft: add no-commit mode (issue5631)

khanchi97 updated this revision to Diff 6132. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2409?vs=6028&id=6132 REVISION DETAIL https://phab.mercurial-scm.org/D2409 AFFECTED FILES mercurial/commands.py tests/test-graft.t CHANGE DETAILS diff --gi

D2409: graft: add no-commit mode (issue5631)

khanchi97 added a comment. Hello Pulkit, After spending some time with graft implementation, I hope now I have a good understanding of how graft is working. Let me tell you what I have understood and how I want to implement `--no-commit` mode. So when we hit a merge conflict what we do is

D2409: graft: add no-commit mode (issue5631)

pulkit added a comment. Can you test about the `--no-commit` flag being respected when we do `--continue` in case of conflicts? That part is not handled by this patch yet. To elaborate: $ hg graft --no-commit warning: conflicts while merging ... $ resolve the conflicts

D2409: graft: add no-commit mode (issue5631)

khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2409 AFFECTED FILES mercurial/commands.py tests/test-graft.t CHANGE DETAILS diff --git a/tests/te