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

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

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

D6730: config: handle default values of type list

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch improves the output of the `defaultvalue` keyword. For example, `progress.format`. Its default value is shown to be `['topic', 'bar', 'number

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

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

D6730: config: handle default values of type list

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

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

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

D6699: unshelve: abort on using --keep and --interactive together

Closed by commit rHG4b0c9d47f714: unshelve: abort on using --keep and --interactive together (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/D6699?vs=16

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Until now, if there is a bookmark points to a changeset which is in secret phase, hg will push the bookmark, but not the changeset referenced by that bo

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

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

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

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

D6730: config: handle default values of type list

navaneeth.suresh added a comment. navaneeth.suresh abandoned this revision. In D6730#98852 , @av6 wrote: > The changes in tests that this patch causes are actually already present in the D6709 , so let's fol

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

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

D6736: 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 record

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

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Until now, `shelve` used to abort on trying to `shelve` a mergestate. This patch adds an `--unresolved` flag to `shelve` and use the changeset extras to

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

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY `hg unshelve --unresolved` will get the user back to the old unresolved merge by the following steps: Step 1: If the user has committed new changese

D6739: unshelve: add abort on using --interactive and --unresolved together

navaneeth.suresh created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY It seems not to be a good idea to partially unshelve a mergestate. So, let us abort on using `--interactive` and `--unresolved` together.` REPOSITORY r

D6740: tests: add test to demonstrate issue6159

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/D6740 AFFECTED FILES tests/test-bookmarks-pushpull.t CHANGE DETAILS diff --git a/tests/test-b

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

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

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

navaneeth.suresh added a comment. In D6731#98871 , @pulkit wrote: > In such cases, I like the idea of having fix as two patches, first which demonstrates the bug and the second which fixes the bug. What do you think? Yeah, sounds good to me

D6728: config: add experimental argument to the config registrar

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in perf.py:244 > This breaks `contrib/perf.py` with older versions of mercurial. Can you send > a compatibility fix as followup? I'm not sure I understood that. Do you want me to remove the changes in `contrib/perf.py`? RE

D6740: tests: add test to demonstrate issue6159

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

D6740: tests: add test to demonstrate issue6159

navaneeth.suresh added a comment. @pulkit Now I'm unable to reproduce the test result given in the bug report. It seems like the remote repo recognizes the secret changeset `cf489fd8a374`. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6740/new/ REVIS

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

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

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > pulkit wrote in exchange.py:1044 > What does the return value mean here? I think we can get rid of this. > > Something like this: > > if node and pushop.repo[node].phase() == phases.se

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

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:754 > we should write both the versions, `_writerecords()` should be used. i had tried to support it earlier. but, it throws the following error. i think it's okay to use the latest format only since, we haven't

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

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:416 > What do you think about refactoring the code to write mergestate v2 on disk > and use that encoding to achieve this? i feel like the current approach is more simpler and easy to understand. REPOSITORY r

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

navaneeth.suresh added inline comments. navaneeth.suresh marked an inline comment as done. INLINE COMMENTS > pulkit wrote in exchange.py:1044 > If the node is None, then `if node and ` will be false and the second > condition won't be executed. I'm getting the following error with the code

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in exchange.py:1044 > You won't need `ctx = pushop.repo[node]` anymore then. > > In general, I suggest understanding the error as why are they are happening > and you will find a fix. `ctx = pushop.repo[node]` is needed to

D6746: perf: don't pass experimental argument in config for older Mercurial versions

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 a11fd395e83f . This patch makes older Mercurial

D6746: perf: don't pass experimental argument in config for older Mercurial versions

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

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

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

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

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

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

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

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

navaneeth.suresh added inline comments. navaneeth.suresh marked 2 inline comments as done. INLINE COMMENTS > navaneeth.suresh wrote in exchange.py:1044 > `ctx = pushop.repo[node]` is needed to check the phase of the ctx. also, > iiuc, if i write `if a and b: pass` in python, both a and b are eva

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

navaneeth.suresh added a comment. In D6709#99166 , @av6 wrote: > @marmoute did you want this flag marked as experimental or am I misremembering? @av6 @marmoute told me to add `EXPERIMENTAL` in the output of the config options which are exp

D6740: tests: add test to demonstrate issue6159

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

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

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

D6740: tests: add test to demonstrate issue6159

navaneeth.suresh added a comment. I'm able to reproduce the tests now. The case `b2-binary` can reproduce the test results. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6740/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6740 To: navaneeth.

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

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

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

navaneeth.suresh added a comment. In D6731#99192 , @pulkit wrote: > Looks like you forgot to update tests. My bad! Sorry about that. Updated it now. Kindly review. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercuri

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

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

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

navaneeth.suresh added a comment. @av6 I have updated the tests. @marmoute can we just get rid of `(EXPERIMENTAL)` in the output? If we want to do that, changes have to be made in `ui.walkregisteredconfig()`. But, that's a hack which appends to either name or value and as @av6 mentioned, the

D6740: tests: add test to demonstrate issue6159

Closed by commit rHGcf9dbc7377de: tests: add test to demonstrate issue6159 (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/D6740?vs=16298&id=16314 CHAN

D6731: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159)

Closed by commit rHG3332bde53714: exchange: abort on pushing bookmarks pointing to secret changesets (issue6159) (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6731?vs=16305&id=163

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&id=16800 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6709/new/ REVISIO

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 al

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 string

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/

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 record

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 record

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

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

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

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

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

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:416 > It will be nice to use only way to encode mergestates at all the places. Done and created D6966 . Abandoning this. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTIO

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

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in shelve.py:754 > Did you manage to find why that error comes up? Yes. This was because we are not storing the local version of the files. So, it will be `None` as returned while reading the mergestate. So, it should throw

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&id=16813 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6966/new/ REVISIO

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&id=16814 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6737/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6737 AFFEC

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&id=16815 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6738/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6738 AFFEC

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 `strip`

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 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&id=16914 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6987/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6987 AFFEC

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

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&id=17117 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7003/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7003 AFFEC

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 https://phab.mercurial-scm.org/D6987?vs=16914&id=

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 http

<    1   2   3   4