From patchwork Mon Feb 25 15:41:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D5985: bundle2: don't send "shared" requirement when cloning from a share From: phabricator X-Patchwork-Id: 38929 Message-Id: <5e239c9b703b23822b331b7ca7a1972b@localhost.localdomain> To: mercurial-devel@mercurial-scm.org Date: Mon, 25 Feb 2019 15:41:00 +0000 This revision was automatically updated to reflect the committed changes. Closed by commit rHG2d835c42ab41: bundle2: don't send "shared" requirement when cloning from a share (authored by mplamann, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D5985?vs=14155&id=14237 REVISION DETAIL https://phab.mercurial-scm.org/D5985 AFFECTED FILES mercurial/bundle2.py tests/test-share.t CHANGE DETAILS To: mplamann, #hg-reviewers, pulkit Cc: mercurial-devel diff --git a/tests/test-share.t b/tests/test-share.t --- a/tests/test-share.t +++ b/tests/test-share.t @@ -124,15 +124,14 @@ -rw-r--r-- 2 b -Cloning a shared repo via bundle2 wrongly adds "shared" to the clone's requirements +Cloning a shared repo via bundle2 results in a non-shared clone $ cd .. $ hg clone -q --stream --config ui.ssh="$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/repo2 cloned-via-bundle2 $ cat ./cloned-via-bundle2/.hg/requires | grep "shared" - shared + [1] $ hg id --cwd cloned-via-bundle2 -r tip - abort: $ENOENT$: '$TESTTMP/cloned-via-bundle2/.hg/sharedpath' - [255] + c2e0ac586386 tip $ cd repo2 test unshare command diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py --- a/mercurial/bundle2.py +++ b/mercurial/bundle2.py @@ -1664,6 +1664,7 @@ mandatory=False) def _formatrequirementsspec(requirements): + requirements = [req for req in requirements if req != "shared"] return urlreq.quote(','.join(sorted(requirements))) def _formatrequirementsparams(requirements):