D2522: py3: slice over bytes to prevent getting ascii values
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Mar 1 17:17:26 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1d99260c3a81: py3: slice over bytes to prevent getting ascii values (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2522?vs=6292&id=6294
REVISION DETAIL
https://phab.mercurial-scm.org/D2522
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -287,14 +287,14 @@
off = 0
end = len(data)
while off < end:
- rtype = data[off]
+ rtype = data[off:off + 1]
off += 1
length = _unpack('>I', data[off:(off + 4)])[0]
off += 4
record = data[off:(off + length)]
off += length
if rtype == 't':
- rtype, record = record[0], record[1:]
+ rtype, record = record[0:1], record[1:]
records.append((rtype, record))
f.close()
except IOError as err:
To: pulkit, #hg-reviewers, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list