equal
deleted
inserted
replaced
24 from .node import ( |
24 from .node import ( |
25 hex, |
25 hex, |
26 short, |
26 short, |
27 ) |
27 ) |
28 from . import ( |
28 from . import ( |
29 base85, |
|
30 copies, |
29 copies, |
31 diffhelpers, |
30 diffhelpers, |
32 encoding, |
31 encoding, |
33 error, |
32 error, |
34 mail, |
33 mail, |
1428 if l <= 'Z' and l >= 'A': |
1427 if l <= 'Z' and l >= 'A': |
1429 l = ord(l) - ord('A') + 1 |
1428 l = ord(l) - ord('A') + 1 |
1430 else: |
1429 else: |
1431 l = ord(l) - ord('a') + 27 |
1430 l = ord(l) - ord('a') + 27 |
1432 try: |
1431 try: |
1433 dec.append(base85.b85decode(line[1:])[:l]) |
1432 dec.append(util.b85decode(line[1:])[:l]) |
1434 except ValueError as e: |
1433 except ValueError as e: |
1435 raise PatchError(_('could not decode "%s" binary patch: %s') |
1434 raise PatchError(_('could not decode "%s" binary patch: %s') |
1436 % (self._fname, str(e))) |
1435 % (self._fname, str(e))) |
1437 line = getline(lr, self.hunk) |
1436 line = getline(lr, self.hunk) |
1438 text = zlib.decompress(''.join(dec)) |
1437 text = zlib.decompress(''.join(dec)) |