This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5251

share: reload repo after adjusting it in postshare()
ClosedPublic

Authored by martinvonz on Nov 9 2018, 2:28 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGfb490d798be0: share: reload repo after adjusting it in postshare()
Summary

When sharing a repo that's using remotefilelog, the upate that happens
at the end of the hg share call does not see the remote repo path
that's copied in hg.postshare(). This patch reloads the repo after
hg.postshare() to address that.

This changes a subrepo test case. Note that hg share -U; hg co tip
worked there before, so I don't see see why hg share should fail. I
also don't know what a "locally referenced subrepo". So maybe this is
fixing a bug? Hopefully it's not breaking something someone actually
cares about at least. Maybe someone who knows and cares about subrepos
can review this.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Nov 9 2018, 2:28 PM
Closed by commit rHGfb490d798be0: share: reload repo after adjusting it in postshare() (authored by martinvonz). · Explain WhyNov 9 2018, 9:17 PM
This revision was automatically updated to reflect the committed changes.
mharbison72 added a comment.Nov 9 2018, 10:30 PM

I also don't know what a "locally referenced subrepo"

Basically, if you share the top level repo but don't update to a revision with a subrepo, the share command doesn't recurse and create a local subrepo under the share. That prevented share + update from the new share, if the update referenced the (missing) subrepo. The test was mostly just a random edge case to ensure things didn't explode, but it's better that the command actually does something useful.

Revision Contents
Changeset List

Diff 12498

mercurial/hg.py

r = repository(ui, dest, create=True, createopts={ r = repository(ui, dest, create=True, createopts={
'sharedrepo': srcrepo, 'sharedrepo': srcrepo,
'sharedrelative': relative, 'sharedrelative': relative,
'shareditems': shareditems, 'shareditems': shareditems,
}) })
postshare(srcrepo, r, defaultpath=defaultpath) postshare(srcrepo, r, defaultpath=defaultpath)
r = repository(ui, dest)
_postshareupdate(r, update, checkout=checkout) _postshareupdate(r, update, checkout=checkout)
return r return r
def unshare(ui, repo): def unshare(ui, repo):
"""convert a shared repository to a normal one """convert a shared repository to a normal one
Copy the store data to the repo and remove the sharedpath data. Copy the store data to the repo and remove the sharedpath data.

tests/test-remotefilelog-share.t

  • This file was added.
$ . "$TESTDIR/remotefilelog-library.sh"
$ cat >> $HGRCPATH <<EOF
> [extensions]
> remotefilelog=
> share=
> EOF
$ hg init master
$ cd master
$ cat >> .hg/hgrc <<EOF
> [remotefilelog]
> server=True
> EOF
$ echo x > x
$ hg commit -qAm x
$ cd ..
$ hgcloneshallow ssh://user@dummy/master source --noupdate -q
$ hg share source dest
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-subrepo-recursion.t

$ hg -R foo summary $ hg -R foo summary
parent: -1:000000000000 (no revision checked out) parent: -1:000000000000 (no revision checked out)
branch: default branch: default
commit: (clean) commit: (clean)
update: 4 new changesets (update) update: 4 new changesets (update)
Sharing a local repo without the locally referenced subrepo (i.e. it was never Sharing a local repo without the locally referenced subrepo (i.e. it was never
updated from null), fails the same as a clone operation. updated from null) works, but clone fails.
$ hg --config progress.disable=True clone -U ../empty ../empty2 $ hg --config progress.disable=True clone -U ../empty ../empty2
$ hg --config extensions.share= --config progress.disable=True \ $ hg --config extensions.share= --config progress.disable=True \
> share ../empty2 ../empty_share > share ../empty2 ../empty_share
updating working directory updating working directory
abort: repository $TESTTMP/empty2/foo not found! sharing subrepo foo from $TESTTMP/empty/foo
[255] sharing subrepo foo/bar from $TESTTMP/empty/foo/bar
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --config progress.disable=True clone ../empty2 ../empty_clone $ hg --config progress.disable=True clone ../empty2 ../empty_clone
updating to branch default updating to branch default
abort: repository $TESTTMP/empty2/foo not found! abort: repository $TESTTMP/empty2/foo not found!
[255] [255]
Disable progress extension and cleanup: Disable progress extension and cleanup: