556 _(b'the name \'%s\' is reserved') % branch |
556 _(b'the name \'%s\' is reserved') % branch |
557 ) |
557 ) |
558 sortedfiles = sorted(files.touched) |
558 sortedfiles = sorted(files.touched) |
559 sidedata = None |
559 sidedata = None |
560 if self._copiesstorage == b'changeset-sidedata': |
560 if self._copiesstorage == b'changeset-sidedata': |
561 sidedata = {} |
561 sidedata = metadata.encode_copies_sidedata(files) |
562 p1copies = files.copied_from_p1 |
|
563 if p1copies: |
|
564 p1copies = metadata.encodecopies(sortedfiles, p1copies) |
|
565 sidedata[sidedatamod.SD_P1COPIES] = p1copies |
|
566 p2copies = files.copied_from_p2 |
|
567 if p2copies: |
|
568 p2copies = metadata.encodecopies(sortedfiles, p2copies) |
|
569 sidedata[sidedatamod.SD_P2COPIES] = p2copies |
|
570 filesadded = files.added |
|
571 if filesadded: |
|
572 filesadded = metadata.encodefileindices(sortedfiles, filesadded) |
|
573 sidedata[sidedatamod.SD_FILESADDED] = filesadded |
|
574 filesremoved = files.removed |
|
575 if filesremoved: |
|
576 filesremoved = metadata.encodefileindices( |
|
577 sortedfiles, filesremoved |
|
578 ) |
|
579 sidedata[sidedatamod.SD_FILESREMOVED] = filesremoved |
|
580 if not sidedata: |
|
581 sidedata = None |
|
582 |
562 |
583 if extra: |
563 if extra: |
584 extra = encodeextra(extra) |
564 extra = encodeextra(extra) |
585 parseddate = b"%s %s" % (parseddate, extra) |
565 parseddate = b"%s %s" % (parseddate, extra) |
586 l = [hex(manifest), user, parseddate] + sortedfiles + [b"", desc] |
566 l = [hex(manifest), user, parseddate] + sortedfiles + [b"", desc] |