← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/wholehistory.py

  • Committer: Matt Nordhoff
  • Date: 2009-10-17 09:28:42 UTC
  • mto: This revision was merged to the branch mainline in revision 406.
  • Revision ID: mnordhoff@mattnordhoff.com-20091017092842-o9oefagbqdh7ud4t
Remove trailing whitespace in the non-Python files too

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/wholehistory.py
1
 
# Cache the whole history data needed by loggerhead about a branch.
 
1
#
 
2
# Copyright (C) 2008, 2009 Canonical Ltd.
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
14
15
# along with this program; if not, write to the Free Software
15
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
#
 
18
"""Cache the whole history data needed by loggerhead about a branch."""
17
19
 
18
20
import logging
19
21
import time
30
32
    # Filter ghosts, and null:
31
33
    if NULL_REVISION in revision_graph:
32
34
        del revision_graph[NULL_REVISION]
33
 
    for key, parents in revision_graph.items():
 
35
    for key, parents in revision_graph.iteritems():
34
36
        revision_graph[key] = tuple(parent for parent in parents if parent
35
37
            in revision_graph)
36
38
    return revision_graph
37
39
 
38
40
 
39
41
def compute_whole_history_data(branch):
 
42
    """Compute _rev_info and _rev_indices for a branch.
 
43
 
 
44
    See History.__doc__ for what these data structures mean.
 
45
    """
40
46
    z = time.time()
41
47
 
42
48
    last_revid = branch.last_revision()
43
49
 
44
50
    log = logging.getLogger('loggerhead.%s' %
45
 
                            branch.get_config().get_nickname())
 
51
                            (branch.get_config().get_nickname(),))
46
52
 
47
53
    graph = branch.repository.get_graph()
48
54
    parent_map = dict(((key, value) for key, value in
49
55
         graph.iter_ancestry([last_revid]) if value is not None))
50
56
 
51
57
    _revision_graph = _strip_NULL_ghosts(parent_map)
52
 
    _full_history = []
53
 
    _revision_info = {}
54
 
    _revno_revid = {}
 
58
 
 
59
    _rev_info = []
 
60
    _rev_indices = {}
 
61
 
55
62
    if is_null(last_revid):
56
63
        _merge_sort = []
57
64
    else:
58
65
        _merge_sort = merge_sort(
59
66
            _revision_graph, last_revid, generate_revno=True)
60
67
 
61
 
    for (seq, revid, merge_depth, revno, end_of_merge) in _merge_sort:
62
 
        _full_history.append(revid)
 
68
    for info in _merge_sort:
 
69
        seq, revid, merge_depth, revno, end_of_merge = info
63
70
        revno_str = '.'.join(str(n) for n in revno)
64
 
        _revno_revid[revno_str] = revid
65
 
        _revision_info[revid] = (
66
 
            seq, revid, merge_depth, revno_str, end_of_merge)
67
 
 
68
 
    _where_merged = {}
69
 
 
70
 
    for revid in _revision_graph.keys():
71
 
        if _revision_info[revid][2] == 0:
 
71
        parents = _revision_graph[revid]
 
72
        _rev_indices[revid] = len(_rev_info)
 
73
        _rev_info.append([(seq, revid, merge_depth, revno_str, end_of_merge), (), parents])
 
74
 
 
75
    for revid in _revision_graph.iterkeys():
 
76
        if _rev_info[_rev_indices[revid]][0][2] == 0:
72
77
            continue
73
78
        for parent in _revision_graph[revid]:
74
 
            _where_merged.setdefault(parent, set()).add(revid)
 
79
            c = _rev_info[_rev_indices[parent]]
 
80
            if revid not in c[1]:
 
81
                c[1] = c[1] + (revid,)
75
82
 
76
83
    log.info('built revision graph cache: %r secs' % (time.time() - z))
77
84
 
78
 
    return (_revision_graph, _full_history, _revision_info,
79
 
            _revno_revid, _merge_sort, _where_merged)
 
85
    return (_rev_info, _rev_indices)