Mercurial > public > mercurial-scm > hg-stable

diff mercurial/dagop.py @ 45957:89a2afe31e82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
formating: upgrade to black 20.8b1 This required a couple of small tweaks to un-confuse black, but now it works. Big formatting changes come from: * Dramatically improved collection-splitting logic upstream * Black having a strong (correct IMO) opinion that """ is better than ''' Differential Revision: https://phab.mercurial-scm.org/D9430
author Augie Fackler <raf@durin42.com>
date Fri, 27 Nov 2020 17:03:29 -0500
parents 4ebc5f325bed
children 59fa3890d40a
line wrap: on
line diff
--- a/mercurial/dagop.py	Fri Nov 27 17:00:00 2020 -0500
+++ b/mercurial/dagop.py	Fri Nov 27 17:03:29 2020 -0500
@@ -682,7 +682,7 @@
 
 
 def _annotatepair(parents, childfctx, child, skipchild, diffopts):
-    r'''
+    r"""
     Given parent and child fctxes and annotate data for parents, for all lines
     in either parent that match the child, annotate the child with the parent's
     data.
@@ -691,7 +691,7 @@
     annotate data as well such that child is never blamed for any lines.
 
     See test-annotate.py for unit tests.
-    '''
+    """
     pblocks = [
         (parent, mdiff.allblocks(parent.text, child.text, opts=diffopts))
         for parent in parents