Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
diffoscope
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Reproducible Builds
diffoscope
Commits
69359bab
Commit
69359bab
authored
7 years ago
by
Chris Lamb
Browse files
Options
Downloads
Patches
Plain Diff
Compare None using identify, not equality.
parent
6d32c7b0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
diffoscope/comparators/utils/fuzzy.py
+1
-1
1 addition, 1 deletion
diffoscope/comparators/utils/fuzzy.py
diffoscope/diff.py
+3
-3
3 additions, 3 deletions
diffoscope/diff.py
with
4 additions
and
4 deletions
diffoscope/comparators/utils/fuzzy.py
+
1
−
1
View file @
69359bab
...
...
@@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)
def
perform_fuzzy_matching
(
members1
,
members2
):
if
tlsh
==
None
or
Config
().
fuzzy_threshold
==
0
:
if
tlsh
is
None
or
Config
().
fuzzy_threshold
==
0
:
return
already_compared
=
set
()
# Perform local copies because they will be modified by consumer
...
...
This diff is collapsed.
Click to expand it.
diffoscope/diff.py
+
3
−
3
View file @
69359bab
...
...
@@ -448,13 +448,13 @@ class SideBySideDiff(object):
orig1
=
s1
orig2
=
s2
if
s1
==
None
and
s2
==
None
:
if
s1
is
None
and
s2
is
None
:
type_name
=
"
unmodified
"
elif
s1
==
""
and
s2
==
""
:
type_name
=
"
unmodified
"
elif
s1
==
None
or
s1
==
""
:
elif
s1
is
None
or
s1
==
""
:
type_name
=
"
added
"
elif
s2
==
None
or
s2
==
""
:
elif
s2
is
None
or
s2
==
""
:
type_name
=
"
deleted
"
elif
orig1
==
orig2
and
not
s1
.
endswith
(
'
lines removed ]
'
)
and
not
s2
.
endswith
(
'
lines removed ]
'
):
type_name
=
"
unmodified
"
...
...
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