/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: Robert Collins
  • Date: 2007-09-19 05:14:14 UTC
  • mto: (2835.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2836.
  • Revision ID: robertc@robertcollins.net-20070919051414-2tgjqteg7k3ps4h0
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
  repository index errors that occured as a result of the Weave disk format.
  Instead the ``reconcile`` command needs to be run to correct those
  problems if they exist (and it has been able to fix most such problems
  since bzr 0.8). Some new problems have been identified during this release
  and you should run ``bzr check`` once on every repository to see if you
  need to reconcile. If you cannot ``pull`` or ``merge`` from a remote
  repository due to mismatched parent errors - a symptom of index errors -
  you should simply take a full copy of that remote repository to a clean
  directory outside any local repositories, then run reconcile on it, and
  finally pull from it locally. (And naturally email the repositories owner
  to ask them to upgrade and run reconcile).
  (Robert Collins)

* ``VersionedFile.fix_parents`` has been removed as a harmful API.
  ``VersionedFile.join`` will no longer accept different parents on either
  side of a join - it will either ignore them, or error, depending on the
  implementation. See notes when upgrading for more information.
  (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/missing.py
 
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
"""Display what revisions are missing in 'other' from 'this' and vice versa."""
 
18
 
 
19
from bzrlib import ui
 
20
from bzrlib.log import (
 
21
    LogRevision,
 
22
    )
 
23
from bzrlib.symbol_versioning import (
 
24
    deprecated_function,
 
25
    zero_seventeen,
 
26
    )
 
27
 
 
28
 
 
29
@deprecated_function(zero_seventeen)
 
30
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
 
33
 
 
34
 
 
35
def iter_log_revisions(revisions, revision_source, verbose):
 
36
    last_tree = revision_source.revision_tree(None)
 
37
    last_rev_id = None
 
38
    for revno, rev_id in revisions:
 
39
        rev = revision_source.get_revision(rev_id)
 
40
        if verbose:
 
41
            remote_tree = revision_source.revision_tree(rev_id)
 
42
            parent_rev_id = rev.parent_ids[0]
 
43
            if last_rev_id == parent_rev_id:
 
44
                parent_tree = last_tree
 
45
            else:
 
46
                parent_tree = revision_source.revision_tree(parent_rev_id)
 
47
            revision_tree = revision_source.revision_tree(rev_id)
 
48
            last_rev_id = rev_id
 
49
            last_tree = revision_tree
 
50
            delta = revision_tree.changes_from(parent_tree)
 
51
        else:
 
52
            delta = None
 
53
        yield LogRevision(rev, revno, delta=delta)
 
54
 
 
55
 
 
56
def find_unmerged(local_branch, remote_branch):
 
57
    progress = ui.ui_factory.nested_progress_bar()
 
58
    local_branch.lock_read()
 
59
    try:
 
60
        remote_branch.lock_read()
 
61
        try:
 
62
            local_rev_history, local_rev_history_map = \
 
63
                _get_history(local_branch, progress, "local", 0)
 
64
            remote_rev_history, remote_rev_history_map = \
 
65
                _get_history(remote_branch, progress, "remote", 1)
 
66
            result = _shortcut(local_rev_history, remote_rev_history)
 
67
            if result is not None:
 
68
                local_extra, remote_extra = result
 
69
                local_extra = sorted_revisions(local_extra, 
 
70
                                               local_rev_history_map)
 
71
                remote_extra = sorted_revisions(remote_extra, 
 
72
                                                remote_rev_history_map)
 
73
                return local_extra, remote_extra
 
74
 
 
75
            local_ancestry = _get_ancestry(local_branch.repository, progress, 
 
76
                                           "local", 2, local_rev_history)
 
77
            remote_ancestry = _get_ancestry(remote_branch.repository, progress,
 
78
                                            "remote", 3, remote_rev_history)
 
79
            progress.update('pondering', 4, 5)
 
80
            extras = local_ancestry.symmetric_difference(remote_ancestry) 
 
81
            local_extra = extras.intersection(set(local_rev_history))
 
82
            remote_extra = extras.intersection(set(remote_rev_history))
 
83
            local_extra = sorted_revisions(local_extra, local_rev_history_map)
 
84
            remote_extra = sorted_revisions(remote_extra, 
 
85
                                            remote_rev_history_map)
 
86
                    
 
87
        finally:
 
88
            remote_branch.unlock()
 
89
    finally:
 
90
        local_branch.unlock()
 
91
        progress.finished()
 
92
    return (local_extra, remote_extra)
 
93
 
 
94
def _shortcut(local_rev_history, remote_rev_history):
 
95
    local_history = set(local_rev_history)
 
96
    remote_history = set(remote_rev_history)
 
97
    if len(local_rev_history) == 0:
 
98
        return set(), remote_history
 
99
    elif len(remote_rev_history) == 0:
 
100
        return local_history, set()
 
101
    elif local_rev_history[-1] in remote_history:
 
102
        return set(), _after(remote_rev_history, local_rev_history)
 
103
    elif remote_rev_history[-1] in local_history:
 
104
        return _after(local_rev_history, remote_rev_history), set()
 
105
    else:
 
106
        return None
 
107
 
 
108
def _after(larger_history, smaller_history):
 
109
    return set(larger_history[larger_history.index(smaller_history[-1])+1:])
 
110
 
 
111
def _get_history(branch, progress, label, step):
 
112
    progress.update('%s history' % label, step, 5)
 
113
    rev_history = branch.revision_history()
 
114
    rev_history_map = dict(
 
115
        [(rev, rev_history.index(rev) + 1)
 
116
         for rev in rev_history])
 
117
    return rev_history, rev_history_map
 
118
 
 
119
def _get_ancestry(repository, progress, label, step, rev_history):
 
120
    progress.update('%s ancestry' % label, step, 5)
 
121
    if len(rev_history) > 0:
 
122
        ancestry = set(repository.get_ancestry(rev_history[-1],
 
123
                       topo_sorted=False))
 
124
    else:
 
125
        ancestry = set()
 
126
    return ancestry
 
127
    
 
128
 
 
129
def sorted_revisions(revisions, history_map):
 
130
    revisions = [(history_map[r],r) for r in revisions]
 
131
    revisions.sort()
 
132
    return revisions