Show More
@@ -449,11 +449,25 b' class basectx(object):' | |||||
449 | unknown=listunknown, |
|
449 | unknown=listunknown, | |
450 | listsubrepos=True, |
|
450 | listsubrepos=True, | |
451 | ) |
|
451 | ) | |
452 |
for |
|
452 | for k in ( | |
|
453 | 'modified', | |||
|
454 | 'added', | |||
|
455 | 'removed', | |||
|
456 | 'deleted', | |||
|
457 | 'unknown', | |||
|
458 | 'ignored', | |||
|
459 | 'clean', | |||
|
460 | ): | |||
|
461 | rfiles, sfiles = getattr(r, k), getattr(s, k) | |||
453 | rfiles.extend(b"%s/%s" % (subpath, f) for f in sfiles) |
|
462 | rfiles.extend(b"%s/%s" % (subpath, f) for f in sfiles) | |
454 |
|
463 | |||
455 | for l in r: |
|
464 | r.modified.sort() | |
456 |
|
|
465 | r.added.sort() | |
|
466 | r.removed.sort() | |||
|
467 | r.deleted.sort() | |||
|
468 | r.unknown.sort() | |||
|
469 | r.ignored.sort() | |||
|
470 | r.clean.sort() | |||
457 |
|
471 | |||
458 | return r |
|
472 | return r | |
459 |
|
473 |
General Comments 0
You need to be logged in to leave comments.
Login now