Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hg-windows-ci
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
hg-windows-ci
Commits
1198c86b
Commit
1198c86b
authored
6 years ago
by
Augie Fackler
Browse files
Options
Downloads
Patches
Plain Diff
fastannotate: fix isinstance checks to be against bytes instead of str
Differential Revision:
https://phab.mercurial-scm.org/D5611
parent
c146651a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
hgext/fastannotate/context.py
+2
-2
2 additions, 2 deletions
hgext/fastannotate/context.py
with
2 additions
and
2 deletions
hgext/fastannotate/context.py
+
2
−
2
View file @
1198c86b
...
...
@@ -602,7 +602,7 @@
the best case, the user provides a node and we don
'
t need to read the
filelog or construct any filecontext.
"""
if
isinstance
(
f
,
str
):
if
isinstance
(
f
,
bytes
):
hsh
=
f
else
:
hsh
=
f
.
node
()
...
...
@@ -625,7 +625,7 @@
if
showpath
:
result
=
self
.
_addpathtoresult
(
result
)
if
showlines
:
if
isinstance
(
f
,
str
):
# f: node or fctx
if
isinstance
(
f
,
bytes
):
# f: node or fctx
llrev
=
self
.
revmap
.
hsh2rev
(
f
)
fctx
=
self
.
_resolvefctx
(
f
,
self
.
revmap
.
rev2path
(
llrev
))
else
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment