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
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
This instance will be upgraded to Heptapod 17.9.0rc1 on 2025-03-27 between 17:00 and 18:00 UTC+2
Show more breadcrumbs
mercurial
hg-windows-ci
Commits
7b815e38022a
Commit
7b815e38022a
authored
11 years ago
by
Frank Kingswood
Browse files
Options
Downloads
Patches
Plain Diff
convert: handle changeset sorting errors without traceback (issue3961)
parent
2fa303619b4d
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
hgext/convert/cvsps.py
+11
-2
11 additions, 2 deletions
hgext/convert/cvsps.py
with
11 additions
and
2 deletions
hgext/convert/cvsps.py
+
11
−
2
View file @
7b815e38
...
...
@@ -496,6 +496,7 @@
.branchpoints- the branches that start at the current entry or empty
'''
def
__init__
(
self
,
**
entries
):
self
.
id
=
None
self
.
synthetic
=
False
self
.
__dict__
.
update
(
entries
)
...
...
@@ -604,7 +605,8 @@
# Sort changesets by date
def
cscmp
(
l
,
r
):
odd
=
set
()
def
cscmp
(
l
,
r
,
odd
=
odd
):
d
=
sum
(
l
.
date
)
-
sum
(
r
.
date
)
if
d
:
return
d
...
...
@@ -626,7 +628,8 @@
for
e
in
r
.
entries
:
if
le
.
get
(
e
.
rcs
,
None
)
==
e
.
parent
:
assert
not
d
if
d
:
odd
.
add
((
l
,
r
))
d
=
-
1
break
...
...
@@ -769,6 +772,12 @@
for
i
,
c
in
enumerate
(
changesets
):
c
.
id
=
i
+
1
if
odd
:
for
l
,
r
in
odd
:
if
l
.
id
is
not
None
and
r
.
id
is
not
None
:
ui
.
warn
(
_
(
'
changeset %d is both before and after %d
\n
'
)
%
(
l
.
id
,
r
.
id
))
ui
.
status
(
_
(
'
%d changeset entries
\n
'
)
%
len
(
changesets
))
hook
.
hook
(
ui
,
None
,
"
cvschangesets
"
,
True
,
changesets
=
changesets
)
...
...
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