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