/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
1185.16.40 by Martin Pool
todo
17
# TODO: Some kind of command-line display of revision properties: 
18
# perhaps show them in log -v and allow them as options to the commit command.
1 by mbp at sourcefrog
import from baz patch-364
19
1590.1.1 by Robert Collins
Improve common_ancestor performance.
20
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
21
import bzrlib.errors
1590.1.1 by Robert Collins
Improve common_ancestor performance.
22
import bzrlib.errors as errors
1594.2.15 by Robert Collins
Unfuck performance.
23
from bzrlib.graph import node_distances, select_farthest, all_descendants, Graph
1185.16.39 by Martin Pool
- constraints on revprops
24
from bzrlib.osutils import contains_whitespace
1534.9.1 by Aaron Bentley
Added progress bars to merge
25
from bzrlib.progress import DummyProgress
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
26
from bzrlib.symbol_versioning import *
8 by mbp at sourcefrog
store committer's timezone in revision and show
27
974.1.90 by Aaron Bentley
Switched NULL revision ID to 'null:' per robertc's suggestion
28
NULL_REVISION="null:"
974.1.89 by Aaron Bentley
Fixed merging with multiple roots, by using null as graph root.
29
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
30
class Revision(object):
1 by mbp at sourcefrog
import from baz patch-364
31
    """Single revision on a branch.
32
33
    Revisions may know their revision_hash, but only once they've been
34
    written out.  This is not stored because you cannot write the hash
35
    into the file it describes.
36
697 by Martin Pool
- write out parent list for new revisions
37
    After bzr 0.0.5 revisions are allowed to have multiple parents.
696 by Martin Pool
- Refactor revision deserialization code
38
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
39
    parent_ids
40
        List of parent revision_ids
1185.16.39 by Martin Pool
- constraints on revprops
41
42
    properties
43
        Dictionary of revision properties.  These are attached to the
44
        revision as extra metadata.  The name must be a single 
45
        word; the value can be an arbitrary string.
1 by mbp at sourcefrog
import from baz patch-364
46
    """
696 by Martin Pool
- Refactor revision deserialization code
47
    
1185.16.35 by Martin Pool
- stub for revision properties
48
    def __init__(self, revision_id, properties=None, **args):
1092.2.25 by Robert Collins
support ghosts in commits
49
        self.revision_id = revision_id
1185.16.35 by Martin Pool
- stub for revision properties
50
        self.properties = properties or {}
1185.16.39 by Martin Pool
- constraints on revprops
51
        self._check_properties()
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
52
        self.parent_ids = []
1311 by Martin Pool
- remove RevisionReference; just hold parent ids directly
53
        self.parent_sha1s = []
1185.42.6 by Jelmer Vernooij
Don't clear Revision.parent_ids after it has been set from the arguments
54
        self.__dict__.update(args)
696 by Martin Pool
- Refactor revision deserialization code
55
1 by mbp at sourcefrog
import from baz patch-364
56
    def __repr__(self):
184 by mbp at sourcefrog
pychecker fixups
57
        return "<Revision id %s>" % self.revision_id
1 by mbp at sourcefrog
import from baz patch-364
58
1185 by Martin Pool
- add xml round-trip test for revisions
59
    def __eq__(self, other):
60
        if not isinstance(other, Revision):
61
            return False
1092.2.20 by Robert Collins
symlink and weaves, whaddya know
62
        # FIXME: rbc 20050930 parent_ids are not being compared
63
        return (
64
                self.inventory_sha1 == other.inventory_sha1
1185 by Martin Pool
- add xml round-trip test for revisions
65
                and self.revision_id == other.revision_id
66
                and self.timestamp == other.timestamp
67
                and self.message == other.message
68
                and self.timezone == other.timezone
1185.16.35 by Martin Pool
- stub for revision properties
69
                and self.committer == other.committer
70
                and self.properties == other.properties)
1185 by Martin Pool
- add xml round-trip test for revisions
71
72
    def __ne__(self, other):
73
        return not self.__eq__(other)
74
1185.16.39 by Martin Pool
- constraints on revprops
75
    def _check_properties(self):
