diff mercurial/sshrepo.py @ 2019:ced2d3620f95

add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 29 Mar 2006 10:27:16 -0800
parents 50de0887bbcd
children 1f1fc418a96c
line wrap: on
line diff
--- a/mercurial/sshrepo.py	Wed Mar 29 12:45:33 2006 +0200
+++ b/mercurial/sshrepo.py	Wed Mar 29 10:27:16 2006 -0800
@@ -130,4 +130,7 @@
 
         self.readerr()
         l = int(self.pipei.readline())
-        return self.pipei.read(l) != ""
+        r = self.pipei.read(l)
+        if not r:
+            return 1
+        return int(r)