/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/fastimport/marks_file.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-17 00:47:52 UTC
  • mfrom: (7182 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20181117004752-6ywampe5pfywlby4
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/fastimport/marks_file.py
32
32
        f = open(filename, 'r')
33
33
    except IOError:
34
34
        warning("Could not import marks file %s - not importing marks",
35
 
            filename)
 
35
                filename)
36
36
        return None
37
37
 
38
38
    try:
72
72
        f = open(filename, 'w')
73
73
    except IOError:
74
74
        warning("Could not open export-marks file %s - not exporting marks",
75
 
            filename)
 
75
                filename)
76
76
        return
77
77
 
78
78
    try:
79
79
        # Write the revision info
80
80
        for mark in revision_ids:
81
81
            f.write(':%s %s\n' % (mark.lstrip(b':').decode('utf-8'),
82
 
                revision_ids[mark].decode('utf-8')))
 
82
                                  revision_ids[mark].decode('utf-8')))
83
83
    finally:
84
84
        f.close()