Mercurial > hg
annotate mercurial/pure/base85.py @ 45585:479cce8c9882
commit: force create a new filenode if it was set in mergestate by merge
For reasons mentioned in previous commits, we will like to forcefully create a
new filenode sometimes.
Combination of this patch and previous one, we fixed a case in
`test-merge-combination.t`.
This does not yet results in conflict where it should, I need to investigate
more about what's happening as it should be a change-delete conflict now.
Differential Revision: https://phab.mercurial-scm.org/D8989
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 03 Sep 2020 13:58:14 +0530 |
parents | 4cd911040ba5 |
children | 6000f5b25c9b |
rev | line source |
---|---|
7701 | 1 # base85.py: pure python base85 codec |
2 # | |
3 # Copyright (C) 2009 Brendan Cully <brendan@kublai.com> | |
4 # | |
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
7881
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
10263 | 6 # GNU General Public License version 2 or any later version. |
7701 | 7 |
27334
9007f697e8ef
base85: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16598
diff
changeset
|
8 from __future__ import absolute_import |
9007f697e8ef
base85: use absolute_import
Gregory Szorc <gregory.szorc@gmail.com>
parents:
16598
diff
changeset
|
9 |
7701 | 10 import struct |
11 | |
35944
01b4d88ccb24
py3: use pycompat.bytestr to convert _b85chars to bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27334
diff
changeset
|
12 from .. import pycompat |
01b4d88ccb24
py3: use pycompat.bytestr to convert _b85chars to bytes
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27334
diff
changeset
|
13 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
14 _b85chars = pycompat.bytestr( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
15 b"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdef" |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
16 b"ghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~" |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
17 ) |
7835
2505e9f84153
Optimization of pure.base85.b85encode
Mads Kiilerich <mads@kiilerich.com>
parents:
7701
diff
changeset
|
18 _b85chars2 = [(a + b) for a in _b85chars for b in _b85chars] |
7701 | 19 _b85dec = {} |
20 | |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
21 |
7701 | 22 def _mkb85dec(): |
8632
9e055cfdd620
replace "i in range(len(xs))" with "i, x in enumerate(xs)"
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
23 for i, c in enumerate(_b85chars): |
9e055cfdd620
replace "i in range(len(xs))" with "i, x in enumerate(xs)"
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
24 _b85dec[c] = i |
7701 | 25 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
26 |
7701 | 27 def b85encode(text, pad=False): |
28 """encode text in base85 format""" | |
29 l = len(text) | |
30 r = l % 4 | |
31 if r: | |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
32 text += b'\0' * (4 - r) |
7701 | 33 longs = len(text) >> 2 |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
34 words = struct.unpack(b'>%dL' % longs, text) |
7701 | 35 |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
36 out = b''.join( |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
37 _b85chars[(word // 52200625) % 85] |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
38 + _b85chars2[(word // 7225) % 7225] |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
39 + _b85chars2[word % 7225] |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
40 for word in words |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
41 ) |
7701 | 42 |
43 if pad: | |
44 return out | |
45 | |
46 # Trim padding | |
47 olen = l % 4 | |
48 if olen: | |
49 olen += 1 | |
9029
0001e49f1c11
compat: use // for integer division
Alejandro Santos <alejolp@alejolp.com>
parents:
8632
diff
changeset
|
50 olen += l // 4 * 5 |
7701 | 51 return out[:olen] |
52 | |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
53 |
7701 | 54 def b85decode(text): |
55 """decode base85-encoded text""" | |
56 if not _b85dec: | |
57 _mkb85dec() | |
58 | |
59 l = len(text) | |
60 out = [] | |
61 for i in range(0, len(text), 5): | |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
62 chunk = text[i : i + 5] |
36191
80301c90a2dc
py3: converts bytes to pycompat.bytestr to get bytechrs while enumerating
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35944
diff
changeset
|
63 chunk = pycompat.bytestr(chunk) |
7701 | 64 acc = 0 |
8632
9e055cfdd620
replace "i in range(len(xs))" with "i, x in enumerate(xs)"
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
65 for j, c in enumerate(chunk): |
7701 | 66 try: |
8632
9e055cfdd620
replace "i in range(len(xs))" with "i, x in enumerate(xs)"
Martin Geisler <mg@lazybytes.net>
parents:
8225
diff
changeset
|
67 acc = acc * 85 + _b85dec[c] |
7701 | 68 except KeyError: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
69 raise ValueError( |
43666
4394687b298b
pure: use string for exception in the pure version of base85
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43077
diff
changeset
|
70 'bad base85 character at position %d' % (i + j) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
71 ) |
7701 | 72 if acc > 4294967295: |
43667
4cd911040ba5
pure: use string for another exception in the pure version of base85
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43666
diff
changeset
|
73 raise ValueError('Base85 overflow in hunk starting at byte %d' % i) |
7701 | 74 out.append(acc) |
75 | |
76 # Pad final chunk if necessary | |
77 cl = l % 5 | |
78 if cl: | |
79 acc *= 85 ** (5 - cl) | |
80 if cl > 1: | |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
81 acc += 0xFFFFFF >> (cl - 2) * 8 |
7701 | 82 out[-1] = acc |
83 | |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
84 out = struct.pack(b'>%dL' % (len(out)), *out) |
7701 | 85 if cl: |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
36191
diff
changeset
|
86 out = out[: -(5 - cl)] |
7701 | 87 |
88 return out |