76
        """Verify that all revision properties are OK.
77
        """
78
        for name, value in self.properties.iteritems():
79
            if not isinstance(name, basestring) or contains_whitespace(name):
80
                raise ValueError("invalid property name %r" % name)
81
            if not isinstance(value, basestring):
82
                raise ValueError("invalid property value %r for %r" % 
83
                                 (name, value))
84
1534.4.49 by Robert Collins
Provide a revision.get_history(repository) method for generating a synthetic revision history.
85
    def get_history(self, repository):
86
        """Return the canonical line-of-history for this revision.
87
88
        If ghosts are present this may differ in result from a ghost-free
89
        repository.
90
        """
91
        current_revision = self
92
        reversed_result = []
93
        while current_revision is not None:
94
            reversed_result.append(current_revision.revision_id)
95
            if not len (current_revision.parent_ids):
96
                reversed_result.append(None)
97
                current_revision = None
98
            else:
99
                next_revision_id = current_revision.parent_ids[0]
100
                current_revision = repository.get_revision(next_revision_id)
101
        reversed_result.reverse()
102
        return reversed_result
103
1740.2.5 by Aaron Bentley
Merge from bzr.dev
104
    def get_summary(self):
105
        """Get the first line of the log message for this revision.
106
        """
107
        return self.message.split('\n', 1)[0]
108
1268 by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry
109
110
def is_ancestor(revision_id, candidate_id, branch):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
111
    """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
112
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
113
    A false negative will be returned if any intermediate descendent of
114
    candidate_id is not present in any of the revision_sources.
810 by Martin Pool
- New validate_revision_id function
115
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
116
    revisions_source is an object supporting a get_revision operation that
117
    behaves like Branch's.
118
    """
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
119
    return candidate_id in branch.repository.get_ancestry(revision_id)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
120
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
121
122
def iter_ancestors(revision_id, revision_source, only_present=False):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
123
    ancestors = (revision_id,)
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
124
    distance = 0
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
125
    while len(ancestors) > 0:
126
        new_ancestors = []
127
        for ancestor in ancestors:
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
128
            if not only_present:
129
                yield ancestor, distance
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
130
            try:
131
                revision = revision_source.get_revision(ancestor)
132
            except bzrlib.errors.NoSuchRevision, e:
133
                if e.revision == revision_id:
134
                    raise 
135
                else:
136
                    continue
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
137
            if only_present:
138
                yield ancestor, distance
1313 by Martin Pool
- rename to Revision.parent_ids to avoid confusion with old usage
139
            new_ancestors.extend(revision.parent_ids)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
140
        ancestors = new_ancestors
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
141
        distance += 1
142
143
144
def find_present_ancestors(revision_id, revision_source):
1133 by Martin Pool
doc
145
    """Return the ancestors of a revision present in a branch.
146
147
    It's possible that a branch won't have the complete ancestry of
148
    one of its revisions.  
149
150
    """
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
151
    found_ancestors = {}
152
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
153
                         only_present=True))
154
    for anc_order, (anc_id, anc_distance) in anc_iter:
155
        if not found_ancestors.has_key(anc_id):
156
            found_ancestors[anc_id] = (anc_order, anc_distance)
157
    return found_ancestors
158
    
1153 by Martin Pool
- clean up some code in revision.py
159
160
def __get_closest(intersection):
161
    intersection.sort()
162
    matches = [] 
163
    for entry in intersection:
164
        if entry[0] == intersection[0][0]:
165
            matches.append(entry[2])
166
    return matches
167
974.1.35 by aaron.bentley at utoronto
Added revision-based common-ancestor checking
168
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
169
def revision_graph(revision, revision_source):
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
170
    """Produce a graph of the ancestry of the specified revision.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
171
    
172
    :return: root, ancestors map, descendants map
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
173
    """
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
174
    revision_source.lock_read()
175
    try:
176
        return _revision_graph(revision, revision_source)
177
    finally:
178
        revision_source.unlock()
179
1590.1.1 by Robert Collins
Improve common_ancestor performance.
180
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
181
def _revision_graph(revision, revision_source):
182
    """See revision_graph."""
