/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
16
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
18
6379.6.3 by Jelmer Vernooij
Use absolute_import.
19
from __future__ import absolute_import
20
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
21
from . import (
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
22
    errors,
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
23
    log,
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
24
    )
25
26
6519.2.2 by Neil Martinsen-Burrell
pass in tag dictionary instead of branch
27
def iter_log_revisions(revisions, revision_source, verbose, rev_tag_dict=None):
28
    if rev_tag_dict is None:
6519.2.1 by Neil Martinsen-Burrell
Show tag names when using missing command
29
        rev_tag_dict = {}
6719.1.1 by Jelmer Vernooij
Remove some more deprecated stuff.
30
    for revno, rev_id, merge_depth in revisions:
1185.54.19 by Aaron Bentley
All tests pass
31
        rev = revision_source.get_revision(rev_id)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
32
        if verbose:
4007.1.1 by Jelmer Vernooij
Use Repository.get_revision_delta() in missing rather than doing the delta
33
            delta = revision_source.get_revision_delta(rev_id)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
34
        else:
35
            delta = None
6519.2.1 by Neil Martinsen-Burrell
Show tag names when using missing command
36
        yield log.LogRevision(rev, revno, merge_depth, delta=delta,
37
                              tags=rev_tag_dict.get(rev_id))
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
38
39
40
def find_unmerged(local_branch, remote_branch, restrict='all',
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
41
                  include_merged=None, backward=False,
6630.1.1 by Jelmer Vernooij
Remove deprecated functionality.
42
                  local_revid_range=None, remote_revid_range=None):
3427.3.6 by John Arbash Meinel
review feedback from Ian
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.
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
52
    :param include_merged: Show mainline revisions only if False,
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
53
        all revisions otherwise.
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
54
    :param backward: Show oldest versions first when True, newest versions
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
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)
3427.3.6 by John Arbash Meinel
review feedback from Ian
60
61
    :return: A list of [(revno, revision_id)] for the mainline revisions on
62
        each side.
63
    """
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
64
    if include_merged is None:
65
        include_merged = False
1185.54.3 by Aaron Bentley
Factored out find_unmerged
66
    local_branch.lock_read()
67
    try:
68
        remote_branch.lock_read()
69
        try:
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
70
            return _find_unmerged(
71
                local_branch, remote_branch, restrict=restrict,
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
72
                include_merged=include_merged, backward=backward,
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
73
                local_revid_range=local_revid_range,
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
74
                remote_revid_range=remote_revid_range)
1185.54.3 by Aaron Bentley
Factored out find_unmerged
75
        finally:
76
            remote_branch.unlock()
77
    finally:
78
        local_branch.unlock()
1185.54.4 by Aaron Bentley
Restructured find_unmerged, so it returns lists of (revno, revision) pairs
79
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
80
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
81
def _enumerate_mainline(ancestry, graph, tip_revno, tip, backward=True):
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
82
    """Enumerate the mainline revisions for these revisions.
83
84
    :param ancestry: A set of revisions that we care about
85
    :param graph: A Graph which lets us find the parents for a revision
86
    :param tip_revno: The revision number for the tip revision
3427.3.6 by John Arbash Meinel
review feedback from Ian
87
    :param tip: The tip of mainline
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
88
    :param backward: Show oldest versions first when True, newest versions
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
89
        first when False.
6719.1.2 by Jelmer Vernooij
Fix some tests.
90
    :return: [(revno, revision_id, 0)] for all revisions in ancestry that
3427.3.6 by John Arbash Meinel
review feedback from Ian
91
        are left-hand parents from tip, or None if ancestry is None.
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
92
    """
93
    if ancestry is None:
94
        return None
7143.15.2 by Jelmer Vernooij
Run autopep8.
95
    if not ancestry:  # Empty ancestry, no need to do any work
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
96
        return []
97
3427.3.2 by John Arbash Meinel
switch find_unmerged to use the new function
98
    # Optionally, we could make 1 call to graph.get_parent_map with all
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
99
    # ancestors. However that will often check many more parents than we
100
    # actually need, and the Graph is likely to already have the parents cached
101
    # anyway.
102
    mainline = []
103
    cur = tip
104
    cur_revno = tip_revno
105
    while cur in ancestry:
106
        parent_map = graph.get_parent_map([cur])
3427.3.2 by John Arbash Meinel
switch find_unmerged to use the new function
107
        parents = parent_map.get(cur)
108
        if not parents:
7143.15.2 by Jelmer Vernooij
Run autopep8.
109
            break  # Ghost, we are done
110
        mainline.append(
111
            (str(cur_revno) if cur_revno is not None else None, cur, 0))
3427.3.2 by John Arbash Meinel
switch find_unmerged to use the new function
112
        cur = parents[0]
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
113
        if cur_revno is not None:
114
            cur_revno -= 1
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
115
    if not backward:
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
116
        mainline.reverse()
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
117
    return mainline
118
119
3677.1.3 by Vincent Ladeuil
Fix incorrect revnos based on jam's feedback.
120
def _enumerate_with_merges(branch, ancestry, graph, tip_revno, tip,
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
121
                           backward=True):
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
122
    """Enumerate the revisions for the ancestry.
123
3677.1.3 by Vincent Ladeuil
Fix incorrect revnos based on jam's feedback.
124
    :param branch: The branch we care about
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
125
    :param ancestry: A set of revisions that we care about
126
    :param graph: A Graph which lets us find the parents for a revision
127
    :param tip_revno: The revision number for the tip revision
128
    :param tip: The tip of the ancsetry
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
129
    :param backward: Show oldest versions first when True, newest versions
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
130
        first when False.
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
131
    :return: [(revno, revision_id)] for all revisions in ancestry that
132
        are parents from tip, or None if ancestry is None.
