[PATCH 2 of 2] share: drop 'relshared' requirement as well

[Ryan McElroy]

This series looks good to me.


On 3/2/17 7:35 AM, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1488467511 -32400
> #      Fri Mar 03 00:11:51 2017 +0900
> # Node ID 271e966c8d27fbc904dab4c641fe265825384dd3
> # Parent  8cdc39b46f210a702051b3a6d6f03e2112b41aba
> share: drop 'relshared' requirement as well
>
> diff --git a/hgext/share.py b/hgext/share.py
> --- a/hgext/share.py
> +++ b/hgext/share.py
> @@ -117,6 +117,7 @@ def unshare(ui, repo):
>           util.rename(sharefile, sharefile + '.old')
>   
>           repo.requirements.discard('shared')
> +        repo.requirements.discard('relshared')
>           repo._writerequirements()
>       finally:
>           destlock and destlock.release()
> diff --git a/tests/test-share.t b/tests/test-share.t
> --- a/tests/test-share.t
> +++ b/tests/test-share.t
> @@ -393,6 +393,21 @@ renames and changes of PWD
>     [255]
>     $ hg -R thatdir/rel root
>     $TESTTMP/thatdir/rel
> +
> +test unshare relshared repo
> +
> +  $ cd thatdir/rel
> +  $ hg unshare
> +  $ test -d .hg/store
> +  $ test -f .hg/sharedpath
> +  [1]
> +  $ grep shared .hg/requires
> +  [1]
> +  $ hg unshare
> +  abort: this is not a shared repo
> +  [255]
> +  $ cd ../..
> +
>     $ rm -r thatdir
>   
>   Explicitly kill daemons to let the test exit on Windows
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=DwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=Jw8rundaE7TbmqBYd1txIQ&m=iTIb_qgLjcw2hyg08rbDA97Qwo7_RtmmA858ptHNeg8&s=9dasQD1Osl4smdqc-hq8G2LYzwd_L52M5VoJ_Kih1UY&e=