1590.1.1 by Robert Collins
Improve common_ancestor performance.
183
    from bzrlib.tsort import topo_sort
184
    graph = revision_source.get_revision_graph(revision)
185
    # mark all no-parent revisions as being NULL_REVISION parentage.
186
    for node, parents in graph.items():
187
        if len(parents) == 0:
188
            graph[node] = [NULL_REVISION]
189
    # add NULL_REVISION to the graph
190
    graph[NULL_REVISION] = []
191
192
    # pick a root. If there are multiple roots
193
    # this could pick a random one.
194
    topo_order = topo_sort(graph.items())
195
    root = topo_order[0]
196
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
197
    ancestors = {}
198
    descendants = {}
1590.1.1 by Robert Collins
Improve common_ancestor performance.
199
200
    # map the descendants of the graph.
201
    # and setup our set based return graph.
202
    for node in graph.keys():
203
        descendants[node] = {}
204
    for node, parents in graph.items():
205
        for parent in parents:
206
            descendants[parent][node] = 1
207
        ancestors[node] = set(parents)
208
974.1.63 by Aaron Bentley
Fixed graph-generation
209
    assert root not in descendants[root]
210
    assert root not in ancestors[root]
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
211
    return root, ancestors, descendants
212
1092.3.4 by Robert Collins
update symlink branch to integration
213
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
214
def combined_graph(revision_a, revision_b, revision_source):
974.1.66 by Aaron Bentley
more cleanups, docs, sorting stuff
215
    """Produce a combined ancestry graph.
216
    Return graph root, ancestors map, descendants map, set of common nodes"""
1590.1.1 by Robert Collins
Improve common_ancestor performance.
217
    root, ancestors, descendants = revision_graph(
218
        revision_a, revision_source)
219
    root_b, ancestors_b, descendants_b = revision_graph(
220
        revision_b, revision_source)
974.1.80 by Aaron Bentley
Improved merge error handling and testing
221
    if root != root_b:
222
        raise bzrlib.errors.NoCommonRoot(revision_a, revision_b)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
223
    common = set()
224
    for node, node_anc in ancestors_b.iteritems():
225
        if node in ancestors:
226
            common.add(node)
227
        else:
228
            ancestors[node] = set()
229
        ancestors[node].update(node_anc)
230
    for node, node_dec in descendants_b.iteritems():
231
        if node not in descendants:
1185.8.1 by Aaron Bentley
Ensured combined_graph is order-insensitive
232
            descendants[node] = {}
974.1.63 by Aaron Bentley
Fixed graph-generation
233
        descendants[node].update(node_dec)
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
234
    return root, ancestors, descendants, common
235
1092.3.4 by Robert Collins
update symlink branch to integration
236
1534.9.1 by Aaron Bentley
Added progress bars to merge
237
def common_ancestor(revision_a, revision_b, revision_source, 
238
                    pb=DummyProgress()):
1587.1.11 by Robert Collins
Local commits appear to be working properly.
239
    if None in (revision_a, revision_b):
240
        return None
1594.2.15 by Robert Collins
Unfuck performance.
241
    # trivial optimisation
242
    if revision_a == revision_b:
243
        return revision_a
974.1.80 by Aaron Bentley
Improved merge error handling and testing
244
    try:
1534.9.1 by Aaron Bentley
Added progress bars to merge
245
        try:
246
            pb.update('Picking ancestor', 1, 3)
1594.2.15 by Robert Collins
Unfuck performance.
247
            graph = revision_source.get_revision_graph_with_ghosts(
248
                [revision_a, revision_b])
249
            # convert to a NULL_REVISION based graph.
250
            ancestors = graph.get_ancestors()
251
            descendants = graph.get_descendants()
252
            common = set(graph.get_ancestry(revision_a)).intersection(
253
                     set(graph.get_ancestry(revision_b)))
254
            descendants[NULL_REVISION] = {}
255
            ancestors[NULL_REVISION] = []
256
            for root in graph.roots:
257
                descendants[NULL_REVISION][root] = 1
258
                ancestors[root].append(NULL_REVISION)
