1
# Copyright (C) 2005, 2006 Canonical Ltd
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.
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.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
1
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
20
from bzrlib.log import (
23
from bzrlib.symbol_versioning import (
29
@deprecated_function(zero_seventeen)
30
6
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
35
def iter_log_revisions(revisions, revision_source, verbose):
36
7
last_tree = revision_source.revision_tree(None)
38
9
for revno, rev_id in revisions:
47
18
revision_tree = revision_source.revision_tree(rev_id)
48
19
last_rev_id = rev_id
49
20
last_tree = revision_tree
50
delta = revision_tree.changes_from(parent_tree)
21
delta = parent_tree.changes_from(revision_tree)
53
yield LogRevision(rev, revno, delta=delta)
24
yield revno, rev, delta
56
27
def find_unmerged(local_branch, remote_branch):
60
31
remote_branch.lock_read()
62
# check for special case: both branches are equivalent
63
if (local_branch.last_revision_info() ==
64
remote_branch.last_revision_info()):
66
33
local_rev_history, local_rev_history_map = \
67
34
_get_history(local_branch, progress, "local", 0)
68
35
remote_rev_history, remote_rev_history_map = \
123
90
def _get_ancestry(repository, progress, label, step, rev_history):
124
91
progress.update('%s ancestry' % label, step, 5)
125
92
if len(rev_history) > 0:
126
ancestry = set(repository.get_ancestry(rev_history[-1],
93
ancestry = set(repository.get_ancestry(rev_history[-1]))