D6694: unshelve: delete shelvedstate after a successful unshelve --continue

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in test-shelve.t:1430 > the above sentence is confusing and maybe incorrect too. okay, maybe i should remove it. doing that right away. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D

D6708: unshelve: clear shelvedstate and _finishunshelve() on partial unshelve

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:1008 > IIUC, we don't need `_forgetunknownfiles()` too in this if statement. Can you > add some related tests and see if we need this as a followup? sure, will investigate on that. REPOSITORY rHG Mercurial C

D6708: unshelve: clear shelvedstate and _finishunshelve() on partial unshelve

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

D6686: unshelve: handle stripping changesets on interactive mode

Closed by commit rHG4814d993fe21: unshelve: handle stripping changesets on interactive mode (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6686?vs=161

D6694: unshelve: delete shelvedstate after a successful unshelve --continue

navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revision to Diff 16133. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6694?vs=16109&id=16133 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6694/new/ REVISION D

D6699: tests: add test for unshelve --interactive --keep

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

D6709: config: add --registered flag to show all known configs

navaneeth.suresh retitled this revision from "config: add --all flag to show all known configs" to "config: add --registered flag to show all known configs". navaneeth.suresh edited the summary of this revision. navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revis

D6712: config: fix defaultvalue template keyword

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to 51a2e3102db2 . This does three things. - Sho

D6704: config: add defaultvalue template keyword

navaneeth.suresh added a comment. @yuja Thanks for the review. Will send a follow-up soon. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6704/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6704 To: navaneeth.suresh, #hg-reviewers Cc: yuja, du

D6709: config: add --all flag to show all known configs

navaneeth.suresh added inline comments. navaneeth.suresh marked an inline comment as done. INLINE COMMENTS > av6 wrote in commands.py:1774 > This needs a better description to differentiate this flag and the default > mode (see line 1786). Could you please suggest something better? > av6 wrote

D6709: config: add --all flag to show all known configs

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

D6709: config: add --all flag to show all known configs

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

D6709: config: add --all flag to show all known configs

navaneeth.suresh created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch fixes one of the issues in issue6014. This adds an `--all` flag to `hg showconfig` to show all known config options. REPOSITORY rH

D6708: unshelve: clear shelvedstate and _finishunshelve() on partial unshelve

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On a partial unshelve, `shelvedstate` was not cleared and `_finishunshelve()` was not called. Ideally, these should be called on this case. This patch mak

D6699: tests: add test for unshelve --interactive --keep

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

D6697: cmdutil: add allowunfinished to prevent checkunfinished() on docommit()

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

D6694: unshelve: delete shelvedstate after a successful unshelve --continue

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

D6686: unshelve: handle stripping changesets on interactive mode

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

D6704: config: add defaultvalue template keyword

navaneeth.suresh added inline comments. navaneeth.suresh marked an inline comment as done. INLINE COMMENTS > durin42 wrote in commands.py:1875 > you almost certainly want `pycompat.bytestr()` here and not `str()` for py3 > compat reasons thanks for the fix and queuing @durin42. REPOSITORY rH

D6704: config: add defaultvalue template keyword

Closed by commit rHG51a2e3102db2: config: add defaultvalue template keyword (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". CHANGED PRIOR TO COMMIT https:

D6704: config: add defaultvalue template keyword

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch tries to fix one of the issues mentioned in issue6014. This adds a new `defaultvalue` template keyword to be used with `hg showconfig` to get

D6703: unshelve: add abort on using continue and interactive together

Closed by commit rHG52a383451739: unshelve: add abort on using continue and interactive together (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY

D6679: unshelve: store information about interactive mode in shelvedstate

navaneeth.suresh added a comment. > mercurial/shelve.py:938: local variable 'interactive' is assigned to but never used > Maybe `--continue --interactive` has to be banned if the mode can't be > overridden by the command option. Noted. Created D6703

D6703: unshelve: add abort on using continue and interactive together

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `unshelve --continue --interactive` will not work as expected by the user as the mode of in-progress unshelve is preserved and cannot be overwritten. Th

D6697: cmdutil: add allowunfinished to prevent checkunfinished() on docommit()

navaneeth.suresh added a comment. In D6697#98061 , @pulkit wrote: > `test-commit-interactive.t` and some other tests fail for me with this, can you have a look? Doing that right away! REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6679: unshelve: store information about interactive mode in shelvedstate

Closed by commit rHGee86ad6f50fe: unshelve: store information about interactive mode in shelvedstate (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D66

D6687: unshelve: create a matcher only if required on creating unshelve ctx

Closed by commit rHGd5cdce3d9164: unshelve: create a matcher only if required on creating unshelve ctx (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6687?vs=16041&id=16092#toc RE

D6685: unshelve: changes how date is set on interactive mode

Closed by commit rHGaaad4fe55ad1: unshelve: changes how date is set on interactive mode (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6685?vs=16063&i

D6683: unshelve: unify logic around creating an unshelve changeset

Closed by commit rHGc9114885c14b: unshelve: unify logic around creating an unshelve changeset (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6683?vs=1

D6700: unshelve: clear shelvedstate and _finishunshelve() on partial unshelve

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On a partial `unshelve`, `shelvedstate` was not cleared and `_finishunshelve()` was not called. Ideally, these should be called on this case. This patch

D6699: tests: add test for unshelve --interactive --keep

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

D6694: unshelve: delete shelvedstate after a successful unshelve --continue

navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "unshelve: fix bug on a partial unshelve with --continue" to "unshelve: delete shelvedstate after a successful unshelve --continue". navaneeth.suresh updated this revision to Diff 16085. REPOSITORY

D6699: tests: add test for unshelve --interactive --keep

navaneeth.suresh 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/D6699 AFFECTED FILES tests/test-shelve.t CHANGE DETAILS diff --git a/tests/test-shelve.t b/te

D6683: unshelve: unify logic around creating an unshelve changeset

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

D6683: unshelve: unify logic around creating an unshelve changeset

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:812 > How about: > > Handles creation of unshelve commit and updating the shelve if it was > partially unshelved. > > If interactive is: > > * false: commit all the changes in working directory. >

D6686: unshelve: handle stripping changesets on interactive mode

navaneeth.suresh added a comment. In D6686#98006 , @pulkit wrote: > In D6686#97957 , @navaneeth.suresh wrote: > >> I just found that this change is not required while creating D6694

D6683: unshelve: unify logic around creating an unshelve changeset

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

D6697: cmdutil: add allowunfinished to prevent checkunfinished() on docommit()

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

D6697: cmdutil: add allowunfinished to prevent checkunfinished() on docommit()

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in cmdutil.py:274 > Why not get rid of `interactive-shelve` passed by unshelve and make that pass > `allowunfinished=True` to dorecord? I thought of splitting into two patches. Will be amending the changes soon in this patc

D6697: cmdutil: add allowunfinished to prevent checkunfinished() on docommit()

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `cmdutil.dorecord()` has a `checkunfinished()` function call. We might not want to do that on certain occasions. For example, `unshelve --continue` on i

D6694: unshelve: fix bug on a partial unshelve with --continue

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

D6686: unshelve: handle stripping changesets on interactive mode

navaneeth.suresh added a comment. I just found that this change is not required while creating D6694 . We will be needing the nodes which we are removing for later in case of a partial unshelve. The stripbased approach of unshelve failed on the change i

D6694: unshelve: fix bug on a partial unshelve with --continue

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `unshelve --continue` after a partial unshelve was not working before. This patch makes that to work. REPOSITORY rHG Mercurial REVISION DETAIL https

D6686: unshelve: handle stripping changesets on interactive mode

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

D6684: unshelve: modify --continue on interactive unshelve

navaneeth.suresh added a comment. In D6684#97930 , @pulkit wrote: > Sorry for getting this and the parent patch split before, after the recent improvements, it looks like they should be folded into one. Cool. Changes from this patch is fold

D6679: unshelve: store information about interactive mode in shelvedstate

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

D6688: unshelve: make basename as a mandatory argument for unshelvecontinue()

navaneeth.suresh added a comment. navaneeth.suresh abandoned this revision. Abandoning since changes in D6679 will make this obsolete. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6688/new/ REVISION DETAIL ht

D6685: unshelve: changes how date is set on interactive mode

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

D6685: unshelve: changes how date is set on interactive mode

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

D6684: unshelve: modify --continue on interactive unshelve

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

D6679: unshelve: store information about interactive mode in shelvedstate

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

D6688: unshelve: make basename as a mandatory argument for unshelvecontinue()

navaneeth.suresh added a comment. In D6688#97859 , @pulkit wrote: > Can you explain in commit description as why this is done? This patch will become obsolete after D6684 . Should I abandon this? REPOS

D6684: unshelve: modify --continue on interactive unshelve

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

D6679: unshelve: store information about interactive mode in shelvedstate

navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revision to Diff 16055. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6679?vs=16054&id=16055 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6679/new/ REVISION D

D6684: unshelve: modify --continue on interactive unshelve

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:950 > Now I understand how this and the parent patches are arranged. > > Why don't be have all the logic related to interactive in `unshelvecontinue`, > including getting the name of the shelve we are processing

D6679: unshelve: store information about interactive mode in shelvedstate

navaneeth.suresh added inline comments. navaneeth.suresh marked an inline comment as done. INLINE COMMENTS > pulkit wrote in shelve.py:181 > The above comment is not done. > > I meant, we don't need _noninteractive. Done. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mer

D6679: unshelve: store information about interactive mode in shelvedstate

navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revision to Diff 16054. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6679?vs=16036&id=16054 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6679/new/ REVISION D

D6683: unshelve: unify logic around creating an unshelve changeset

navaneeth.suresh added a comment. In D6683#97731 , @pulkit wrote: > This patch does following things: > > 1. unify logic around creating unshelvectx > 2. changes how date is set in iteractive mode > 3. handles stripping in interavtive mod

D6688: unshelve: make basename as a mandatory argument for unshelvecontinue()

navaneeth.suresh 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/D6688 AFFECTED FILES mercurial/shelve.py CHANGE DETAILS diff --git a/mercurial/shelve.py b/me

D6687: unshelve: create a matcher only if required on creating unshelve ctx

navaneeth.suresh 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/D6687 AFFECTED FILES mercurial/shelve.py CHANGE DETAILS diff --git a/mercurial/shelve.py b/me

D6686: unshelve: handle stripping changesets on interactive mode

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On interactive mode, changesets on `nodestoremove` should be stripped regardless of the shelve is partial or not. This patch modifies `unshelvecontinue(

D6685: unshelve: changes how date is set on interactive mode

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY On an interactive unshelve, the remaining changes are shelved again for later. This patch modifies the date of remaining shelved change to the time of i

D6683: unshelve: unify logic around creating an unshelve changeset

navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "unshelve: fixes on interactive mode" to "unshelve: unify logic around creating an unshelve changeset". navaneeth.suresh updated this revision to Diff 16038. REPOSITORY rHG Mercurial CHANGES SINC

D6684: unshelve: modify --continue on interactive unshelve

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `shelvedstate` should store info about interactive mode after D6679 . This patch modifies the test and behavior of

D6679: unshelve: store information about interactive mode in shelvedstate

navaneeth.suresh added inline comments. navaneeth.suresh marked 3 inline comments as done. INLINE COMMENTS > pulkit wrote in shelve.py:938 > This change is unrelated to storing info about interactive in shelvedstate. > Can you decouple this into a separate patch? Doing that right away! REPOSIT

D6679: unshelve: store information about interactive mode in shelvedstate

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

D6676: unshelve: add help text on --interactive in verbose mode

Closed by commit rHG0795bbe8ed19: unshelve: add help text on --interactive in verbose mode (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6676?vs=16017&id=16026#toc REPOSITORY r

D6683: unshelve: fixes on interactive mode

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to 5162753c4c14 on addressing reviews on the comm

D6679: unshelve: store information about interactive mode in shelvedstate

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to 5162753c4c14 . This makes `unshelve` stores the

D6676: unshelve: add help text on --interactive in verbose mode

navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > mharbison72 wrote in commands.py:6215-6218 > "Shelve" is an action, so "stored shelve" and "whole shelve" read awkwardly. > Maybe stick to the phrase "shelved change" from above? > > Mi

D6676: unshelve: add help text on --interactive in verbose mode

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

D6676: unshelve: add help text on --interactive in verbose mode

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

D6676: unshelve: add help text on --interactive in verbose mode

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to rHG9eace8d6d537 . This modifies the help text o

D6654: shelve: modify help text on --interactive

Closed by commit rHG9eace8d6d537: shelve: modify help text on --interactive (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHAN

D6653: unshelve: mark unshelve interactive as experimental

Closed by commit rHG74ba82abbf29: unshelve: mark unshelve interactive as experimental (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercu

D6654: shelve: modify help text on --interactive

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We now have `unshelve --interactive` after rHG5162753c4c14 . So, the help tex

D6653: unshelve: mark unshelve interactive as experimental

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We have the logic for interactive unshelve under `_rebaserestorecommit()`. So, we might get conflicts even if there are conflicting changes other than s

D6596: unshelve: add interactive mode

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in commands.py:6172 > Can you mark this as `EXPERIMENTAL` because right now we rebases the whole > commit, which leads to conflicts in files which the user might not want to > unshelve. Doing that right away! Will solve thi

D6596: unshelve: add interactive mode

Closed by commit rHG62953fd58404: unshelve: add interactive mode (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". CHANGED PRIOR TO COMMIT https://phab.merc

D6596: unshelve: add interactive mode

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

D6596: unshelve: add interactive mode

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

D6596: unshelve: add interactive mode

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

D6596: unshelve: add interactive mode

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

D6596: unshelve: add interactive mode

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

D6596: unshelve: add interactive mode

navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "unshelve: make unshelve accept files (issue6162)" to "unshelve: add interactive mode". navaneeth.suresh updated this revision to Diff 15890. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > pulkit wrote in shelve.py:961 > Can you explain why we are not processing this if files are present? okay. on unshelving with `--files` flag, we don't want to clear the shelvedstate unle

D6596: unshelve: make unshelve accept files (issue6162)

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

D6605: unshelve: rename _dounshelve() to dounshelve()

Closed by commit rHG70f1a84d0794: unshelve: rename _dounshelve() to dounshelve() (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6605?vs=15762&id=15784

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

D6605: unshelve: rename _dounshelve() to dounshelve()

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is a follow-up patch to 3de4f17f4824 . REPOSITORY rHG Mercurial REVISI

D6553: shelve: move shelve extension to core

navaneeth.suresh added inline comments. navaneeth.suresh marked an inline comment as done. INLINE COMMENTS > pulkit wrote in commands.py:6207 > I just noticed that the function `_dounshelve()` still has `_` prefix. We > generally have that to mark if functions are local to that file or class. So

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

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "unshelve: add interactive mode (issue6162)" to "unshelve: make unshelve accept files (issue6162)". navaneeth.suresh updated this revision to Diff 15757. REPOSITORY rHG Mercurial CHANGES SINCE LA

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > pulkit wrote in shelve.py:990 > To have this patch in a good state to be reviewed, it will be nice you take > out the addition of interactive flag to the patch where you add that > funct

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh marked an inline comment as done. navaneeth.suresh updated this revision to Diff 15739. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6596?vs=15738&id=15757 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6596/new/ REVISION D

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. navaneeth.suresh updated this revision to Diff 15738. pulkit added a comment. navaneeth.suresh updated this revision to Diff 15739. navaneeth.suresh marked an inline comment as

D6596: unshelve: make unshelve accept files (issue6162)

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

D6596: unshelve: make unshelve accept files (issue6162)

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:990 > The interactive flag should work the same way as it work for revert, commit > and shelve commands. That's either ask hunk by hunk or pop up a curses UI. > > As you suggested before, maybe we can have `-f`

D6589: extensions: add shelve to _builtin

Closed by commit rHG6a3872e34503: extensions: add shelve to _builtin (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". CHANGED PRIOR TO COMMIT https://phab.

<    1   2   3   4   >