##// END OF EJS Templates
revert: use an exact matcher in interactive diff selection (issue5789)...
revert: use an exact matcher in interactive diff selection (issue5789) When going through _performrevert() in the interactive case, we build a matcher with files to revert and pass it patch.diff() for later selection of diff hunks to revert. The files set used to build the matcher comes from dirstate and accounts for patterns explicitly passed to revert ('hg revert -i <file>') and, in case of nonexistent pattern, this set is empty (which is expected). Unfortunately, the matcher built from scmutil.match(ctx, []) is wrong as it leads patch.diff() to rebuild a 'changes' tuple with dirstate information, ignoring user-specified pattern. This leads to the situation described in issue5789, where one gets prompted about reverting files unrelated to specified patterns because they made a typo or so. We fix this by building an exact matcher with the correct set of file paths (built earlier). Thanks to Yuya Nishihara for suggesting the correct fix.

File last commit:

r36209:80301c90 default
r36212:39b3aab6 default
Show More
base85.py
80 lines | 2.0 KiB | text/x-python | PythonLexer
Brendan Cully
Pure python base85 fallback...
r7701 # base85.py: pure python base85 codec
#
# Copyright (C) 2009 Brendan Cully <brendan@kublai.com>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Brendan Cully
Pure python base85 fallback...
r7701
Gregory Szorc
base85: use absolute_import
r27334 from __future__ import absolute_import
Brendan Cully
Pure python base85 fallback...
r7701 import struct
Pulkit Goyal
py3: use pycompat.bytestr to convert _b85chars to bytes...
r35962 from .. import pycompat
_b85chars = pycompat.bytestr("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdef"
"ghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~")
Mads Kiilerich
Optimization of pure.base85.b85encode...
r7835 _b85chars2 = [(a + b) for a in _b85chars for b in _b85chars]
Brendan Cully
Pure python base85 fallback...
r7701 _b85dec = {}
def _mkb85dec():
Martin Geisler
replace "i in range(len(xs))" with "i, x in enumerate(xs)"...
r8632 for i, c in enumerate(_b85chars):
_b85dec[c] = i
Brendan Cully
Pure python base85 fallback...
r7701
def b85encode(text, pad=False):
"""encode text in base85 format"""
l = len(text)
r = l % 4
if r:
text += '\0' * (4 - r)
longs = len(text) >> 2
words = struct.unpack('>%dL' % (longs), text)
Alejandro Santos
compat: use // for integer division
r9029 out = ''.join(_b85chars[(word // 52200625) % 85] +
_b85chars2[(word // 7225) % 7225] +
Mads Kiilerich
Optimization of pure.base85.b85encode...
r7835 _b85chars2[word % 7225]
for word in words)
Brendan Cully
Pure python base85 fallback...
r7701
if pad:
return out
# Trim padding
olen = l % 4
if olen:
olen += 1
Alejandro Santos
compat: use // for integer division
r9029 olen += l // 4 * 5
Brendan Cully
Pure python base85 fallback...
r7701 return out[:olen]
def b85decode(text):
"""decode base85-encoded text"""
if not _b85dec:
_mkb85dec()
l = len(text)
out = []
for i in range(0, len(text), 5):
Matt Mackall
many, many trivial check-code fixups
r10282 chunk = text[i:i + 5]
Pulkit Goyal
py3: converts bytes to pycompat.bytestr to get bytechrs while enumerating...
r36209 chunk = pycompat.bytestr(chunk)
Brendan Cully
Pure python base85 fallback...
r7701 acc = 0
Martin Geisler
replace "i in range(len(xs))" with "i, x in enumerate(xs)"...
r8632 for j, c in enumerate(chunk):
Brendan Cully
Pure python base85 fallback...
r7701 try:
Martin Geisler
replace "i in range(len(xs))" with "i, x in enumerate(xs)"...
r8632 acc = acc * 85 + _b85dec[c]
Brendan Cully
Pure python base85 fallback...
r7701 except KeyError:
Patrick Mezard
pure/base85: align exception type/msg on base85.c...
r16598 raise ValueError('bad base85 character at position %d'
% (i + j))
Brendan Cully
Pure python base85 fallback...
r7701 if acc > 4294967295:
Patrick Mezard
pure/base85: align exception type/msg on base85.c...
r16598 raise ValueError('Base85 overflow in hunk starting at byte %d' % i)
Brendan Cully
Pure python base85 fallback...
r7701 out.append(acc)
# Pad final chunk if necessary
cl = l % 5
if cl:
acc *= 85 ** (5 - cl)
if cl > 1:
acc += 0xffffff >> (cl - 2) * 8
out[-1] = acc
out = struct.pack('>%dL' % (len(out)), *out)
if cl:
out = out[:-(5 - cl)]
return out