Show More
@@ -556,27 +556,25 b' def createchangeset(ui, log, fuzz=60, me' | |||||
556 |
|
556 | |||
557 | # Sort files in each changeset |
|
557 | # Sort files in each changeset | |
558 |
|
558 | |||
|
559 | def entitycompare(l, r): | |||
|
560 | 'Mimic cvsps sorting order' | |||
|
561 | l = l.file.split('/') | |||
|
562 | r = r.file.split('/') | |||
|
563 | nl = len(l) | |||
|
564 | nr = len(r) | |||
|
565 | n = min(nl, nr) | |||
|
566 | for i in range(n): | |||
|
567 | if i + 1 == nl and nl < nr: | |||
|
568 | return -1 | |||
|
569 | elif i + 1 == nr and nl > nr: | |||
|
570 | return +1 | |||
|
571 | elif l[i] < r[i]: | |||
|
572 | return -1 | |||
|
573 | elif l[i] > r[i]: | |||
|
574 | return +1 | |||
|
575 | return 0 | |||
|
576 | ||||
559 | for c in changesets: |
|
577 | for c in changesets: | |
560 | def pathcompare(l, r): |
|
|||
561 | 'Mimic cvsps sorting order' |
|
|||
562 | l = l.split('/') |
|
|||
563 | r = r.split('/') |
|
|||
564 | nl = len(l) |
|
|||
565 | nr = len(r) |
|
|||
566 | n = min(nl, nr) |
|
|||
567 | for i in range(n): |
|
|||
568 | if i + 1 == nl and nl < nr: |
|
|||
569 | return -1 |
|
|||
570 | elif i + 1 == nr and nl > nr: |
|
|||
571 | return +1 |
|
|||
572 | elif l[i] < r[i]: |
|
|||
573 | return -1 |
|
|||
574 | elif l[i] > r[i]: |
|
|||
575 | return +1 |
|
|||
576 | return 0 |
|
|||
577 | def entitycompare(l, r): |
|
|||
578 | return pathcompare(l.file, r.file) |
|
|||
579 |
|
||||
580 | c.entries.sort(entitycompare) |
|
578 | c.entries.sort(entitycompare) | |
581 |
|
579 | |||
582 | # Sort changesets by date |
|
580 | # Sort changesets by date |
General Comments 0
You need to be logged in to leave comments.
Login now