1607.1.12 by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are
259
            for ghost in graph.ghosts:
260
                # ghosts act as roots for the purpose of finding 
261
                # the longest paths from the root: any ghost *might*
262
                # be directly attached to the root, so we treat them
263
                # as being such.
264
                # ghost now descends from NULL
265
                descendants[NULL_REVISION][ghost] = 1
266
                # that is it has an ancestor of NULL
267
                ancestors[ghost] = [NULL_REVISION]
268
                # ghost is common if any of ghosts descendants are common:
269
                for ghost_descendant in descendants[ghost]:
270
                    if ghost_descendant in common:
271
                        common.add(ghost)
272
                
1594.2.15 by Robert Collins
Unfuck performance.
273
            root = NULL_REVISION
274
            common.add(NULL_REVISION)
1534.9.1 by Aaron Bentley
Added progress bars to merge
275
        except bzrlib.errors.NoCommonRoot:
276
            raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
277
            
278
        pb.update('Picking ancestor', 2, 3)
279
        distances = node_distances (descendants, ancestors, root)
280
        pb.update('Picking ancestor', 3, 2)
281
        farthest = select_farthest(distances, common)
282
        if farthest is None or farthest == NULL_REVISION:
283
            raise bzrlib.errors.NoCommonAncestor(revision_a, revision_b)
284
    finally:
285
        pb.clear()
974.1.87 by Aaron Bentley
Refactored and documented graph stuff
286
    return farthest
974.1.60 by aaron.bentley at utoronto
Initial import of common-ancestor detection
287
288
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
289
class MultipleRevisionSources(object):
1153 by Martin Pool
- clean up some code in revision.py
290
    """Proxy that looks in multiple branches for revisions."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
291
    def __init__(self, *args):
292
        object.__init__(self)
293
        assert len(args) != 0
294
        self._revision_sources = args
295
1590.1.1 by Robert Collins
Improve common_ancestor performance.
296
    def revision_parents(self, revision_id):
297
        for source in self._revision_sources:
298
            try:
299
                return source.revision_parents(revision_id)
300
            except (errors.WeaveRevisionNotPresent, errors.NoSuchRevision), e:
301
                pass
302
        raise e
303
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
304
    def get_revision(self, revision_id):
305
        for source in self._revision_sources:
306
            try:
307
                return source.get_revision(revision_id)
308
            except bzrlib.errors.NoSuchRevision, e:
309
                pass
310
        raise e
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
311
1590.1.1 by Robert Collins
Improve common_ancestor performance.
312
    def get_revision_graph(self, revision_id):
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
313
        # we could probe incrementally until the pending
314
        # ghosts list stop growing, but its cheaper for now
315
        # to just ask for the complete graph for each repository.
316
        graphs = []
317
        for source in self._revision_sources:
318
            ghost_graph = source.get_revision_graph_with_ghosts()
319
            graphs.append(ghost_graph)
320
        absent = 0
321
        for graph in graphs:
322
            if not revision_id in graph.get_ancestors():
323
                absent += 1
324
        if absent == len(graphs):
325
            raise errors.NoSuchRevision(self._revision_sources[0], revision_id)
326
327
        # combine the graphs
1590.1.1 by Robert Collins
Improve common_ancestor performance.
328
        result = {}
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
329
        pending = set([revision_id])
330
        def find_parents(node_id):
331
            """find the parents for node_id."""
332
            for graph in graphs:
333
                ancestors = graph.get_ancestors()
334
                try:
335
                    return ancestors[node_id]
336
                except KeyError:
337
                    pass
338
            raise errors.NoSuchRevision(self._revision_sources[0], node_id)
339
        while len(pending):
340
            # all the graphs should have identical parent lists
341
            node_id = pending.pop()
1590.1.1 by Robert Collins
Improve common_ancestor performance.
342
            try:
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
343
                result[node_id] = find_parents(node_id)
344
                for parent_node in result[node_id]:
345
                    if not parent_node in result:
346
                        pending.add(parent_node)
347
            except errors.NoSuchRevision:
348
                # ghost, ignore it.
1590.1.1 by Robert Collins
Improve common_ancestor performance.
349
                pass
1594.2.3 by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits.
350
        return result
1590.1.1 by Robert Collins
Improve common_ancestor performance.
351
1594.2.15 by Robert Collins
Unfuck performance.
352
    def get_revision_graph_with_ghosts(self, revision_ids):
353
        # query all the sources for their entire graphs 
354
        # and then build a combined graph for just
355
        # revision_ids.
356
        graphs = []
357
        for source in self._revision_sources:
358
            ghost_graph = source.get_revision_graph_with_ghosts()
359
            graphs.append(ghost_graph.get_ancestors())
360
        for revision_id in revision_ids:
361
            absent = 0
362
            for graph in graphs:
363
                    if not revision_id in graph:
364
                        absent += 1
365
            if absent == len(graphs):
366
                raise errors.NoSuchRevision(self._revision_sources[0],
367
                                            revision_id)
368
369
        # combine the graphs
370
        result = Graph()
371
        pending = set(revision_ids)
372
        done = set()
373
        def find_parents(node_id):
374
            """find the parents for node_id."""
375
            for graph in graphs:
376
                try:
377
                    return graph[node_id]
378
                except KeyError:
379
                    pass
380
            raise errors.NoSuchRevision(self._revision_sources[0], node_id)
381
        while len(pending):
382
            # all the graphs should have identical parent lists
383
            node_id = pending.pop()
384
            try:
385
                parents = find_parents(node_id)
386
                for parent_node in parents:
387
                    # queued or done? 
388
                    if (parent_node not in pending and
389
                        parent_node not in done):
390
                        # no, queue
391
                        pending.add(parent_node)
392
                result.add_node(node_id, parents)
393
                done.add(node_id)
394
            except errors.NoSuchRevision:
395
                # ghost
396
                result.add_ghost(node_id)
397
                continue
398
        return result
399
1587.1.4 by Robert Collins
Quick, urgent fix for common_ancestor performance.
400
    def lock_read(self):
401
        for source in self._revision_sources:
402
            source.lock_read()
403
404
    def unlock(self):
405
        for source in self._revision_sources:
406
            source.unlock()
407
1590.1.1 by Robert Collins
Improve common_ancestor performance.
408
1685.1.65 by Martin Pool
[broken] Use deprecated_function not deprecated_method
409
@deprecated_function(zero_eight)
410
def get_intervening_revisions(ancestor_id, rev_id, rev_source,
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
411
                              revision_history=None):
412
    """Find the longest line of descent from maybe_ancestor to revision.
