/brz/remove-bazaar

To get this branch, use:
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
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
60
61
def is_ancestor(revision_id, candidate_id, branch):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
62
    """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
63
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
64
    A false negative will be returned if any intermediate descendent of
65
    candidate_id is not present in any of the revision_sources.
810 by Martin Pool
- New validate_revision_id function
66
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
67
    revisions_source is an object supporting a get_revision operation that
68
    behaves like Branch's.
69
    """
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
70
    return candidate_id in branch.get_ancestry(revision_id)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
71
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
72
73
def iter_ancestors(revision_id, revision_source, only_present=False):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
74
    ancestors = (revision_id,)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
75
    distance = 0
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
76
    while len(ancestors) > 0:
77
        new_ancestors = []
78
        for ancestor in ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
79
            if not only_present:
80
                yield ancestor, distance
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
81
            try:
82
                revision = revision_source.get_revision(ancestor)
83
            except bzrlib.errors.NoSuchRevision, e:
84
                if e.revision == revision_id:
85
                    raise 
86
                else:
87
                    continue
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
88
            if only_present:
89
                yield ancestor, distance
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
90
            new_ancestors.extend(revision.parent_ids)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
91
        ancestors = new_ancestors
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
92
        distance += 1
93
94
95
def find_present_ancestors(revision_id, revision_source):
1133 by Martin Pool
doc
96
    """Return the ancestors of a revision present in a branch.
97
98
    It's possible that a branch won't have the complete ancestry of
99
    one of its revisions.  
100
101
    """
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
102
    found_ancestors = {}
103
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
104
                         only_present=True))
105
    for anc_order, (anc_id, anc_distance) in anc_iter:
106
        if not found_ancestors.has_key(anc_id):
107
            found_ancestors[anc_id] = (anc_order, anc_distance)
108
    return found_ancestors
109
    
1153 by Martin Pool
- clean up some code in revision.py
110
111
def __get_closest(intersection):
112
    intersection.sort()
113
    matches = [] 
114
    for entry in intersection:
115
        if entry[0] == intersection[0][0]:
116
            matches.append(entry[2])
117
    return matches
118
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
119
974.1.65 by Aaron Bentley
Cleanup and test-fixing
120
def old_common_ancestor(revision_a, revision_b, revision_source):
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
121
    """Find the ancestor common to both revisions that is closest to both.
122
    """
123
    from bzrlib.trace import mutter
124
    a_ancestors = find_present_ancestors(revision_a, revision_source)
125
    b_ancestors = find_present_ancestors(revision_b, revision_source)
126
    a_intersection = []
127
    b_intersection = []
128
    # a_order is used as a tie-breaker when two equally-good bases are found
129
    for revision, (a_order, a_distance) in a_ancestors.iteritems():
130
        if b_ancestors.has_key(revision):
131
            a_intersection.append((a_distance, a_order, revision))
132
            b_intersection.append((b_ancestors[revision][1], a_order, revision))
133
    mutter("a intersection: %r" % a_intersection)
134
    mutter("b intersection: %r" % b_intersection)
135
1153 by Martin Pool
- clean up some code in revision.py
136
    a_closest = __get_closest(a_intersection)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
137
    if len(a_closest) == 0:
138
        return None
1153 by Martin Pool
- clean up some code in revision.py
139
    b_closest = __get_closest(b_intersection)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
140
    assert len(b_closest) != 0
141
    mutter ("a_closest %r" % a_closest)
142
    mutter ("b_closest %r" % b_closest)
143
    if a_closest[0] in b_closest:
144
        return a_closest[0]
145
    elif b_closest[0] in a_closest:
146
        return b_closest[0]
147
    else:
1154 by Martin Pool
- fix imports for moved errors
148
        raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
149
    return a_closest[0]
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
150
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
151
def revision_graph(revision, revision_source):
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
152
    """Produce a graph of the ancestry of the specified revision.
153
    Return root, ancestors map, descendants map
154
155
    TODO: Produce graphs with the NULL revision as root, so that we can find
156
    a common even when trees are not branches don't represent a single line
157
    of descent.
158
    """
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
159
    ancestors = {}
160
    descendants = {}
161
    lines = [revision]
162
    root = None
974.1.61 by abentley
fixes for common ancestor picker
163
    descendants[revision] = {}
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
164
    while len(lines) > 0:
165
        new_lines = set()
166
        for line in lines:
974.1.89 by Aaron Bentley
Fixed merging with multiple roots, by using null as graph root.
167
            if line == NULL_REVISION:
168
                parents = []
169
                root = NULL_REVISION
170
            else:
171
                try:
172
                    rev = revision_source.get_revision(line)
1390 by Robert Collins
pair programming worx... merge integration and weave
173
                    parents = list(rev.parent_ids)
974.1.89 by Aaron Bentley
Fixed merging with multiple roots, by using null as graph root.
174
                    if len(parents) == 0:
175
                        parents = [NULL_REVISION]
