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

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> test-shelve-unresolved.t:138
> +
> +#if extrastorage
> +  $ hg shelve --unresolved

this if and endif can be removed.

> test-shelve-unresolved.t:169
> +  
> +#if extrastorage
> +  $ hg shelve --list

We can get rid of this #if and #endif too. the usualstorage one will have `(unresolved)` in the test output. We have functionality to have test output case wise which can be used.

For example, here we have two different outputs in py3 and non-py3 cases. https://www.mercurial-scm.org/repo/hg-committed/file/tip/tests/test-debugcommands.t#l213

> test-shelve-unresolved.t:253
> +-- we need to update to one of the merge parents. otherwise, abort.
> +#if extrastorage
> +  $ hg unshelve --unresolved

we don't need this #if and #endif, it can be removed.

> test-shelve-unresolved.t:279
> +
> +#if extrastorage
> +  $ hg unshelve --unresolved

we don't need this #if and #endif, it can be removed.

> test-shelve-unresolved.t:344
> +-- flag --unresolved is passed but the top most shelve is not unresolved
> +#if extrastorage
> +  $ hg shelve --unresolved

we don't need this #if and #endif, it can be removed.

> test-shelve-unresolved.t:371
> +-- now, unshelve default
> +#if extrastorage
> +  $ hg unshelve -n default --unresolved

we don't need this #if and #endif, it can be removed.

> test-shelve-unresolved.t:442
> +
> +#if extrastorage
> +  $ hg shelve --unresolved

we don't need this #if and #endif, it can be removed.

> test-shelve-unresolved.t:528
> +
> +#if extrastorage
> +  $ hg unshelve --unresolved

we don't need this #if and #endif, it can be removed.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6479/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6479

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel