diff --git a/mercurial/dagutil.py b/mercurial/dagutil.py
--- a/mercurial/dagutil.py
+++ b/mercurial/dagutil.py
@@ -40,18 +40,24 @@ class basedag(object):
         raise NotImplementedError()
 
     def ancestorset(self, starts, stops=None):
-        '''set of all ancestors of starts (incl), but stop walk at stops (excl)'''
+        '''
+        set of all ancestors of starts (incl), but stop walk at stops (excl)
+        '''
         raise NotImplementedError()
 
     def descendantset(self, starts, stops=None):
-        '''set of all descendants of starts (incl), but stop walk at stops (excl)'''
+        '''
+        set of all descendants of starts (incl), but stop walk at stops (excl)
+        '''
         return self.inverse().ancestorset(starts, stops)
 
     def headsetofconnecteds(self, ixs):
-        '''subset of connected list of ixs so that no node has a descendant in it
+        '''
+        subset of connected list of ixs so that no node has a descendant in it
 
         By "connected list" we mean that if an ancestor and a descendant are in
-        the list, then so is at least one path connecting them.'''
+        the list, then so is at least one path connecting them.
+        '''
         raise NotImplementedError()
 
     def externalize(self, ix):
diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
--- a/mercurial/setdiscovery.py
+++ b/mercurial/setdiscovery.py
@@ -82,8 +82,8 @@ def findcommonheads(ui, local, remote,
                     initialsamplesize=100,
                     fullsamplesize=200,
                     abortwhenunrelated=True):
-    '''Return a tuple (common, anyincoming, remoteheads) used to identify missing
-    nodes from or in remote.
+    '''Return a tuple (common, anyincoming, remoteheads) used to identify
+    missing nodes from or in remote.
 
     shortcutlocal determines whether we try use direct access to localrepo if
     remote is actually local.
@@ -106,8 +106,8 @@ def findcommonheads(ui, local, remote,
             return [nullid], True, srvheadhashes
         return [nullid], False, []
 
-    # start actual discovery (we note this before the next "if" for compatibility
-    # reasons)
+    # start actual discovery (we note this before the next "if" for
+    # compatibility reasons)
     ui.status(_("searching for changes\n"))
 
     srvheads = dag.internalizeall(srvheadhashes, filterunknown=True)