← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/missing.py

  • Committer: Martin Packman
  • Date: 2012-03-27 17:32:19 UTC
  • mto: (6437.54.3 2.5)
  • mto: This revision was merged to the branch mainline in revision 6525.
  • Revision ID: martin.packman@canonical.com-20120327173219-401pil42gke8j0xh
https://launchpad.net/bugs/940704
Fall back to sys.prefix not /usr when looking for .mo files

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