413
    Revision history is followed where possible.
414
415
    If ancestor_id == rev_id, list will be empty.
416
    Otherwise, rev_id will be the last entry.  ancestor_id will never appear.
417
    If ancestor_id is not an ancestor, NotAncestor will be thrown
418
    """
974.1.73 by Aaron Bentley
Reimplemented get_intervening_revisions for better scalability
419
    root, ancestors, descendants = revision_graph(rev_id, rev_source)
420
    if len(descendants) == 0:
421
        raise NoSuchRevision(rev_source, rev_id)
422
    if ancestor_id not in descendants:
423
        rev_source.get_revision(ancestor_id)
424
        raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
425
    root_descendants = all_descendants(descendants, ancestor_id)
426
    root_descendants.add(ancestor_id)
427
    if rev_id not in root_descendants:
428
        raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
429
    distances = node_distances(descendants, ancestors, ancestor_id,
430
                               root_descendants=root_descendants)
431
432
    def best_ancestor(rev_id):
433
        best = None
434
        for anc_id in ancestors[rev_id]:
435
            try:
436
                distance = distances[anc_id]
437
            except KeyError:
438
                continue
439
            if revision_history is not None and anc_id in revision_history:
440
                return anc_id
441
            elif best is None or distance > best[1]:
442
                best = (anc_id, distance)
443
        return best[0]
444
445
    next = rev_id
446
    path = []
447
    while next != ancestor_id:
448
        path.append(next)
449
        next = best_ancestor(next)
450
    path.reverse()
451
    return path