Skip to content
Snippets Groups Projects
Commit 7b815e38022a authored by Frank Kingswood's avatar Frank Kingswood
Browse files

convert: handle changeset sorting errors without traceback (issue3961)

parent 2fa303619b4d
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment