discovery: fix prepush documentation
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Fri, 13 Jan 2012 22:16:01 +0100
changeset 15893 eb6867b98223
parent 15892 592b3d1742a1
child 15894 44fa047cef57
discovery: fix prepush documentation The prepush documentation claim that when we refuse to push, the second element of the returng tuple is an "outgoing" integer. value should be 0 when no outgoing changeset and 1 otherwise. In pratice if there are no outgoing changeset, "outgoing" value is alway 1 and util.Abort is raised on other error. the stable branch also include this error so it wasn't introduced by a recent refactoring.
mercurial/discovery.py
--- a/mercurial/discovery.py	Fri Jan 13 02:04:16 2012 +0100
+++ b/mercurial/discovery.py	Fri Jan 13 22:16:01 2012 +0100
@@ -137,11 +137,9 @@
     changesets need to be pushed to the remote. Return value depends
     on circumstances:
 
-    If we are not going to push anything, return a tuple (None,
-    outgoing, common) where outgoing is 0 if there are no outgoing
-    changesets and 1 if there are, but we refuse to push them
-    (e.g. would create new remote heads). The third element "common"
-    is the list of heads of the common set between local and remote.
+    If we are not going to push anything, return a tuple (None, 1,
+    common) The third element "common" is the list of heads of the
+    common set between local and remote.
 
     Otherwise, return a tuple (changegroup, remoteheads, futureheads),
     where changegroup is a readable file-like object whose read()