D5612: fastannotate: slice strings to get single character
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Wed Jan 16 16:57:45 UTC 2019
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Behaves identically on Python 3 and Python 2.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5612
AFFECTED FILES
hgext/fastannotate/formatter.py
hgext/fastannotate/protocol.py
CHANGE DETAILS
diff --git a/hgext/fastannotate/protocol.py b/hgext/fastannotate/protocol.py
--- a/hgext/fastannotate/protocol.py
+++ b/hgext/fastannotate/protocol.py
@@ -98,7 +98,7 @@
state = 0 # 0: vfspath, 1: size
vfspath = size = ''
while i < l:
- ch = payload[i]
+ ch = payload[i:i + 1]
if ch == '\0':
if state == 1:
result[vfspath] = buffer(payload, i + 1, int(size))
diff --git a/hgext/fastannotate/formatter.py b/hgext/fastannotate/formatter.py
--- a/hgext/fastannotate/formatter.py
+++ b/hgext/fastannotate/formatter.py
@@ -103,7 +103,7 @@
result += ': ' + self.ui.label('-' + lines[i],
'diff.deleted')
- if result[-1] != '\n':
+ if result[-1:] != '\n':
result += '\n'
self.ui.write(result)
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list