mercurial/mdiff.py
changeset 32245 4462a981e8df
parent 32244 2d84947cd85d
child 32246 ded48ad55146
equal deleted inserted replaced
32244:2d84947cd85d 32245:4462a981e8df
    11 import struct
    11 import struct
    12 import zlib
    12 import zlib
    13 
    13 
    14 from .i18n import _
    14 from .i18n import _
    15 from . import (
    15 from . import (
    16     base85,
       
    17     bdiff,
    16     bdiff,
    18     error,
    17     error,
    19     mpatch,
    18     mpatch,
    20     pycompat,
    19     pycompat,
    21     util,
    20     util,
   428         l = len(line)
   427         l = len(line)
   429         if l <= 26:
   428         if l <= 26:
   430             l = chr(ord('A') + l - 1)
   429             l = chr(ord('A') + l - 1)
   431         else:
   430         else:
   432             l = chr(l - 26 + ord('a') - 1)
   431             l = chr(l - 26 + ord('a') - 1)
   433         return '%c%s\n' % (l, base85.b85encode(line, True))
   432         return '%c%s\n' % (l, util.b85encode(line, True))
   434 
   433 
   435     def chunk(text, csize=52):
   434     def chunk(text, csize=52):
   436         l = len(text)
   435         l = len(text)
   437         i = 0
   436         i = 0
   438         while i < l:
   437         while i < l: