bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
184
by mbp at sourcefrog
 pychecker fixups  | 
1  | 
# (C) 2005 Canonical
 | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
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  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
18  | 
import bzrlib.errors  | 
| 
974.1.87
by Aaron Bentley
 Refactored and documented graph stuff  | 
19  | 
from bzrlib.graph import node_distances, select_farthest, all_descendants  | 
| 
8
by mbp at sourcefrog
 store committer's timezone in revision and show  | 
20  | 
|
| 
974.1.90
by Aaron Bentley
 Switched NULL revision ID to 'null:' per robertc's suggestion  | 
21  | 
NULL_REVISION="null:"  | 
| 
974.1.89
by Aaron Bentley
 Fixed merging with multiple roots, by using null as graph root.  | 
22  | 
|
| 
802
by Martin Pool
 - Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions  | 
23  | 
class Revision(object):  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
24  | 
"""Single revision on a branch.  | 
25  | 
||
26  | 
    Revisions may know their revision_hash, but only once they've been
 | 
|
27  | 
    written out.  This is not stored because you cannot write the hash
 | 
|
28  | 
    into the file it describes.
 | 
|
29  | 
||
| 
697
by Martin Pool
 - write out parent list for new revisions  | 
30  | 
    After bzr 0.0.5 revisions are allowed to have multiple parents.
 | 
| 
696
by Martin Pool
 - Refactor revision deserialization code  | 
31  | 
|
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
32  | 
    parent_ids
 | 
33  | 
        List of parent revision_ids
 | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
34  | 
    """
 | 
| 
696
by Martin Pool
 - Refactor revision deserialization code  | 
35  | 
|
| 
1092.2.25
by Robert Collins
 support ghosts in commits  | 
36  | 
def __init__(self, revision_id, **args):  | 
37  | 
self.revision_id = revision_id  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
38  | 
self.__dict__.update(args)  | 
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
39  | 
self.parent_ids = []  | 
| 
1311
by Martin Pool
 - remove RevisionReference; just hold parent ids directly  | 
40  | 
self.parent_sha1s = []  | 
| 
696
by Martin Pool
 - Refactor revision deserialization code  | 
41  | 
|
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
42  | 
def __repr__(self):  | 
| 
184
by mbp at sourcefrog
 pychecker fixups  | 
43  | 
return "<Revision id %s>" % self.revision_id  | 
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
44  | 
|
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
45  | 
def __eq__(self, other):  | 
46  | 
if not isinstance(other, Revision):  | 
|
47  | 
return False  | 
|
| 
1092.2.20
by Robert Collins
 symlink and weaves, whaddya know  | 
48  | 
        # FIXME: rbc 20050930 parent_ids are not being compared
 | 
49  | 
return (  | 
|
50  | 
self.inventory_sha1 == other.inventory_sha1  | 
|
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
51  | 
and self.revision_id == other.revision_id  | 
52  | 
and self.timestamp == other.timestamp  | 
|
53  | 
and self.message == other.message  | 
|
54  | 
and self.timezone == other.timezone  | 
|
55  | 
and self.committer == other.committer)  | 
|
56  | 
||
57  | 
def __ne__(self, other):  | 
|
58  | 
return not self.__eq__(other)  | 
|
59  | 
||
| 
1
by mbp at sourcefrog
 import from baz patch-364  | 
60  | 
|
| 
810
by Martin Pool
 - New validate_revision_id function  | 
61  | 
REVISION_ID_RE = None  | 
62  | 
||
63  | 
def validate_revision_id(rid):  | 
|
64  | 
"""Check rid is syntactically valid for a revision id."""  | 
|
65  | 
global REVISION_ID_RE  | 
|
66  | 
if not REVISION_ID_RE:  | 
|
67  | 
import re  | 
|
| 
1092.2.10
by Robert Collins
 loosen up the revision_id validation to allow imported revs  | 
68  | 
REVISION_ID_RE = re.compile('[\w:.-]+@[\w%.-]+--?[\w]+--?[0-9a-f]+\Z')  | 
| 
810
by Martin Pool
 - New validate_revision_id function  | 
69  | 
|
70  | 
if not REVISION_ID_RE.match(rid):  | 
|
71  | 
raise ValueError("malformed revision-id %r" % rid)  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
72  | 
|
| 
1268
by Martin Pool
 - is_ancestor now works by looking at the Branch's stored ancestry  | 
73  | 
|
74  | 
def is_ancestor(revision_id, candidate_id, branch):  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
75  | 
"""Return true if candidate_id is an ancestor of revision_id.  | 
| 
1268
by Martin Pool
 - is_ancestor now works by looking at the Branch's stored ancestry  | 
76  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
77  | 
    A false negative will be returned if any intermediate descendent of
 | 
78  | 
    candidate_id is not present in any of the revision_sources.
 | 
|
| 
810
by Martin Pool
 - New validate_revision_id function  | 
79  | 
    
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
80  | 
    revisions_source is an object supporting a get_revision operation that
 | 
81  | 
    behaves like Branch's.
 | 
|
82  | 
    """
 | 
|
| 
1268
by Martin Pool
 - is_ancestor now works by looking at the Branch's stored ancestry  | 
83  | 
return candidate_id in branch.get_ancestry(revision_id)  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
84  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
85  | 
|
86  | 
def iter_ancestors(revision_id, revision_source, only_present=False):  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
87  | 
ancestors = (revision_id,)  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
88  | 
distance = 0  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
89  | 
while len(ancestors) > 0:  | 
90  | 
new_ancestors = []  | 
|
91  | 
for ancestor in ancestors:  | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
92  | 
if not only_present:  | 
93  | 
yield ancestor, distance  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
94  | 
try:  | 
95  | 
revision = revision_source.get_revision(ancestor)  | 
|
96  | 
except bzrlib.errors.NoSuchRevision, e:  | 
|
97  | 
if e.revision == revision_id:  | 
|
98  | 
                    raise 
 | 
|
99  | 
else:  | 
|
100  | 
                    continue
 | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
101  | 
if only_present:  | 
102  | 
yield ancestor, distance  | 
|
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
103  | 
new_ancestors.extend(revision.parent_ids)  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
104  | 
ancestors = new_ancestors  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
105  | 
distance += 1  | 
106  | 
||
107  | 
||
108  | 
def find_present_ancestors(revision_id, revision_source):  | 
|
| 
1133
by Martin Pool
 doc  | 
109  | 
"""Return the ancestors of a revision present in a branch.  | 
110  | 
||
111  | 
    It's possible that a branch won't have the complete ancestry of
 | 
|
112  | 
    one of its revisions.  
 | 
|
113  | 
||
114  | 
    """
 | 
|
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
115  | 
found_ancestors = {}  | 
116  | 
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,  | 
|
117  | 
only_present=True))  | 
|
118  | 
for anc_order, (anc_id, anc_distance) in anc_iter:  | 
|
119  | 
if not found_ancestors.has_key(anc_id):  | 
|
120  | 
found_ancestors[anc_id] = (anc_order, anc_distance)  | 
|
121  | 
return found_ancestors  | 
|
122  | 
||
| 
1153
by Martin Pool
 - clean up some code in revision.py  | 
123  | 
|
124  | 
def __get_closest(intersection):  | 
|
125  | 
intersection.sort()  | 
|
126  | 
matches = []  | 
|
127  | 
for entry in intersection:  | 
|
128  | 
if entry[0] == intersection[0][0]:  | 
|
129  | 
matches.append(entry[2])  | 
|
130  | 
return matches  | 
|
131  | 
||
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
132  | 
|
| 
974.1.65
by Aaron Bentley
 Cleanup and test-fixing  | 
133  | 
def old_common_ancestor(revision_a, revision_b, revision_source):  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
134  | 
"""Find the ancestor common to both revisions that is closest to both.  | 
135  | 
    """
 | 
|
136  | 
from bzrlib.trace import mutter  | 
|
137  | 
a_ancestors = find_present_ancestors(revision_a, revision_source)  | 
|
138  | 
b_ancestors = find_present_ancestors(revision_b, revision_source)  | 
|
139  | 
a_intersection = []  | 
|
140  | 
b_intersection = []  | 
|
141  | 
    # a_order is used as a tie-breaker when two equally-good bases are found
 | 
|
142  | 
for revision, (a_order, a_distance) in a_ancestors.iteritems():  | 
|
143  | 
if b_ancestors.has_key(revision):  | 
|
144  | 
a_intersection.append((a_distance, a_order, revision))  | 
|
145  | 
b_intersection.append((b_ancestors[revision][1], a_order, revision))  | 
|
146  | 
mutter("a intersection: %r" % a_intersection)  | 
|
147  | 
mutter("b intersection: %r" % b_intersection)  | 
|
148  | 
||
| 
1153
by Martin Pool
 - clean up some code in revision.py  | 
149  | 
a_closest = __get_closest(a_intersection)  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
150  | 
if len(a_closest) == 0:  | 
151  | 
return None  | 
|
| 
1153
by Martin Pool
 - clean up some code in revision.py  | 
152  | 
b_closest = __get_closest(b_intersection)  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
153  | 
assert len(b_closest) != 0  | 
154  | 
mutter ("a_closest %r" % a_closest)  | 
|
155  | 
mutter ("b_closest %r" % b_closest)  | 
|
156  | 
if a_closest[0] in b_closest:  | 
|
157  | 
return a_closest[0]  | 
|
158  | 
elif b_closest[0] in a_closest:  | 
|
159  | 
return b_closest[0]  | 
|
160  | 
else:  | 
|
| 
1154
by Martin Pool
 - fix imports for moved errors  | 