176
                except bzrlib.errors.NoSuchRevision:
177
                    if line == revision:
178
                        raise
179
                    parents = None
974.1.64 by Aaron Bentley
Handled ancestors that are missing when finding a base
180
            if parents is not None:
181
                for parent in parents:
182
                    if parent not in ancestors:
183
                        new_lines.add(parent)
184
                    if parent not in descendants:
185
                        descendants[parent] = {}
186
                    descendants[parent][line] = 1
187
            if parents is not None:
188
                ancestors[line] = set(parents)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
189
        lines = new_lines
974.1.63 by Aaron Bentley
Fixed graph-generation
190
    assert root not in descendants[root]
191
    assert root not in ancestors[root]
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
192
    return root, ancestors, descendants
193
1092.3.4 by Robert Collins
update symlink branch to integration
194
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
195
def combined_graph(revision_a, revision_b, revision_source):
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
196
    """Produce a combined ancestry graph.
197
    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
198
    root, ancestors, descendants = revision_graph(revision_a, revision_source)
199
    root_b, ancestors_b, descendants_b = revision_graph(revision_b, 
200
                                                        revision_source)
974.1.80 by Aaron Bentley
Improved merge error handling and testing
201
    if root != root_b:
202
        raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
203
    common = set()
204
    for node, node_anc in ancestors_b.iteritems():
205
        if node in ancestors:
206
            common.add(node)
207
        else:
208
            ancestors[node] = set()
209
        ancestors[node].update(node_anc)
210
    for node, node_dec in descendants_b.iteritems():
211
        if node not in descendants:
1185.8.1 by Aaron Bentley
Ensured combined_graph is order-insensitive
212
            descendants[node] = {}
974.1.63 by Aaron Bentley
Fixed graph-generation
213
        descendants[node].update(node_dec)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
214
    return root, ancestors, descendants, common
215
1092.3.4 by Robert Collins
update symlink branch to integration
216
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
217
def common_ancestor(revision_a, revision_b, revision_source):
974.1.80 by Aaron Bentley
Improved merge error handling and testing
218
    try:
219
        root, ancestors, descendants, common = \
220
            combined_graph(revision_a, revision_b, revision_source)
221
    except bzrlib.errors.NoCommonRoot:
222
        raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
223
        
974.1.87 by Aaron Bentley
Refactored and documented graph stuff
224
    distances = node_distances (descendants, ancestors, root)
225
    farthest = select_farthest(distances, common)
974.1.89 by Aaron Bentley
Fixed merging with multiple roots, by using null as graph root.
226
    if farthest is None or farthest == NULL_REVISION:
974.1.87 by Aaron Bentley
Refactored and documented graph stuff
227
        raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
228
    return farthest
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
229
230
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
231
class MultipleRevisionSources(object):
1153 by Martin Pool
- clean up some code in revision.py
232
    """Proxy that looks in multiple branches for revisions."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
233
    def __init__(self, *args):
234
        object.__init__(self)
235
        assert len(args) != 0
236
        self._revision_sources = args
237
238
    def get_revision(self, revision_id):
239
        for source in self._revision_sources:
240
            try:
241
                return source.get_revision(revision_id)
242
            except bzrlib.errors.NoSuchRevision, e:
243
                pass
244
        raise e
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
245
246
def get_intervening_revisions(ancestor_id, rev_id, rev_source, 
247
                              revision_history=None):
248
    """Find the longest line of descent from maybe_ancestor to revision.
249
    Revision history is followed where possible.
250
251
    If ancestor_id == rev_id, list will be empty.
252
    Otherwise, rev_id will be the last entry.  ancestor_id will never appear.
253
    If ancestor_id is not an ancestor, NotAncestor will be thrown
254
    """
974.1.73 by Aaron Bentley
Reimplemented get_intervening_revisions for better scalability
255
    root, ancestors, descendants = revision_graph(rev_id, rev_source)
256
    if len(descendants) == 0:
257
        raise NoSuchRevision(rev_source, rev_id)
258
    if ancestor_id not in descendants:
259
        rev_source.get_revision(ancestor_id)
260
        raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
261
    root_descendants = all_descendants(descendants, ancestor_id)
262
    root_descendants.add(ancestor_id)
263
    if rev_id not in root_descendants:
264
        raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
265
    distances = node_distances(descendants, ancestors, ancestor_id,
266
                               root_descendants=root_descendants)
267
268
    def best_ancestor(rev_id):
269
        best = None
270
        for anc_id in ancestors[rev_id]:
271
            try:
272
                distance = distances[anc_id]
273
            except KeyError:
274
                continue
275
            if revision_history is not None and anc_id in revision_history:
276
                return anc_id
277
            elif best is None or distance > best[1]:
278
                best = (anc_id, distance)
279
        return best[0]
280
281
    next = rev_id
282
    path = []
283
    while next != ancestor_id:
284
        path.append(next)
285
        next = best_ancestor(next)
286
    path.reverse()
287
    return path