Show More
@@ -638,18 +638,26 b' class changelog(revlog.revlog):' | |||||
638 | if extra is not None: |
|
638 | if extra is not None: | |
639 | for name in ('p1copies', 'p2copies', 'filesadded', 'filesremoved'): |
|
639 | for name in ('p1copies', 'p2copies', 'filesadded', 'filesremoved'): | |
640 | extra.pop(name, None) |
|
640 | extra.pop(name, None) | |
|
641 | if p1copies is not None: | |||
|
642 | p1copies = encodecopies(sortedfiles, p1copies) | |||
|
643 | if p2copies is not None: | |||
|
644 | p2copies = encodecopies(sortedfiles, p2copies) | |||
|
645 | if filesadded is not None: | |||
|
646 | filesadded = encodefileindices(sortedfiles, filesadded) | |||
|
647 | if filesremoved is not None: | |||
|
648 | filesremoved = encodefileindices(sortedfiles, filesremoved) | |||
641 | if self._copiesstorage == 'extra': |
|
649 | if self._copiesstorage == 'extra': | |
642 | extrasentries = p1copies, p2copies, filesadded, filesremoved |
|
650 | extrasentries = p1copies, p2copies, filesadded, filesremoved | |
643 | if extra is None and any(x is not None for x in extrasentries): |
|
651 | if extra is None and any(x is not None for x in extrasentries): | |
644 | extra = {} |
|
652 | extra = {} | |
645 | if p1copies is not None: |
|
653 | if p1copies is not None: | |
646 |
extra['p1copies'] = |
|
654 | extra['p1copies'] = p1copies | |
647 | if p2copies is not None: |
|
655 | if p2copies is not None: | |
648 |
extra['p2copies'] = |
|
656 | extra['p2copies'] = p2copies | |
649 | if filesadded is not None: |
|
657 | if filesadded is not None: | |
650 |
extra['filesadded'] = |
|
658 | extra['filesadded'] = filesadded | |
651 | if filesremoved is not None: |
|
659 | if filesremoved is not None: | |
652 |
extra['filesremoved'] = |
|
660 | extra['filesremoved'] = filesremoved | |
653 |
|
661 | |||
654 | if extra: |
|
662 | if extra: | |
655 | extra = encodeextra(extra) |
|
663 | extra = encodeextra(extra) |
General Comments 0
You need to be logged in to leave comments.
Login now