Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
hg-git
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
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-git
Commits
54dd2b9b
Commit
54dd2b9b
authored
10 years ago
by
Sean Farley
Browse files
Options
Downloads
Patches
Plain Diff
verify: flake8 cleanup
parent
29a0bf3e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
hggit/verify.py
+4
-5
4 additions, 5 deletions
hggit/verify.py
with
4 additions
and
5 deletions
hggit/verify.py
+
4
−
5
View file @
54dd2b9b
...
...
@@ -9,5 +9,4 @@
from
mercurial
import
error
from
mercurial
import
util
as
hgutil
from
mercurial.node
import
hex
,
bin
,
nullid
from
mercurial.i18n
import
_
...
...
@@ -13,5 +12,4 @@
from
mercurial.i18n
import
_
from
mercurial
import
scmutil
from
dulwich
import
diff_tree
from
dulwich.objects
import
Commit
,
S_IFGITLINK
...
...
@@ -30,7 +28,8 @@
if
not
gitsha
:
# TODO deal better with commits in the middle of octopus merges
raise
hgutil
.
Abort
(
_
(
'
no git commit found for rev %s
'
)
%
hgctx
,
hint
=
_
(
'
if this is an octopus merge, verify against the last rev
'
))
hint
=
_
(
'
if this is an octopus merge,
'
'
verify against the last rev
'
))
try
:
gitcommit
=
handler
.
git
.
get_object
(
gitsha
)
...
...
@@ -60,8 +59,8 @@
if
gitfile
.
mode
==
dirkind
:
continue
# TODO deal with submodules
if
(
gitfile
.
mode
==
S_IFGITLINK
or
gitfile
.
path
==
'
.hgsubstate
'
or
gitfile
.
path
==
'
.hgsub
'
):
if
(
gitfile
.
mode
==
S_IFGITLINK
or
gitfile
.
path
==
'
.hgsubstate
'
or
gitfile
.
path
==
'
.hgsub
'
):
continue
ui
.
progress
(
'
verify
'
,
i
,
total
=
len
(
hgfiles
))
i
+=
1
...
...
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