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

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

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

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

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=16017 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6676/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6676

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? > >

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

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=16026#toc REPOSITORY rHG

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

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=16036 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6679/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6679

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

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!

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

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

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

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

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

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=16054 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6679/new/ REVISION

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=16058 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6684/new/ REVISION

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

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=16055 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6679/new/ REVISION

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?

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=16057 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6679/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6679

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

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=16056 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6684/new/ REVISION

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=16059 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6685/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6685

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=16063 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6685/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6685

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

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=16064 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6679/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6679

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

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=16065 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6686/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6686

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

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

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=16071 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6694/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6694

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

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

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=16073 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6697/new/ REVISION

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=16074 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6683/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6683

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=16078 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6683/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6683

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 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. >

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=15534 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6479/new/ REVISION

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. > >

D7003: grep: put --diff in the first line of usage

Closed by commit rHG0b8b7905f239: grep: put --diff in the first line of usage (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

D6738: unshelve: add --unresolved flag to unshelve mergestate with unresolved files

navaneeth.suresh updated this revision to Diff 16815. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6738?vs=16808=16815 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6738/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6738

D6966: shelve: add method for storing mergestate in changeset extras

navaneeth.suresh edited the summary of this revision. navaneeth.suresh updated this revision to Diff 16813. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6966?vs=16806=16813 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6966/new/ REVISION

D6737: shelve: add --unresolved flag to shelve mergestate with unresolved files

navaneeth.suresh updated this revision to Diff 16814. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6737?vs=16807=16814 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6737/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6737

D6987: strip: move strip extension to core

navaneeth.suresh added inline comments. INLINE COMMENTS > durin42 wrote in commands.py:5646 > debugstrip please (and put it in debugcommands) > > and Gregory points out we need a strip extension that preserves the old > `strip` name for users that are used to that i see. do i need to replace

D6987: strip: move strip extension to core

navaneeth.suresh created this revision. Herald added a reviewer: durin42. Herald added a reviewer: durin42. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Until now, `strip` was bootstrapped as an extension. This patch adds

D6987: strip: move strip extension to core as debugstrip

navaneeth.suresh added a comment. @durin42 Done, REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6987/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6987 To: navaneeth.suresh, durin42, #hg-reviewers Cc: mjpieters, mercurial-devel

D6987: strip: move strip extension to core

navaneeth.suresh updated this revision to Diff 16914. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6987?vs=16856=16914 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6987/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6987

D7003: grep: put --diff in the first line of usage

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/D7003 AFFECTED FILES mercurial/commands.py tests/test-completion.t CHANGE DETAILS diff

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

navaneeth.suresh edited the summary of this revision. navaneeth.suresh updated this revision to Diff 16800. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6709?vs=16306=16800 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6709/new/ REVISION

D6963: config: show config options in a user-friendly format

navaneeth.suresh created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch does the following things to display the output in a user-friendly format: - Replace bool by yes/no. - Converts list to

D6966: shelve: add method for storing mergestate in changeset extras

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We store mergestate records in `.hg/merge`. This patch adds a method of storage in changeset extras. This will help in the exchange of mergestate

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

navaneeth.suresh added a comment. Now I understand that this patch does an enormous number of changes. I've split this patch into three. Will be working on each of them separately from now on. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6709/new/

D6967: shelve: add method for storing mergestate in changeset extras

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We store mergestate records in `.hg/merge`. This patch adds a method of storage in changeset extras. This will help in the exchange of mergestate

D6962: config: add defaults and experimental status for --debug flag

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds `EXPERIMENTAL` to the output of 'showconfig --debug' for experimental flags which are not under the `section == 'experimental'`. This

D7003: grep: put --diff in the first line of usage

navaneeth.suresh updated this revision to Diff 17117. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7003?vs=16916=17117 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7003/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7003

D6987: debugstrip: add debugstrip to core

navaneeth.suresh retitled this revision from "strip: move strip extension to core as debugstrip" to "debugstrip: add debugstrip to core". navaneeth.suresh updated this revision to Diff 17120. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

<    1   2   3   4