133
    """
134
    if ancestry is None:
135
        return None
7143.15.2 by Jelmer Vernooij
Run autopep8.
136
    if not ancestry:  # Empty ancestry, no need to do any work
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
137
        return []
138
4593.5.31 by John Arbash Meinel
Fix bzrlib.missing to not directly load the graph, etc.
139
    merge_sorted_revisions = branch.iter_merge_sorted_revisions()
3677.1.3 by Vincent Ladeuil
Fix incorrect revnos based on jam's feedback.
140
    # Now that we got the correct revnos, keep only the relevant
141
    # revisions.
142
    merge_sorted_revisions = [
4593.5.31 by John Arbash Meinel
Fix bzrlib.missing to not directly load the graph, etc.
143
        # log.reverse_by_depth expects seq_num to be present, but it is
144
        # stripped by iter_merge_sorted_revisions()
145
        (0, revid, n, d, e) for revid, n, d, e in merge_sorted_revisions
3677.1.3 by Vincent Ladeuil
Fix incorrect revnos based on jam's feedback.
146
        if revid in ancestry]
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
147
    if not backward:
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
148
        merge_sorted_revisions = log.reverse_by_depth(merge_sorted_revisions)
149
    revline = []
150
    for seq, rev_id, merge_depth, revno, end_of_merge in merge_sorted_revisions:
3677.1.5 by Vincent Ladeuil
Indent merge revisions correctly.
151
        revline.append(('.'.join(map(str, revno)), rev_id, merge_depth))
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
152
    return revline
153
154
3921.3.7 by Marius Kruger
just filter the missing revisions once all have been calculated.
155
def _filter_revs(graph, revs, revid_range):
3921.3.8 by Marius Kruger
* _filter_revs can now handle None and len=3 revs
156
    if revid_range is None or revs is None:
3921.3.7 by Marius Kruger
just filter the missing revisions once all have been calculated.
157
        return revs
3921.3.8 by Marius Kruger
* _filter_revs can now handle None and len=3 revs
158
    return [rev for rev in revs
7143.15.2 by Jelmer Vernooij
Run autopep8.
159
            if graph.is_between(rev[1], revid_range[0], revid_range[1])]
3921.3.1 by Marius Kruger
* add support for specifying a revision range to missing.find_unmerged
160
161
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
162
def _find_unmerged(local_branch, remote_branch, restrict,
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
163
                   include_merged, backward,
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
164
                   local_revid_range=None, remote_revid_range=None):
3427.3.6 by John Arbash Meinel
review feedback from Ian
165
    """See find_unmerged.
166
167
    The branches should already be locked before entering.
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
168
    """
6965.1.1 by Jelmer Vernooij
Add basic support for horizoned history.
169
    try:
170
        local_revno, local_revision_id = local_branch.last_revision_info()
171
    except (errors.UnsupportedOperation, errors.GhostRevisionsHaveNoRevno):
172
        local_revno = None
173
        local_revision_id = local_branch.last_revision()
174
    try:
175
        remote_revno, remote_revision_id = remote_branch.last_revision_info()
176
    except (errors.UnsupportedOperation, errors.GhostRevisionsHaveNoRevno):
177
        remote_revision_id = remote_branch.last_revision()
178
        remote_revno = None
179
180
    if local_revision_id == remote_revision_id:
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
181
        # A simple shortcut when the tips are at the same point
182
        return [], []
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
183
    graph = local_branch.repository.get_graph(remote_branch.repository)
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
184
    if restrict == 'remote':
185
        local_extra = None
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
186
        remote_extra = graph.find_unique_ancestors(remote_revision_id,
187
                                                   [local_revision_id])
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
188
    elif restrict == 'local':
189
        remote_extra = None
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
190
        local_extra = graph.find_unique_ancestors(local_revision_id,
191
                                                  [remote_revision_id])
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
192
    else:
193
        if restrict != 'all':
194
            raise ValueError('param restrict not one of "all", "local",'
195
                             ' "remote": %r' % (restrict,))
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
196
        local_extra, remote_extra = graph.find_difference(local_revision_id,
197
                                                          remote_revision_id)
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
198
    if include_merged:
3677.1.3 by Vincent Ladeuil
Fix incorrect revnos based on jam's feedback.
199
        locals = _enumerate_with_merges(local_branch, local_extra,
200
                                        graph, local_revno,
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
201
                                        local_revision_id, backward)
3677.1.3 by Vincent Ladeuil
Fix incorrect revnos based on jam's feedback.
202
        remotes = _enumerate_with_merges(remote_branch, remote_extra,
203
                                         graph, remote_revno,
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
204
                                         remote_revision_id, backward)
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
205
    else:
206
        # Now that we have unique ancestors, compute just the mainline, and
207
        # generate revnos for them.
208
        locals = _enumerate_mainline(local_extra, graph, local_revno,
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
209
                                     local_revision_id, backward)
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
210
        remotes = _enumerate_mainline(remote_extra, graph, remote_revno,
3677.1.4 by Vincent Ladeuil
Replace 'reverse' by 'backward' when talking about revision order.
211
                                      remote_revision_id, backward)
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
212
    return _filter_revs(graph, locals, local_revid_range), _filter_revs(
213
        graph, remotes, remote_revid_range)
3427.3.1 by John Arbash Meinel
Add bzrlib.missing.find_unmerged_mainline_revisions
214
215
1185.54.4 by Aaron Bentley
Restructured find_unmerged, so it returns lists of (revno, revision) pairs
216
def sorted_revisions(revisions, history_map):
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
217
    revisions = sorted([(history_map[r], r) for r in revisions])
1185.54.4 by Aaron Bentley
Restructured find_unmerged, so it returns lists of (revno, revision) pairs
218
    return revisions