/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: Martin von Gagern
  • Date: 2011-09-19 08:42:37 UTC
  • mto: This revision was merged to the branch mainline in revision 6148.
  • Revision ID: martin.vgagern@gmx.net-20110919084237-ck2r99f2ic7m2wxj
Rename --include-sidelines to --include-merged.

This better matches phrases used in existing code and docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
43
43
 
44
44
 
45
45
def find_unmerged(local_branch, remote_branch, restrict='all',
46
 
                  include_sidelines=None, backward=False,
 
46
                  include_merged=None, backward=False,
47
47
                  local_revid_range=None, remote_revid_range=None,
48
48
                  include_merges=symbol_versioning.DEPRECATED_PARAMETER):
49
49
    """Find revisions from each side that have not been merged.
55
55
        unique revisions from both sides. If 'local', we will return None
56
56
        for the remote revisions, similarly if 'remote' we will return None for
57
57
        the local revisions.
58
 
    :param include_sidelines: Show mainline revisions only if False,
 
58
    :param include_merged: Show mainline revisions only if False,
59
59
        all revisions otherwise.
60
60
    :param backward: Show oldest versions first when True, newest versions
61
61
        first when False.
63
63
        revisions (lower bound, upper bound)
64
64
    :param remote_revid_range: Revision-id range for filtering remote_branch
65
65
        revisions (lower bound, upper bound)
66
 
    :param include_merges: Deprecated historical alias for include_sidelines
 
66
    :param include_merges: Deprecated historical alias for include_merged
67
67
 
68
68
    :return: A list of [(revno, revision_id)] for the mainline revisions on
69
69
        each side.
71
71
    if symbol_versioning.deprecated_passed(include_merges):
72
72
        symbol_versioning.warn(
73
73
            'include_merges was deprecated in 2.5.'
74
 
            ' Use include_sidelines instead.',
 
74
            ' Use include_merged instead.',
75
75
            DeprecationWarning, stacklevel=2)
76
 
        if include_sidelines is None:
77
 
            include_sidelines = include_merges
78
 
    if include_sidelines is None:
79
 
        include_sidelines = False
 
76
        if include_merged is None:
 
77
            include_merged = include_merges
 
78
    if include_merged is None:
 
79
        include_merged = False
80
80
    local_branch.lock_read()
81
81
    try:
82
82
        remote_branch.lock_read()
83
83
        try:
84
84
            return _find_unmerged(
85
85
                local_branch, remote_branch, restrict=restrict,
86
 
                include_sidelines=include_sidelines, backward=backward,
 
86
                include_merged=include_merged, backward=backward,
87
87
                local_revid_range=local_revid_range,
88
88
                remote_revid_range=remote_revid_range)
89
89
        finally:
172
172
 
173
173
 
174
174
def _find_unmerged(local_branch, remote_branch, restrict,
175
 
                   include_sidelines, backward,
 
175
                   include_merged, backward,
176
176
                   local_revid_range=None, remote_revid_range=None):
177
177
    """See find_unmerged.
178
178
 
198
198
                             ' "remote": %r' % (restrict,))
199
199
        local_extra, remote_extra = graph.find_difference(local_revision_id,
200
200
                                                          remote_revision_id)
201
 
    if include_sidelines:
 
201
    if include_merged:
202
202
        locals = _enumerate_with_merges(local_branch, local_extra,
203
203
                                        graph, local_revno,
204
204
                                        local_revision_id, backward)