# HG changeset patch
# User Yuya Nishihara <y...@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@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to