Mercurial > hg > gitweb

diff mercurial/sshrepo.py @ 2439:e8c4f3d3df8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extend network protocol to stop clients from locking servers now all repositories have capabilities slot, tuple with list of names. if 'unbundle' capability present, repo supports push where client does not need to lock server. repository classes that have unbundle capability also have unbundle method. implemented for ssh now, will be base for push over http. unbundle protocol acts this way. server tells client what heads it has during normal negotiate step. client starts unbundle by repeat server's heads back to it. if server has new heads, abort immediately. otherwise, transfer changes to server. once data transferred, server locks and checks heads again. if heads same, changes can be added. else someone else added heads, and server aborts. if client wants to force server to add heads, sends special heads list of 'force'.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 15 Jun 2006 16:37:23 -0700
parents a1cfe679192c
children cc1011a7ed09
line wrap: on
line diff
--- a/mercurial/sshrepo.py	Thu Jun 15 13:27:57 2006 -0700
+++ b/mercurial/sshrepo.py	Thu Jun 15 16:37:23 2006 -0700
@@ -141,11 +141,36 @@
         f = self.do_cmd("changegroup", roots=n)
         return self.pipei
 
+    def unbundle(self, cg, heads, source):
+        d = self.call("unbundle", heads=' '.join(map(hex, heads)))
+        if d:
+            raise hg.RepoError(_("push refused: %s") % d)
+
+        while 1:
+            d = cg.read(4096)
+            if not d: break
+            self.pipeo.write(str(len(d)) + '\n')
+            self.pipeo.write(d)
+            self.readerr()
+
+        self.pipeo.write('0\n')
+        self.pipeo.flush()
+
+        self.readerr()
+        d = self.pipei.readline()
+        if d != '\n':
+            return 1
+
+        l = int(self.pipei.readline())
+        r = self.pipei.read(l)
+        if not r:
+            return 1
+        return int(r)
+
     def addchangegroup(self, cg, source):
         d = self.call("addchangegroup")
         if d:
-            raise hg.RepoError(_("push refused: %s"), d)
-
+            raise hg.RepoError(_("push refused: %s") % d)
         while 1:
             d = cg.read(4096)
             if not d: break