Patchwork [3,of,3] share: implement shared bookmark functionality

login
register
mail settings
Submitter Ryan McElroy
Date Dec. 1, 2014, 8:57 p.m.
Message ID <167c39d171778dadf2c1.1417467444@devbig105.prn2.facebook.com>
Download mbox | patch
Permalink /patch/6934/
State Superseded
Commit 141baca1605917f36178679c81a6e70a032de0ff
Headers show

Comments

Ryan McElroy - Dec. 1, 2014, 8:57 p.m.
# HG changeset patch
# User Ryan McElroy <rmcelroy@fb.com>
# Date 1417078116 28800
#      Thu Nov 27 00:48:36 2014 -0800
# Node ID 167c39d171778dadf2c1256f2294493e6ec6a241
# Parent  beb7a11c50c34e38adea9d8dd3650d42d16cf0ff
share: implement shared bookmark functionality

This enables bookmarks to be shared between shared repositories by extending
the bookmarks.bmstore methods that read and write bookmarks to take into account
a bookmarks.shared file that can point to another repository.
Pierre-Yves David - Dec. 2, 2014, 9:43 p.m.
On 12/01/2014 12:57 PM, Ryan McElroy wrote:
> +def recordchange(orig, self, tr):
> +    tr.addfilegenerator('bookmarks', ('bookmarks',), self._write)
> +    orig(self, tr)
> +    _write(self)
> +
> +def write(orig, self):
> +    # First write a bookmarks file in case we ever unshare
> +    orig(self)
> +    _write(self)
> +
> +def _write(self):
> +    repo = getsrcrepo(self._repo) or self._repo
> +
> +    wlock = repo.wlock()
> +    try:
> +        f = repo.vfs('bookmarks', 'w', atomictemp=True)
> +        self._write(f)
> +        f.close()
> +
> +    finally:
> +        wlock.release()

You should not hook yourself on `addfilegenerator` as it is going to be 
called before transaction close (eg for hooks). You can hook on the 
transaction finalize (or postclose) mechanism instead.

Patch

diff --git a/hgext/share.py b/hgext/share.py
--- a/hgext/share.py
+++ b/hgext/share.py
@@ -6,7 +6,9 @@ 
 '''share a common history between several working directories'''
 
 from mercurial.i18n import _
-from mercurial import cmdutil, hg, util
+from mercurial import cmdutil, hg, util, extensions, bookmarks
+from mercurial.hg import repository, parseurl
+import errno
 
 cmdtable = {}
 command = cmdutil.command(cmdtable)
@@ -69,3 +71,45 @@ 
 
     # update store, spath, sopener and sjoin of repo
     repo.unfiltered().__init__(repo.baseui, repo.root)
+
+def extsetup(ui):
+    extensions.wrapfunction(bookmarks.bmstore, 'getbkfile', getbkfile)
+    extensions.wrapfunction(bookmarks.bmstore, 'recordchange', recordchange)
+    extensions.wrapfunction(bookmarks.bmstore, 'write', write)
+
+def getsrcrepo(repo):
+    srcrepo = None
+    try:
+        source = repo.vfs.read('bookmarks.shared')
+        srcurl, branches = parseurl(source)
+        srcrepo = repository(repo.ui, srcurl)
+    except IOError, inst:
+        if inst.errno != errno.ENOENT:
+            raise
+    return srcrepo
+
+def getbkfile(orig, self, repo):
+    repo = getsrcrepo(repo) or repo
+    return orig(self, repo)
+
+def recordchange(orig, self, tr):
+    tr.addfilegenerator('bookmarks', ('bookmarks',), self._write)
+    orig(self, tr)
+    _write(self)
+
+def write(orig, self):
+    # First write a bookmarks file in case we ever unshare
+    orig(self)
+    _write(self)
+
+def _write(self):
+    repo = getsrcrepo(self._repo) or self._repo
+
+    wlock = repo.wlock()
+    try:
+        f = repo.vfs('bookmarks', 'w', atomictemp=True)
+        self._write(f)
+        f.close()
+
+    finally:
+        wlock.release()
diff --git a/tests/test-share.t b/tests/test-share.t
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -128,6 +128,113 @@ 
 
   $ 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
+
+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
+
+
 Explicitly kill daemons to let the test exit on Windows
 
   $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS