Пример #1
0
 def pair(parent, child):
     blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts,
                              refine=True)
     for (a1, a2, b1, b2), t in blocks:
         # Changed blocks ('!') or blocks made only of blank lines ('~')
         # belong to the child.
         if t == '=':
             child[0][b1:b2] = parent[0][a1:a2]
     return child
Пример #2
0
 def pair(parent, child):
     blocks = mdiff.allblocks(parent[1],
                              child[1],
                              opts=diffopts,
                              refine=True)
     for (a1, a2, b1, b2), t in blocks:
         # Changed blocks ('!') or blocks made only of blank lines ('~')
         # belong to the child.
         if t == '=':
             child[0][b1:b2] = parent[0][a1:a2]
     return child