/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

Merge test-run support.

Show diffs side-by-side

added added

removed removed

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