161  | 
raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))  | 
| 
974.1.35
by aaron.bentley at utoronto
 Added revision-based common-ancestor checking  | 
162  | 
return a_closest[0]  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
163  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
164  | 
def revision_graph(revision, revision_source):  | 
| 
974.1.66
by Aaron Bentley
 more cleanups, docs, sorting stuff  | 
165  | 
"""Produce a graph of the ancestry of the specified revision.  | 
166  | 
    Return root, ancestors map, descendants map
 | 
|
167  | 
||
168  | 
    TODO: Produce graphs with the NULL revision as root, so that we can find
 | 
|
169  | 
    a common even when trees are not branches don't represent a single line
 | 
|
170  | 
    of descent.
 | 
|
171  | 
    """
 | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
172  | 
ancestors = {}  | 
173  | 
descendants = {}  | 
|
174  | 
lines = [revision]  | 
|
175  | 
root = None  | 
|
| 
974.1.61
by abentley
 fixes for common ancestor picker  | 
176  | 
descendants[revision] = {}  | 
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
177  | 
while len(lines) > 0:  | 
178  | 
new_lines = set()  | 
|
179  | 
for line in lines:  | 
|
| 
974.1.89
by Aaron Bentley
 Fixed merging with multiple roots, by using null as graph root.  | 
180  | 
if line == NULL_REVISION:  | 
181  | 
parents = []  | 
|
182  | 
root = NULL_REVISION  | 
|
183  | 
else:  | 
|
184  | 
try:  | 
|
185  | 
rev = revision_source.get_revision(line)  | 
|
| 
1390
by Robert Collins
 pair programming worx... merge integration and weave  | 
186  | 
parents = list(rev.parent_ids)  | 
| 
974.1.89
by Aaron Bentley
 Fixed merging with multiple roots, by using null as graph root.  | 
187  | 
if len(parents) == 0:  | 
188  | 
parents = [NULL_REVISION]  | 
|
189  | 
except bzrlib.errors.NoSuchRevision:  | 
|
190  | 
if line == revision:  | 
|
191  | 
                        raise
 | 
|
192  | 
parents = None  | 
|
| 
974.1.64
by Aaron Bentley
 Handled ancestors that are missing when finding a base  | 
193  | 
if parents is not None:  | 
194  | 
for parent in parents:  | 
|
195  | 
if parent not in ancestors:  | 
|
196  | 
new_lines.add(parent)  | 
|
197  | 
if parent not in descendants:  | 
|
198  | 
descendants[parent] = {}  | 
|
199  | 
descendants[parent][line] = 1  | 
|
200  | 
if parents is not None:  | 
|
201  | 
ancestors[line] = set(parents)  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
202  | 
lines = new_lines  | 
| 
974.1.63
by Aaron Bentley
 Fixed graph-generation  | 
203  | 
assert root not in descendants[root]  | 
204  | 
assert root not in ancestors[root]  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
205  | 
return root, ancestors, descendants  | 
206  | 
||
| 
1092.3.4
by Robert Collins
 update symlink branch to integration  | 
207  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
208  | 
def combined_graph(revision_a, revision_b, revision_source):  | 
| 
974.1.66
by Aaron Bentley
 more cleanups, docs, sorting stuff  | 
209  | 
"""Produce a combined ancestry graph.  | 
210  | 
    Return graph root, ancestors map, descendants map, set of common nodes"""
 | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
211  | 
root, ancestors, descendants = revision_graph(revision_a, revision_source)  | 
212  | 
root_b, ancestors_b, descendants_b = revision_graph(revision_b,  | 
|
213  | 
revision_source)  | 
|
| 
974.1.80
by Aaron Bentley
 Improved merge error handling and testing  | 
214  | 
if root != root_b:  | 
215  | 
raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
216  | 
common = set()  | 
217  | 
for node, node_anc in ancestors_b.iteritems():  | 
|
218  | 
if node in ancestors:  | 
|
219  | 
common.add(node)  | 
|
220  | 
else:  | 
|
221  | 
ancestors[node] = set()  | 
|
222  | 
ancestors[node].update(node_anc)  | 
|
223  | 
for node, node_dec in descendants_b.iteritems():  | 
|
224  | 
if node not in descendants:  | 
|
| 
1185.8.1
by Aaron Bentley
 Ensured combined_graph is order-insensitive  | 
225  | 
descendants[node] = {}  | 
| 
974.1.63
by Aaron Bentley
 Fixed graph-generation  | 
