D6479: shelve: first prototype of storing/restoring unresolved changes

pulkit added a comment. In D6479#98757 , @navaneeth.suresh wrote: > In D6479#98737 , @durin42 wrote: > >> The only thing I'm curious about really is why we have extrastorage and usualstorge. Can w

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh added a comment. In D6479#98737 , @durin42 wrote: > The only thing I'm curious about really is why we have extrastorage and usualstorge. Can we get away with only one of those choices instead of having more options? The ul

D6479: shelve: first prototype of storing/restoring unresolved changes

durin42 added a comment. The only thing I'm curious about really is why we have extrastorage and usualstorge. Can we get away with only one of those choices instead of having more options? INLINE COMMENTS > shelve.py:432 > + > +def _storeunresolvedmerge(ui, repo, name=None, extra=None): > +

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh updated this revision to Diff 15765. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15764&id=15765 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6479 AFFEC

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh updated this revision to Diff 15764. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15693&id=15764 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6479 AFFEC

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh added a comment. In D6479#96318 , @pulkit wrote: > Since you did the nice work of moving shelve to core, how about rebasing this patch on tip of default with shelve in core? Doing that right away! REPOSITORY rHG Mercuria

D6479: shelve: first prototype of storing/restoring unresolved changes

pulkit added a comment. Since you did the nice work of moving shelve to core, how about rebasing this patch on tip of default with shelve in core? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.or

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh updated this revision to Diff 15693. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15534&id=15693 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6479 AFFEC

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in test-shelve-unresolved.t:169 > We can get rid of this #if and #endif too. the usualstorage one will have > `(unresolved)` in the test output. We have functionality to have test output > case wise which can be used. > > F

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh marked 7 inline comments as done. navaneeth.suresh updated this revision to Diff 15534. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15517&id=15534 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION D

D6479: shelve: first prototype of storing/restoring unresolved changes

pulkit added inline comments. INLINE COMMENTS > test-shelve-unresolved.t:138 > + > +#if extrastorage > + $ hg shelve --unresolved this if and endif can be removed. > test-shelve-unresolved.t:169 > + > +#if extrastorage > + $ hg shelve --list We can get rid of this #if and #endif too. the u

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh added a comment. Now, we have mergestate information storage in changeset level too with the help of extra mapping. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6479 To: n

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh edited the summary of this revision. navaneeth.suresh updated this revision to Diff 15517. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6479?vs=15451&id=15517 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISIO

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh added a comment. In D6479#94711 , @pulkit wrote: > Can you fold both the commits, it will be better to see code for both storing and restoring mergestates in one patch. @pulkit I've folded the changesets and updated the rev

D6479: shelve: first prototype of storing/restoring unresolved changes

navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "unshelve: first prototype of restoring unresolved changes" to "shelve: first prototype of storing/restoring unresolved changes". navaneeth.suresh updated this revision to Diff 15451. REPOSITORY