← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Ian Clatworthy
  • Date: 2007-11-30 04:28:32 UTC
  • mto: (3054.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3055.
  • Revision ID: ian.clatworthy@internode.on.net-20071130042832-6prruj0kzg3fodm8
chapter 2 tweaks

Show diffs side-by-side

added added

removed removed

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