/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: John Arbash Meinel
  • Date: 2006-04-25 15:05:42 UTC
  • mfrom: (1185.85.85 bzr-encoding)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060425150542-c7b518dca9928691
[merge] the old bzr-encoding changes, reparenting them on bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
18
 
 
19
 
from __future__ import absolute_import
20
 
 
21
 
from . import (
22
 
    errors,
23
 
    log,
24
 
    )
25
 
 
26
 
 
27
 
def iter_log_revisions(revisions, revision_source, verbose, rev_tag_dict=None):
28
 
    if rev_tag_dict is None:
29
 
        rev_tag_dict = {}
30
 
    for revno, rev_id, merge_depth in revisions:
 
1
"""Display what revisions are missing in 'other' from 'this' and vice verca."""
 
2
 
 
3
import bzrlib.ui as ui
 
4
 
 
5
 
 
6
def iter_log_data(revisions, revision_source, verbose):
 
7
    from bzrlib.diff import compare_trees
 
8
    from bzrlib.tree import EmptyTree
 
9
    last_tree = EmptyTree
 
10
    last_rev_id = None
 
11
    for revno, rev_id in revisions:
31
12
        rev = revision_source.get_revision(rev_id)
32
13
        if verbose:
33
 
            delta = revision_source.get_revision_delta(rev_id)
 
14
            remote_tree = revision_source.revision_tree(rev_id)
 
15
            parent_rev_id = rev.parent_ids[0]
 
16
            if last_rev_id == parent_rev_id:
 
17
                parent_tree = last_tree
 
18
            else:
 
19
                parent_tree = revision_source.revision_tree(parent_rev_id)
 
20
            revision_tree = revision_source.revision_tree(rev_id)
 
21
            last_rev_id = rev_id
 
22
            last_tree = revision_tree
 
23
            delta = compare_trees(revision_tree, parent_tree)
34
24
        else:
35
25
            delta = None
36
 
        yield log.LogRevision(rev, revno, merge_depth, delta=delta,
37
 
                              tags=rev_tag_dict.get(rev_id))
38
 
 
39
 
 
40
 
def find_unmerged(local_branch, remote_branch, restrict='all',
41
 
                  include_merged=None, backward=False,
42
 
                  local_revid_range=None, remote_revid_range=None):
43
 
    """Find revisions from each side that have not been merged.
44
 
 
45
 
    :param local_branch: Compare the history of local_branch
46
 
    :param remote_branch: versus the history of remote_branch, and determine
47
 
        mainline revisions which have not been merged.
48
 
    :param restrict: ('all', 'local', 'remote') If 'all', we will return the
49
 
        unique revisions from both sides. If 'local', we will return None
50
 
        for the remote revisions, similarly if 'remote' we will return None for
51
 
        the local revisions.
52
 
    :param include_merged: Show mainline revisions only if False,
53
 
        all revisions otherwise.
54
 
    :param backward: Show oldest versions first when True, newest versions
55
 
        first when False.
56
 
    :param local_revid_range: Revision-id range for filtering local_branch
57
 
        revisions (lower bound, upper bound)
58
 
    :param remote_revid_range: Revision-id range for filtering remote_branch
59
 
        revisions (lower bound, upper bound)
60
 
 
61
 
    :return: A list of [(revno, revision_id)] for the mainline revisions on
62
 
        each side.
63
 
    """
64
 
    if include_merged is None:
65
 
        include_merged = False
66
 
    with local_branch.lock_read(), remote_branch.lock_read():
67
 
        return _find_unmerged(
68
 
            local_branch, remote_branch, restrict=restrict,
69
 
            include_merged=include_merged, backward=backward,
70
 
            local_revid_range=local_revid_range,
71
 
            remote_revid_range=remote_revid_range)
72
 
 
73
 
 
74
 
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
75
 
    """Enumerate the mainline revisions for these revisions.
76
 
 
77
 
    :param ancestry: A set of revisions that we care about
78
 
    :param graph: A Graph which lets us find the parents for a revision
79
 
    :param tip_revno: The revision number for the tip revision
80
 
    :param tip: The tip of mainline
81
 
    :param backward: Show oldest versions first when True, newest versions
82
 
        first when False.
83
 
    :return: [(revno, revision_id, 0)] for all revisions in ancestry that
84
 
        are left-hand parents from tip, or None if ancestry is None.
85
 
    """
86
 
    if ancestry is None:
87
 
        return None
88
 
    if not ancestry:  # Empty ancestry, no need to do any work
89
 
        return []