226  | 
descendants[node].update(node_dec)  | 
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
227  | 
return root, ancestors, descendants, common  | 
228  | 
||
| 
1092.3.4
by Robert Collins
 update symlink branch to integration  | 
229  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
230  | 
def common_ancestor(revision_a, revision_b, revision_source):  | 
| 
974.1.80
by Aaron Bentley
 Improved merge error handling and testing  | 
231  | 
try:  | 
232  | 
root, ancestors, descendants, common = \  | 
|
233  | 
combined_graph(revision_a, revision_b, revision_source)  | 
|
234  | 
except bzrlib.errors.NoCommonRoot:  | 
|
235  | 
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)  | 
|
236  | 
||
| 
974.1.87
by Aaron Bentley
 Refactored and documented graph stuff  | 
237  | 
distances = node_distances (descendants, ancestors, root)  | 
238  | 
farthest = select_farthest(distances, common)  | 
|
| 
974.1.89
by Aaron Bentley
 Fixed merging with multiple roots, by using null as graph root.  | 
239  | 
if farthest is None or farthest == NULL_REVISION:  | 
| 
974.1.87
by Aaron Bentley
 Refactored and documented graph stuff  | 
240  | 
raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)  | 
241  | 
return farthest  | 
|
| 
974.1.60
by aaron.bentley at utoronto
 Initial import of common-ancestor detection  | 
242  | 
|
243  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
244  | 
class MultipleRevisionSources(object):  | 
| 
1153
by Martin Pool
 - clean up some code in revision.py  | 
245  | 
"""Proxy that looks in multiple branches for revisions."""  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
246  | 
def __init__(self, *args):  | 
247  | 
object.__init__(self)  | 
|
248  | 
assert len(args) != 0  | 
|
249  | 
self._revision_sources = args  | 
|
250  | 
||
251  | 
def get_revision(self, revision_id):  | 
|
252  | 
for source in self._revision_sources:  | 
|
253  | 
try:  | 
|
254  | 
return source.get_revision(revision_id)  | 
|
255  | 
except bzrlib.errors.NoSuchRevision, e:  | 
|
256  | 
                pass
 | 
|
257  | 
raise e  | 
|
| 
974.2.7
by aaron.bentley at utoronto
 Merged from bzr.24  | 
258  | 
|
259  | 
def get_intervening_revisions(ancestor_id, rev_id, rev_source,  | 
|
260  | 
revision_history=None):  | 
|
261  | 
"""Find the longest line of descent from maybe_ancestor to revision.  | 
|
262  | 
    Revision history is followed where possible.
 | 
|
263  | 
||
264  | 
    If ancestor_id == rev_id, list will be empty.
 | 
|
265  | 
    Otherwise, rev_id will be the last entry.  ancestor_id will never appear.
 | 
|
266  | 
    If ancestor_id is not an ancestor, NotAncestor will be thrown
 | 
|
267  | 
    """
 | 
|
| 
974.1.73
by Aaron Bentley
 Reimplemented get_intervening_revisions for better scalability  | 
268  | 
root, ancestors, descendants = revision_graph(rev_id, rev_source)  | 
269  | 
if len(descendants) == 0:  | 
|
270  | 
raise NoSuchRevision(rev_source, rev_id)  | 
|
271  | 
if ancestor_id not in descendants:  | 
|
272  | 
rev_source.get_revision(ancestor_id)  | 
|
273  | 
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)  | 
|
274  | 
root_descendants = all_descendants(descendants, ancestor_id)  | 
|
275  | 
root_descendants.add(ancestor_id)  | 
|
276  | 
if rev_id not in root_descendants:  | 
|
277  | 
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)  | 
|
278  | 
distances = node_distances(descendants, ancestors, ancestor_id,  | 
|
279  | 
root_descendants=root_descendants)  | 
|
280  | 
||
281  | 
def best_ancestor(rev_id):  | 
|
282  | 
best = None  | 
|
283  | 
for anc_id in ancestors[rev_id]:  | 
|
284  | 
try:  | 
|
285  | 
distance = distances[anc_id]  | 
|
286  | 
except KeyError:  | 
|
287  | 
                continue
 | 
|
288  | 
if revision_history is not None and anc_id in revision_history:  | 
|
289  | 
return anc_id  | 
|
290  | 
elif best is None or distance > best[1]:  | 
|
291  | 
best = (anc_id, distance)  | 
|
292  | 
return best[0]  | 
|
293  | 
||
294  | 
next = rev_id  | 
|
295  | 
path = []  | 
|
296  | 
while next != ancestor_id:  | 
|
297  | 
path.append(next)  | 
|
298  | 
next = best_ancestor(next)  | 
|
299  | 
path.reverse()  | 
|
300  | 
return path  |