← Back to branch summary

~jelmer/brz/graph-rs

« back to all changes in this revision

Viewing changes to breezy/git/mapping.py

  • Committer: The Breezy Bot
  • Author(s): Jelmer Vernooij, Jelmer Vernooij
  • Date: 2023-03-09 12:10:41 UTC
  • mfrom: (7650.92.17 3.3)
  • Revision ID: the_breezy_bot-20230309121041-xhth6fnwhe0m8ato
Merge lp:brz/3.3

by brz review by jelmer

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/mapping.py
361
361
                Tag.from_string(rev.properties[propname].encode('utf-8', 'surrogateescape')))
362
362
            i += 1
363
363
            propname = 'git-mergetag-%d' % i
364
 
        extra = getattr(commit, "_extra", None) or getattr(commit, "extra", None)
 
364
        try:
 
365
            extra = commit._extra
 
366
        except AttributeError:
 
367
            extra = commit.extra
365
368
        if 'git-extra' in rev.properties:
366
369
            for l in rev.properties['git-extra'].splitlines():
367
370
                (k, v) = l.split(' ', 1)
463
466
            rev.parent_ids = list(parents)
464
467
        unknown_extra_fields = []
465
468
        extra_lines = []
466
 
        extra = getattr(commit, "_extra", None) or getattr(commit, "extra", None)
 
469
        try:
 
470
            extra = commit._extra
 
471
        except AttributeError:
 
472
            extra = commit.extra
467
473
        for k, v in extra:
468
474
            if k == HG_RENAME_SOURCE:
469
475
                extra_lines.append(