D6728: config: add experimental argument to the config registrar

Closed by commit rHGe67d9b6bad4d: config: add experimental argument to the config registrar (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

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

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

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

navaneeth.suresh added inline comments. navaneeth.suresh added a subscriber: yuja. INLINE COMMENTS > marmoute wrote in test-config.t:232 > the `(default: False)` should be `(default: no)` too. that change was there in my patch one revision before. i was asked by @pulkit to modify it as of now.

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

navaneeth.suresh added inline comments. INLINE COMMENTS > marmoute wrote in test-config.t:232 > We should be consistent when printing. And we should also be consistent when > recording stuff in data. > > I think it make sense to print human friendly version ('yes/no') and use the > actual

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

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

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

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

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

navaneeth.suresh added a comment. In D6709#98542 , @mharbison72 wrote: > Should we hide `devel.*` like we do `experimental` when `verbose` isn’t applied? Presumably we don’t want regular users to know about them. Done. REPOSITORY rHG

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

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

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

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

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',

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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/

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() ==

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

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=16314

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

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

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,

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:

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

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

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

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

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

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.

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

D6712: config: fix defaultvalue template keyword (patch 1 of 2)

navaneeth.suresh retitled this revision from "config: fix defaultvalue template keyword" to "config: fix defaultvalue template keyword (patch 1 of 2)". navaneeth.suresh edited the summary of this revision. navaneeth.suresh updated this revision to Diff 16148. REPOSITORY rHG Mercurial CHANGES

D6720: config: fix defaultvalue template keyword (patch 2 of 2)

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 rHG51a2e3102db2 . This moves `fm.data()` out

D6712: config: remove pycompat.bytestr() for defaultvalue

navaneeth.suresh added a comment. In D6712#98424 , @pulkit wrote: > The `pycompat.bytestr()` was there for py3 compatibility, however removing it should be fine in this case. Can you make sure `test-config.t` passes with this patch on Python

D6720: config: fix fm.data() handling of defaultvalue

navaneeth.suresh added inline comments. INLINE COMMENTS > pulkit wrote in commands.py:1884 > A better fix will be to move `fm.data(name=entryname)` inside the if, i.e. > where it was before https://phab.mercurial-scm.org/D6704. > > And add `fm.data(defaultvalue=...)` below the if-else which

D6720: config: fix fm.data() handling of defaultvalue

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

D6712: config: remove pycompat.bytestr() for defaultvalue

Closed by commit rHG049b2ac3252e: config: remove pycompat.bytestr() for defaultvalue (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6720: config: fix fm.data() handling of defaultvalue

Closed by commit rHG60789444acd6: config: fix fm.data() handling of defaultvalue (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/D6720?vs=16150=16152

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

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

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

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

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

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

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

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

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

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

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

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

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

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=16092#toc

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

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.

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

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

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

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

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

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

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

Closed by commit rHG6957f7b93e03: unshelve: clear shelvedstate and _finishunshelve() on partial unshelve (authored by navaneeth.suresh). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6708?vs=16146=16147#toc

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

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

Closed by commit rHG073cfff9aaef: unshelve: delete shelvedstate after a successful unshelve --continue (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".

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

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

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

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

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

D6712: config: fix defaultvalue template keyword

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

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

navaneeth.suresh added a comment. @pulkit I couldn't figure out why the devel-warnings are coming. It's being shown for the following items in `configitems.py`. IIUC, it should be visible when we are trying to read a config item which is not in the registered items. But, we are

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

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

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

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

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

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

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

navaneeth.suresh added a comment. In D6709#98493 , @marmoute wrote: > In D6709#98479 , @navaneeth.suresh wrote: > >> @pulkit I couldn't figure out why the devel-warnings are coming. It's being

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

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

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

navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "tests: add test for unshelve --interactive --keep" to "unshelve: abort on using --keep and --interactive together". navaneeth.suresh updated this revision to Diff 16166. REPOSITORY rHG

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

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

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

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

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

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

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

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

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

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

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

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

<    1   2   3   4   >