/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/git/pristine_tar.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-03 01:42:53 UTC
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180703014253-zjckmhgnmb2qsn6x
Disable some flaky tests on python3, allow running without fastimport.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/pristine_tar.py
30
30
 
31
31
import stat
32
32
 
33
 
README_CONTENTS = """\
 
33
README_CONTENTS = b"""\
34
34
This branch contains delta files that pristine-tar can use to
35
35
regenerate tarballs for its own releases.
36
36
"""
57
57
 
58
58
    """
59
59
    try:
60
 
        cid = repo.refs["refs/heads/pristine-tar"]
 
60
        cid = repo.refs[b"refs/heads/pristine-tar"]
61
61
    except KeyError:
62
62
        return Tree()
63
63
    tid = repo.object_store[cid].tree
72
72
    :return: Tuple with delta and id
73
73
    """
74
74
    tree = get_pristine_tar_tree(repo)
75
 
    delta = tree[filename + ".delta"][1]
76
 
    gitid = tree[filename + ".id"][1]
 
75
    delta = tree[filename + b".delta"][1]
 
76
    gitid = tree[filename + b".id"][1]
77
77
    return (repo.object_store[delta].data,
78
78
            repo.object_store[gitid].data)
79
79
 
88
88
    :param gitid: Git id the pristine tar delta is generated against
89
89
    """
90
90
    delta_ob = Blob.from_string(delta)
91
 
    delta_name = filename + ".delta"
 
91
    delta_name = filename + b".delta"
92
92
    id_ob = Blob.from_string(gitid)
93
 
    id_name = filename + ".id"
 
93
    id_name = filename + b".id"
94
94
    objects = [
95
95
        (delta_ob, delta_name),
96
96
        (id_ob, id_name)]
97
97
    tree = get_pristine_tar_tree(repo)
98
98
    tree.add(delta_name, stat.S_IFREG | 0o644, delta_ob.id)
99
99
    tree.add(id_name, stat.S_IFREG | 0o644, id_ob.id)
100
 
    if not "README" in tree:
 
100
    if not b"README" in tree:
101
101
        readme_ob = Blob.from_string(README_CONTENTS)
102
 
        objects.append((readme_ob, "README"))
103
 
        tree.add("README", stat.S_IFREG | 0o644, readme_ob.id)
 
102
        objects.append((readme_ob, b"README"))
 
103
        tree.add(b"README", stat.S_IFREG | 0o644, readme_ob.id)
104
104
    objects.append((tree, ""))
105
105
    repo.object_store.add_objects(objects)
106
106
    if message is None:
107
 
        message = 'pristine-tar data for %s' % filename
108
 
    return repo.do_commit(ref='refs/heads/pristine-tar', tree=tree.id,
 
107
        message = b'pristine-tar data for %s' % filename
 
108
    return repo.do_commit(ref=b'refs/heads/pristine-tar', tree=tree.id,
109
109
        message=message, **kwargs)