90
 
 
91
 
    # Optionally, we could make 1 call to graph.get_parent_map with all
92
 
    # ancestors. However that will often check many more parents than we
93
 
    # actually need, and the Graph is likely to already have the parents cached
94
 
    # anyway.
95
 
    mainline = []
96
 
    cur = tip
97
 
    cur_revno = tip_revno
98
 
    while cur in ancestry:
99
 
        parent_map = graph.get_parent_map([cur])
100
 
        parents = parent_map.get(cur)
101
 
        if not parents:
102
 
            break  # Ghost, we are done
103
 
        mainline.append(
104
 
            (str(cur_revno) if cur_revno is not None else None, cur, 0))
105
 
        cur = parents[0]
106
 
        if cur_revno is not None:
107
 
            cur_revno -= 1
108
 
    if not backward:
109
 
        mainline.reverse()
110
 
    return mainline
111
 
 
112
 
 
113
 
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
114
 
                           backward=True):
115
 
    """Enumerate the revisions for the ancestry.
116
 
 
117
 
    :param branch: The branch we care about
118
 
    :param ancestry: A set of revisions that we care about
119
 
    :param graph: A Graph which lets us find the parents for a revision
120
 
    :param tip_revno: The revision number for the tip revision
121
 
    :param tip: The tip of the ancsetry
122
 
    :param backward: Show oldest versions first when True, newest versions
123
 
        first when False.
124
 
    :return: [(revno, revision_id)] for all revisions in ancestry that
125
 
        are parents from tip, or None if ancestry is None.
126
 
    """
127
 
    if ancestry is None:
128
 
        return None
129
 
    if not ancestry:  # Empty ancestry, no need to do any work
130
 
        return []
131
 
 
132
 
    merge_sorted_revisions = branch.iter_merge_sorted_revisions()
133
 
    # Now that we got the correct revnos, keep only the relevant
134
 
    # revisions.
135
 
    merge_sorted_revisions = [
136
 
        # log.reverse_by_depth expects seq_num to be present, but it is
137
 
        # stripped by iter_merge_sorted_revisions()
138
 
        (0, revid, n, d, e) for revid, n, d, e in merge_sorted_revisions
139
 
        if revid in ancestry]
140
 
    if not backward:
141
 
        merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
142
 
    revline = []
143
 
    for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
144
 
        revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
145
 
    return revline
146
 
 
147
 
 
148
 
def _filter_revs(graph, revs, revid_range):
149
 
    if revid_range is None or revs is None:
150
 
        return revs
151
 
    return [rev for rev in revs
152
 
            if graph.is_between(rev[1], revid_range[0], revid_range[1])]
153
 
 
154
 
 
155
 
def _find_unmerged(local_branch, remote_branch, restrict,
156
 
                   include_merged, backward,
157
 
                   local_revid_range=None, remote_revid_range=None):
158
 
    """See find_unmerged.
159
 
 
160
 
    The branches should already be locked before entering.
161
 
    """
162
 
    try:
163
 
        local_revno, local_revision_id = local_branch.last_revision_info()
164
 
    except (errors.UnsupportedOperation, errors.GhostRevisionsHaveNoRevno):
165
 
        local_revno = None
166
 
        local_revision_id = local_branch.last_revision()
167
 
    try:
168
 
        remote_revno, remote_revision_id = remote_branch.last_revision_info()
169
 
    except (errors.UnsupportedOperation, errors.GhostRevisionsHaveNoRevno):
170
 
        remote_revision_id = remote_branch.last_revision()
171
 
        remote_revno = None
172
 
 
173
 
    if local_revision_id == remote_revision_id:
174
 
        # A simple shortcut when the tips are at the same point
175
 
        return [], []
176
 
    graph = local_branch.repository.get_graph(remote_branch.repository)
177
 
    if restrict == 'remote':
178
 
        local_extra = None
179
 
        remote_extra = graph.find_unique_ancestors(remote_revision_id,
180
 
                                                   [local_revision_id])
181
 
    elif restrict == 'local':
182
 
        remote_extra = None
183
 
        local_extra = graph.find_unique_ancestors(local_revision_id,
184
 
                                                  [remote_revision_id])
185
 
    else:
186
 
        if restrict != 'all':
187
 
            raise ValueError('param restrict not one of "all", "local",'
188
 
                             ' "remote": %r' % (restrict,))
189
 
        local_extra, remote_extra = graph.find_difference(local_revision_id,
190
 
                                                          remote_revision_id)
191
 
    if include_merged:
192
 
        locals = _enumerate_with_merges(local_branch, local_extra,
193
 
                                        graph, local_revno,
194
 
                                        local_revision_id, backward)
195
 
        remotes = _enumerate_with_merges(remote_branch, remote_extra,
196
 
                                         graph, remote_revno,
197
 
                                         remote_revision_id, backward)
198
 
    else:
199
 
        # Now that we have unique ancestors, compute just the mainline, and
200
 
        # generate revnos for them.
201
 
        locals = _enumerate_mainline(local_extra, graph, local_revno,
202
 
                                     local_revision_id, backward)
203
 
        remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
204
 
                                      remote_revision_id, backward)
205
 
    return _filter_revs(graph, locals, local_revid_range), _filter_revs(
206
 
        graph, remotes, remote_revid_range)
207
 
 
 
26
        yield revno, rev, delta
 
27
 
 
28
 
 
29
def find_unmerged(local_branch, remote_branch):
 
30
    progress = ui.ui_factory.nested_progress_bar()
 
31
    local_branch.lock_read()
 
32
    try:
 
33
        remote_branch.lock_read()
 
34
        try:
 
35
            local_rev_history, local_rev_history_map = \
 
36
                _get_history(local_branch, progress, "local", 0)
 
37
            remote_rev_history, remote_rev_history_map = \
 
38
                _get_history(remote_branch, progress, "remote", 1)
 
39
            result = _shortcut(local_rev_history, remote_rev_history)
 
40
            if result is not None:
 
41
                local_extra, remote_extra = result
 
42
                local_extra = sorted_revisions(local_extra, 
 
43
                                               local_rev_history_map)
 
44
                remote_extra = sorted_revisions(remote_extra, 
 
45
                                                remote_rev_history_map)
 
46
                return local_extra, remote_extra
 
47
 
 
48
            local_ancestry = _get_ancestry(local_branch.repository, progress, 
 
49
                                           "local", 2, local_rev_history)
 
50
            remote_ancestry = _get_ancestry(remote_branch.repository, progress,
 
51
                                            "remote", 3, remote_rev_history)
 
52
            progress.update('pondering', 4, 5)
 
53
            extras = local_ancestry.symmetric_difference(remote_ancestry) 
 
54
            local_extra = extras.intersection(set(local_rev_history))
 
55
            remote_extra = extras.intersection(set(remote_rev_history))
 
56
            local_extra = sorted_revisions(local_extra, local_rev_history_map)
 
57
            remote_extra = sorted_revisions(remote_extra, 
 
58
                                            remote_rev_history_map)
 
59
                    
 
60
        finally:
 
61
            remote_branch.unlock()
 
62
    finally:
 
63
        local_branch.unlock()
 
64
        progress.finished()
 
65
    return (local_extra, remote_extra)
 
66
 
 
67
def _shortcut(local_rev_history, remote_rev_history):
 
68
    local_history = set(local_rev_history)
 
69
    remote_history = set(remote_rev_history)
 
70
    if len(local_rev_history) == 0:
 
71
        return set(), remote_history
 
72
    elif len(remote_rev_history) == 0:
 
73
        return local_history, set()
 
74
    elif local_rev_history[-1] in remote_history:
 
75
        return set(), _after(remote_rev_history, local_rev_history)
 
76
    elif remote_rev_history[-1] in local_history:
 
77
        return _after(local_rev_history, remote_rev_history), set()
 
78
    else:
 
79
        return None
 
80
 
 
81
def _after(larger_history, smaller_history):
 
82
    return set(larger_history[larger_history.index(smaller_history[-1])+1:])
 
83
 
 
84
def _get_history(branch, progress, label, step):
 
85
    progress.update('%s history' % label, step, 5)
 
86
    rev_history = branch.revision_history()
 
87
    rev_history_map = dict(
 
88
        [(rev, rev_history.index(rev) + 1)
 
89
         for rev in rev_history])
 
90
    return rev_history, rev_history_map
 
91
 
 
92
def _get_ancestry(repository, progress, label, step, rev_history):
 
93
    progress.update('%s ancestry' % label, step, 5)
 
94
    if len(rev_history) > 0:
 
95
        ancestry = set(repository.get_ancestry(rev_history[-1]))
 
96
    else:
 
97
        ancestry = set()
 
98
    return ancestry
 
99
    
208
100
 
209
101
def sorted_revisions(revisions, history_map):
210
 
    revisions = sorted([(history_map[r], r) for r in revisions])
 
102
    revisions = [(history_map[r],r) for r in revisions]
 
103
    revisions.sort()
211
104
    return revisions