bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
0.252.1
by Jelmer Vernooij
Support storing revision id data. |
1 |
# Copyright (C) 2010 Jelmer Vernooij <jelmer@samba.org>
|
2 |
#
|
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""Roundtripping support."""
|
|
18 |
||
19 |
||
20 |
from cStringIO import StringIO |
|
21 |
||
22 |
||
23 |
class BzrGitRevisionMetadata(object): |
|
24 |
"""Metadata for a Bazaar revision roundtripped into Git. |
|
|
0.200.1020
by Jelmer Vernooij
Store testament-sha1 in metadata. |
25 |
|
|
0.252.1
by Jelmer Vernooij
Support storing revision id data. |
26 |
:ivar revision_id: Revision id, as string
|
27 |
:ivar properties: Revision properties, as dictionary
|
|
|
0.252.8
by Jelmer Vernooij
Support ghost revisions while roundtripping. |
28 |
:ivar explicit_parent_ids: Parent ids (needed if there are ghosts)
|
|
0.200.1029
by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere. |
29 |
:ivar verifiers: Verifier information
|
|
0.252.1
by Jelmer Vernooij
Support storing revision id data. |
30 |
"""
|
31 |
||
32 |
revision_id = None |
|
33 |
||
|
0.252.8
by Jelmer Vernooij
Support ghost revisions while roundtripping. |
34 |
explicit_parent_ids = None |
35 |
||
|
0.200.1029
by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere. |
36 |
verifiers = {} |
|
0.200.1020
by Jelmer Vernooij
Store testament-sha1 in metadata. |
37 |
|
|
0.252.10
by Jelmer Vernooij
Support roundtripping custom revision properties. |
38 |
def __init__(self): |
39 |
self.properties = {} |
|
|
0.252.1
by Jelmer Vernooij
Support storing revision id data. |
40 |
|
|
0.252.2
by Jelmer Vernooij
Add functions for adding metadata to revision messages. |
41 |
def __nonzero__(self): |
|
0.252.22
by Jelmer Vernooij
Fix file id map (de)serialization. |
42 |
return bool(self.revision_id or self.properties) |
|
0.252.2
by Jelmer Vernooij
Add functions for adding metadata to revision messages. |
43 |
|
|
0.252.1
by Jelmer Vernooij
Support storing revision id data. |
44 |
|
45 |
def parse_roundtripping_metadata(text): |
|
46 |
"""Parse Bazaar roundtripping metadata.""" |
|
47 |
ret = BzrGitRevisionMetadata() |
|
48 |
f = StringIO(text) |
|
49 |
for l in f.readlines(): |
|
50 |
(key, value) = l.split(":", 1) |
|
51 |
if key == "revision-id": |
|
52 |
ret.revision_id = value.strip() |
|
|
0.252.8
by Jelmer Vernooij
Support ghost revisions while roundtripping. |
53 |
elif key == "parent-ids": |
54 |
ret.explicit_parent_ids = tuple(value.strip().split(" ")) |
|
|
0.200.1023
by Jelmer Vernooij
Set and verify testament. |
55 |
elif key == "testament3-sha1": |
|
0.200.1029
by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere. |
56 |
ret.verifiers["testament3-sha1"] = value.strip() |
|
0.252.10
by Jelmer Vernooij
Support roundtripping custom revision properties. |
57 |
elif key.startswith("property-"): |
58 |
ret.properties[key[len("property-"):]] = value[1:].rstrip("\n") |
|
|
0.252.1
by Jelmer Vernooij
Support storing revision id data. |
59 |
else: |
60 |
raise ValueError |
|
61 |
return ret |
|
|
0.252.2
by Jelmer Vernooij
Add functions for adding metadata to revision messages. |
62 |
|
63 |
||
|
0.252.40
by Jelmer Vernooij
Checks for roundtripping. |
64 |
def generate_roundtripping_metadata(metadata, encoding): |
|
0.252.2
by Jelmer Vernooij
Add functions for adding metadata to revision messages. |
65 |
"""Serialize the roundtripping metadata. |
66 |
||
67 |
:param metadata: A `BzrGitRevisionMetadata` instance
|
|
68 |
:return: String with revision metadata
|
|
69 |
"""
|
|
|
0.252.8
by Jelmer Vernooij
Support ghost revisions while roundtripping. |
70 |
lines = [] |
71 |
if metadata.revision_id: |
|
72 |
lines.append("revision-id: %s\n" % metadata.revision_id) |
|
73 |
if metadata.explicit_parent_ids: |
|
74 |
lines.append("parent-ids: %s\n" % " ".join(metadata.explicit_parent_ids)) |
|
|
0.252.10
by Jelmer Vernooij
Support roundtripping custom revision properties. |
75 |
for key in sorted(metadata.properties.keys()): |
|
0.252.40
by Jelmer Vernooij
Checks for roundtripping. |
76 |
lines.append("property-%s: %s\n" % (key.encode(encoding), metadata.properties[key].encode(encoding))) |
|
0.200.1029
by Jelmer Vernooij
Use dictionary with verifiers rather than requiring testament3-sha1 everywhere. |
77 |
if "testament3-sha1" in metadata.verifiers: |
78 |
lines.append("testament3-sha1: %s\n" % |
|
79 |
metadata.verifiers["testament3-sha1"]) |
|
|
0.252.8
by Jelmer Vernooij
Support ghost revisions while roundtripping. |
80 |
return "".join(lines) |
|
0.252.2
by Jelmer Vernooij
Add functions for adding metadata to revision messages. |
81 |
|
82 |
||
83 |
def extract_bzr_metadata(message): |
|
84 |
"""Extract Bazaar metadata from a commit message. |
|
85 |
||
86 |
:param message: Commit message to extract from
|
|
87 |
:return: Tuple with original commit message and metadata object
|
|
88 |
"""
|
|
89 |
split = message.split("\n--BZR--\n", 1) |
|
90 |
if len(split) != 2: |
|
91 |
return message, None |
|
92 |
return split[0], parse_roundtripping_metadata(split[1]) |
|
93 |
||
94 |
||
|
0.252.40
by Jelmer Vernooij
Checks for roundtripping. |
95 |
def inject_bzr_metadata(message, metadata, encoding): |
|
0.252.4
by Jelmer Vernooij
More work on roundtripping. |
96 |
if not metadata: |
|
0.252.2
by Jelmer Vernooij
Add functions for adding metadata to revision messages. |
97 |
return message |
|
0.252.40
by Jelmer Vernooij
Checks for roundtripping. |
98 |
rt_data = generate_roundtripping_metadata(metadata, encoding) |
|
0.200.1019
by Jelmer Vernooij
Handle empty metadata. |
99 |
if not rt_data: |
100 |
return message |
|
|
0.252.40
by Jelmer Vernooij
Checks for roundtripping. |
101 |
assert type(rt_data) == str |
102 |
return message + "\n--BZR--\n" + rt_data |
|
|
0.252.22
by Jelmer Vernooij
Fix file id map (de)serialization. |
103 |
|
104 |
||
105 |
def serialize_fileid_map(file_ids): |
|
|
0.200.1020
by Jelmer Vernooij
Store testament-sha1 in metadata. |
106 |
"""Serialize a file id map.""" |
|
0.252.22
by Jelmer Vernooij
Fix file id map (de)serialization. |
107 |
lines = [] |
108 |
for path in sorted(file_ids.keys()): |
|
109 |
lines.append("%s\0%s\n" % (path, file_ids[path])) |
|
|
0.252.23
by Jelmer Vernooij
More work on roundtripping support. |
110 |
return lines |
|
0.252.22
by Jelmer Vernooij
Fix file id map (de)serialization. |
111 |
|
112 |
||
|
0.200.1020
by Jelmer Vernooij
Store testament-sha1 in metadata. |
113 |
def deserialize_fileid_map(filetext): |
114 |
"""Deserialize a file id map.""" |
|
|
0.252.22
by Jelmer Vernooij
Fix file id map (de)serialization. |
115 |
ret = {} |
|
0.200.1020
by Jelmer Vernooij
Store testament-sha1 in metadata. |
116 |
f = StringIO(filetext) |
|
0.252.22
by Jelmer Vernooij
Fix file id map (de)serialization. |
117 |
lines = f.readlines() |
118 |
for l in lines: |
|
119 |
(path, file_id) = l.rstrip("\n").split("\0") |
|
120 |
ret[path] = file_id |
|
121 |
return ret |