share: drop 'relshared' requirement as well

hgext/share.py

@@ -1,220 +1,221 b''
 # Copyright 2006, 2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 '''share a common history between several working directories
 
 Automatic Pooled Storage for Clones
 -----------------------------------
 
 When this extension is active, :hg:`clone` can be configured to
 automatically share/pool storage across multiple clones. This
 mode effectively converts :hg:`clone` to :hg:`clone` + :hg:`share`.
 The benefit of using this mode is the automatic management of
 store paths and intelligent pooling of related repositories.
 
 The following ``share.`` config options influence this feature:
 
 ``share.pool``
     Filesystem path where shared repository data will be stored. When
     defined, :hg:`clone` will automatically use shared repository
     storage instead of creating a store inside each clone.
 
 ``share.poolnaming``
     How directory names in ``share.pool`` are constructed.
 
     "identity" means the name is derived from the first changeset in the
     repository. In this mode, different remotes share storage if their
     root/initial changeset is identical. In this mode, the local shared
     repository is an aggregate of all encountered remote repositories.
 
     "remote" means the name is derived from the source repository's
     path or URL. In this mode, storage is only shared if the path or URL
     requested in the :hg:`clone` command matches exactly to a repository
     that was cloned before.
 
     The default naming mode is "identity."
 '''
 
 from __future__ import absolute_import
 
 import errno
 from mercurial.i18n import _
 from mercurial import (
     bookmarks,
     cmdutil,
     commands,
     error,
     extensions,
     hg,
     txnutil,
     util,
 )
 
 repository = hg.repository
 parseurl = hg.parseurl
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
 # be specifying the version(s) of Mercurial they are tested with, or
 # leave the attribute unspecified.
 testedwith = 'ships-with-hg-core'
 
 @command('share',
     [('U', 'noupdate', None, _('do not create a working directory')),
      ('B', 'bookmarks', None, _('also share bookmarks')),
      ('', 'relative', None, _('point to source using a relative path '
                               '(EXPERIMENTAL)')),
     ],
     _('[-U] [-B] SOURCE [DEST]'),
     norepo=True)
 def share(ui, source, dest=None, noupdate=False, bookmarks=False,
           relative=False):
     """create a new shared repository
 
     Initialize a new repository and working directory that shares its
     history (and optionally bookmarks) with another repository.
 
     .. note::
 
        using rollback or extensions that destroy/modify history (mq,
        rebase, etc.) can cause considerable confusion with shared
        clones. In particular, if two shared clones are both updated to
        the same changeset, and one of them destroys that changeset
        with rollback, the other clone will suddenly stop working: all
        operations will fail with "abort: working directory has unknown
        parent". The only known workaround is to use debugsetparents on
        the broken clone to reset it to a changeset that still exists.
     """
 
     return hg.share(ui, source, dest=dest, update=not noupdate,
                     bookmarks=bookmarks, relative=relative)
 
 @command('unshare', [], '')
 def unshare(ui, repo):
     """convert a shared repository to a normal one
 
     Copy the store data to the repo and remove the sharedpath data.
     """
 
     if not repo.shared():
         raise error.Abort(_("this is not a shared repo"))
 
     destlock = lock = None
     lock = repo.lock()
     try:
         # we use locks here because if we race with commit, we
         # can end up with extra data in the cloned revlogs that's
         # not pointed to by changesets, thus causing verify to
         # fail
 
         destlock = hg.copystore(ui, repo, repo.path)
 
         sharefile = repo.join('sharedpath')
         util.rename(sharefile, sharefile + '.old')
 
         repo.requirements.discard('shared')
+        repo.requirements.discard('relshared')
         repo._writerequirements()
     finally:
         destlock and destlock.release()
         lock and lock.release()
 
     # update store, spath, svfs and sjoin of repo
     repo.unfiltered().__init__(repo.baseui, repo.root)
 
 # Wrap clone command to pass auto share options.
 def clone(orig, ui, source, *args, **opts):
     pool = ui.config('share', 'pool', None)
     if pool:
         pool = util.expandpath(pool)
 
     opts['shareopts'] = dict(
         pool=pool,
         mode=ui.config('share', 'poolnaming', 'identity'),
     )
 
     return orig(ui, source, *args, **opts)
 
 def extsetup(ui):
     extensions.wrapfunction(bookmarks, '_getbkfile', getbkfile)
     extensions.wrapfunction(bookmarks.bmstore, 'recordchange', recordchange)
     extensions.wrapfunction(bookmarks.bmstore, '_writerepo', writerepo)
     extensions.wrapcommand(commands.table, 'clone', clone)
 
 def _hassharedbookmarks(repo):
     """Returns whether this repo has shared bookmarks"""
     try:
         shared = repo.vfs.read('shared').splitlines()
     except IOError as inst:
         if inst.errno != errno.ENOENT:
             raise
         return False
     return hg.sharedbookmarks in shared
 
 def _getsrcrepo(repo):
     """
     Returns the source repository object for a given shared repository.
     If repo is not a shared repository, return None.
     """
     if repo.sharedpath == repo.path:
         return None
 
     if util.safehasattr(repo, 'srcrepo') and repo.srcrepo:
         return repo.srcrepo
 
     # the sharedpath always ends in the .hg; we want the path to the repo
     source = repo.vfs.split(repo.sharedpath)[0]
     srcurl, branches = parseurl(source)
     srcrepo = repository(repo.ui, srcurl)
     repo.srcrepo = srcrepo
     return srcrepo
 
 def getbkfile(orig, repo):
     if _hassharedbookmarks(repo):
         srcrepo = _getsrcrepo(repo)
         if srcrepo is not None:
             # just orig(srcrepo) doesn't work as expected, because
             # HG_PENDING refers repo.root.
             try:
                 fp, pending = txnutil.trypending(repo.root, repo.vfs,
                                                  'bookmarks')
                 if pending:
                     # only in this case, bookmark information in repo
                     # is up-to-date.
                     return fp
                 fp.close()
             except IOError as inst:
                 if inst.errno != errno.ENOENT:
                     raise
 
             # otherwise, we should read bookmarks from srcrepo,
             # because .hg/bookmarks in srcrepo might be already
             # changed via another sharing repo
             repo = srcrepo
 
             # TODO: Pending changes in repo are still invisible in
             # srcrepo, because bookmarks.pending is written only into repo.
             # See also https://www.mercurial-scm.org/wiki/SharedRepository
     return orig(repo)
 
 def recordchange(orig, self, tr):
     # Continue with write to local bookmarks file as usual
     orig(self, tr)
 
     if _hassharedbookmarks(self._repo):
         srcrepo = _getsrcrepo(self._repo)
         if srcrepo is not None:
             category = 'share-bookmarks'
             tr.addpostclose(category, lambda tr: self._writerepo(srcrepo))
 
 def writerepo(orig, self, repo):
     # First write local bookmarks file in case we ever unshare
     orig(self, repo)
 
     if _hassharedbookmarks(self._repo):
         srcrepo = _getsrcrepo(self._repo)
         if srcrepo is not None:
             orig(self, srcrepo)

tests/test-share.t

@@ -1,401 +1,416 b''
 #require killdaemons
 
   $ echo "[extensions]"      >> $HGRCPATH
   $ echo "share = "          >> $HGRCPATH
 
 prepare repo1
 
   $ hg init repo1
   $ cd repo1
   $ echo a > a
   $ hg commit -A -m'init'
   adding a
 
 share it
 
   $ cd ..
   $ hg share repo1 repo2
   updating working directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 share shouldn't have a store dir
 
   $ cd repo2
   $ test -d .hg/store
   [1]
 
 Some sed versions appends newline, some don't, and some just fails
 
   $ cat .hg/sharedpath; echo
   $TESTTMP/repo1/.hg (glob)
 
 trailing newline on .hg/sharedpath is ok
   $ hg tip -q
   0:d3873e73d99e
   $ echo '' >> .hg/sharedpath
   $ cat .hg/sharedpath
   $TESTTMP/repo1/.hg (glob)
   $ hg tip -q
   0:d3873e73d99e
 
 commit in shared clone
 
   $ echo a >> a
   $ hg commit -m'change in shared clone'
 
 check original
 
   $ cd ../repo1
   $ hg log
   changeset:   1:8af4dc49db9e
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change in shared clone
   
   changeset:   0:d3873e73d99e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat a             # should be two lines of "a"
   a
   a
 
 commit in original
 
   $ echo b > b
   $ hg commit -A -m'another file'
   adding b
 
 check in shared clone
 
   $ cd ../repo2
   $ hg log
   changeset:   2:c2e0ac586386
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     another file
   
   changeset:   1:8af4dc49db9e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change in shared clone
   
   changeset:   0:d3873e73d99e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat b             # should exist with one "b"
   b
 
 hg serve shared clone
 
   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid
   $ cat hg.pid >> $DAEMON_PIDS
   $ get-with-headers.py localhost:$HGPORT 'raw-file/'
   200 Script output follows
   
   
   -rw-r--r-- 4 a
   -rw-r--r-- 2 b
   
   
 
 test unshare command
 
   $ 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]
 
 check that a change does not propagate
 
   $ echo b >> b
   $ hg commit -m'change in unshared'
   $ cd ../repo1
   $ hg id -r tip
   c2e0ac586386 tip
 
   $ cd ..
 
 
 test sharing bookmarks
 
   $ hg share -B repo1 repo3
   updating working directory
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo1
   $ hg bookmark bm1
   $ hg bookmarks
    * bm1                       2:c2e0ac586386
   $ cd ../repo2
   $ hg book bm2
   $ hg bookmarks
    * bm2                       3:0e6e70d1d5f1
   $ cd ../repo3
   $ hg bookmarks
      bm1                       2:c2e0ac586386
   $ hg book bm3
   $ hg bookmarks
      bm1                       2:c2e0ac586386
    * bm3                       2:c2e0ac586386
   $ cd ../repo1
   $ hg bookmarks
    * bm1                       2:c2e0ac586386
      bm3                       2:c2e0ac586386
 
 check whether HG_PENDING makes pending changes only in relatd
 repositories visible to an external hook.
 
 In "hg share" case, another transaction can't run in other
 repositories sharing same source repository, because starting
 transaction requires locking store of source repository.
 
 Therefore, this test scenario ignores checking visibility of
 .hg/bookmakrs.pending in repo2, which shares repo1 without bookmarks.
 
   $ cat > $TESTTMP/checkbookmarks.sh <<EOF
   > echo "@repo1"
   > hg -R $TESTTMP/repo1 bookmarks
   > echo "@repo2"
   > hg -R $TESTTMP/repo2 bookmarks
   > echo "@repo3"
   > hg -R $TESTTMP/repo3 bookmarks
   > exit 1 # to avoid adding new bookmark for subsequent tests
   > EOF
 
   $ cd ../repo1
   $ hg --config hooks.pretxnclose="sh $TESTTMP/checkbookmarks.sh" -q book bmX
   @repo1
      bm1                       2:c2e0ac586386
      bm3                       2:c2e0ac586386
    * bmX                       2:c2e0ac586386
   @repo2
    * bm2                       3:0e6e70d1d5f1
   @repo3
      bm1                       2:c2e0ac586386
    * bm3                       2:c2e0ac586386
      bmX                       2:c2e0ac586386
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
   [255]
   $ hg book bm1
 
 FYI, in contrast to above test, bmX is invisible in repo1 (= shared
 src), because (1) HG_PENDING refers only repo3 and (2)
 "bookmarks.pending" is written only into repo3.
 
   $ cd ../repo3
   $ hg --config hooks.pretxnclose="sh $TESTTMP/checkbookmarks.sh" -q book bmX
   @repo1
    * bm1                       2:c2e0ac586386
      bm3                       2:c2e0ac586386
   @repo2
    * bm2                       3:0e6e70d1d5f1
   @repo3
      bm1                       2:c2e0ac586386
      bm3                       2:c2e0ac586386
    * bmX                       2:c2e0ac586386
   transaction abort!
   rollback completed
   abort: pretxnclose hook exited with status 1
   [255]
   $ hg book bm3
 
   $ cd ../repo1
 
 test that commits work
 
   $ echo 'shared bookmarks' > a
   $ hg commit -m 'testing shared bookmarks'
   $ hg bookmarks
    * bm1                       3:b87954705719
      bm3                       2:c2e0ac586386
   $ cd ../repo3
   $ hg bookmarks
      bm1                       3:b87954705719
    * bm3                       2:c2e0ac586386
   $ echo 'more shared bookmarks' > a
   $ hg commit -m 'testing shared bookmarks'
   created new head
   $ hg bookmarks
      bm1                       3:b87954705719
    * bm3                       4:62f4ded848e4
   $ cd ../repo1
   $ hg bookmarks
    * bm1                       3:b87954705719
      bm3                       4:62f4ded848e4
   $ cd ..
 
 test pushing bookmarks works
 
   $ hg clone repo3 repo4
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo4
   $ hg boo bm4
   $ echo foo > b
   $ hg commit -m 'foo in b'
   $ hg boo
      bm1                       3:b87954705719
      bm3                       4:62f4ded848e4
    * bm4                       5:92793bfc8cad
   $ hg push -B bm4
   pushing to $TESTTMP/repo3 (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   exporting bookmark bm4
   $ cd ../repo1
   $ hg bookmarks
    * bm1                       3:b87954705719
      bm3                       4:62f4ded848e4
      bm4                       5:92793bfc8cad
   $ cd ../repo3
   $ hg bookmarks
      bm1                       3:b87954705719
    * bm3                       4:62f4ded848e4
      bm4                       5:92793bfc8cad
   $ cd ..
 
 test behavior when sharing a shared repo
 
   $ hg share -B repo3 repo5
   updating working directory
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd repo5
   $ hg book
      bm1                       3:b87954705719
      bm3                       4:62f4ded848e4
      bm4                       5:92793bfc8cad
   $ cd ..
 
 test what happens when an active bookmark is deleted
 
   $ cd repo1
   $ hg boo -d bm3
   $ hg boo
    * bm1                       3:b87954705719
      bm4                       5:92793bfc8cad
   $ cd ../repo3
   $ hg boo
      bm1                       3:b87954705719
      bm4                       5:92793bfc8cad
   $ cd ..
 
 verify that bookmarks are not written on failed transaction
 
   $ cat > failpullbookmarks.py << EOF
   > """A small extension that makes bookmark pulls fail, for testing"""
   > from mercurial import extensions, exchange, error
   > def _pullbookmarks(orig, pullop):
   >     orig(pullop)
   >     raise error.HookAbort('forced failure by extension')
   > def extsetup(ui):
   >     extensions.wrapfunction(exchange, '_pullbookmarks', _pullbookmarks)
   > EOF
   $ cd repo4
   $ hg boo
      bm1                       3:b87954705719
      bm3                       4:62f4ded848e4
    * bm4                       5:92793bfc8cad
   $ cd ../repo3
   $ hg boo
      bm1                       3:b87954705719
      bm4                       5:92793bfc8cad
   $ hg --config "extensions.failpullbookmarks=$TESTTMP/failpullbookmarks.py" pull $TESTTMP/repo4
   pulling from $TESTTMP/repo4 (glob)
   searching for changes
   no changes found
   adding remote bookmark bm3
   abort: forced failure by extension
   [255]
   $ hg boo
      bm1                       3:b87954705719
      bm4                       5:92793bfc8cad
   $ hg pull $TESTTMP/repo4
   pulling from $TESTTMP/repo4 (glob)
   searching for changes
   no changes found
   adding remote bookmark bm3
   $ hg boo
      bm1                       3:b87954705719
    * bm3                       4:62f4ded848e4
      bm4                       5:92793bfc8cad
   $ cd ..
 
 verify bookmark behavior after unshare
 
   $ cd repo3
   $ hg unshare
   $ hg boo
      bm1                       3:b87954705719
    * bm3                       4:62f4ded848e4
      bm4                       5:92793bfc8cad
   $ hg boo -d bm4
   $ hg boo bm5
   $ hg boo
      bm1                       3:b87954705719
      bm3                       4:62f4ded848e4
    * bm5                       4:62f4ded848e4
   $ cd ../repo1
   $ hg boo
    * bm1                       3:b87954705719
      bm3                       4:62f4ded848e4
      bm4                       5:92793bfc8cad
   $ cd ..
 
 test shared clones using relative paths work
 
   $ mkdir thisdir
   $ hg init thisdir/orig
   $ hg share -U thisdir/orig thisdir/abs
   $ hg share -U --relative thisdir/abs thisdir/rel
   $ cat thisdir/rel/.hg/sharedpath
   ../../orig/.hg (no-eol)
   $ grep shared thisdir/*/.hg/requires
   thisdir/abs/.hg/requires:shared
   thisdir/rel/.hg/requires:shared
   thisdir/rel/.hg/requires:relshared
 
 test that relative shared paths aren't relative to $PWD
 
   $ cd thisdir
   $ hg -R rel root
   $TESTTMP/thisdir/rel
   $ cd ..
 
 now test that relative paths really are relative, survive across
 renames and changes of PWD
 
   $ hg -R thisdir/abs root
   $TESTTMP/thisdir/abs
   $ hg -R thisdir/rel root
   $TESTTMP/thisdir/rel
   $ mv thisdir thatdir
   $ hg -R thatdir/abs root
   abort: .hg/sharedpath points to nonexistent directory $TESTTMP/thisdir/orig/.hg!
   [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
 
   $ killdaemons.py