~bzr-pqm/bzr/bzr.dev

974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
1
# Copyright (C) 2005 by 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
1218 by Martin Pool
- fix up import
16
1231 by Martin Pool
- more progress on fetch on top of weaves
17
18
"""Copying of history from one branch to another.
19
20
The basic plan is that every branch knows the history of everything
21
that has merged into it.  As the first step of a merge, pull, or
22
branch operation we copy history from the source into the destination
23
branch.
24
25
The copying is done in a slightly complicated order.  We don't want to
26
add a revision to the store until everything it refers to is also
27
stored, so that if a revision is present we can totally recreate it.
28
However, we can't know what files are included in a revision until we
29
read its inventory.  Therefore, we first pull the XML and hold it in
30
memory until we've updated all of the files referenced.
31
"""
32
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
33
import bzrlib
34
import bzrlib.errors as errors
35
from bzrlib.errors import (InstallFailed, NoSuchRevision, WeaveError,
36
                           MissingText)
37
from bzrlib.trace import mutter
38
from bzrlib.progress import ProgressBar
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
39
from bzrlib.reconcile import RepoReconciler
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
40
from bzrlib.revision import NULL_REVISION
41
from bzrlib.symbol_versioning import *
42
43
1231 by Martin Pool
- more progress on fetch on top of weaves
44
# TODO: Avoid repeatedly opening weaves so many times.
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
45
1238 by Martin Pool
- remove a lot of dead code from fetch
46
# XXX: This doesn't handle ghost (not present in branch) revisions at
1240 by Martin Pool
- clean up fetch code and add progress bar
47
# all yet.  I'm not sure they really should be supported.
48
1262 by Martin Pool
- fetch should also copy ancestry records
49
# NOTE: This doesn't copy revisions which may be present but not
50
# merged into the last revision.  I'm not sure we want to do that.
1238 by Martin Pool
- remove a lot of dead code from fetch
51
52
# - get a list of revisions that need to be pulled in
53
# - for each one, pull in that revision file
54
#   and get the inventory, and store the inventory with right
55
#   parents.
56
# - and get the ancestry, and store that with right parents too
57
# - and keep a note of all file ids and version seen
58
# - then go through all files; for each one get the weave,
59
#   and add in all file versions
60
61
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
62
@deprecated_function(zero_eight)
1260 by Martin Pool
- some updates for fetch/update function
63
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
64
    """Legacy API, please see branch.fetch(from_branch, last_revision, pb)."""
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
65
    f = Fetcher(to_branch, from_branch, revision, pb)
66
    return f.count_copied, f.failed_revisions
67
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
68
fetch = greedy_fetch
69
1219 by Martin Pool
- BROKEN: start refactoring fetch code to work well with weaves
70
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
71
class RepoFetcher(object):
72
    """Pull revisions and texts from one repository to another.
73
74
    last_revision
75
        if set, try to limit to the data this revision references.
76
77
    after running:
1260 by Martin Pool
- some updates for fetch/update function
78
    count_copied -- number of revisions copied
1534.1.33 by Robert Collins
Move copy_content_into into InterRepository and InterWeaveRepo, and disable the default codepath test as we have optimised paths for all current combinations.
79
80
    This should not be used directory, its essential a object to encapsulate
81
    the logic in InterRepository.fetch().
1260 by Martin Pool
- some updates for fetch/update function
82
    """
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
83
    def __init__(self, to_repository, from_repository, last_revision=None, pb=None):
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
84
        # result variables.
85
        self.failed_revisions = []
86
        self.count_copied = 0
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
87
        if to_repository.control_files._transport.base == from_repository.control_files._transport.base:
1534.6.13 by Robert Collins
Allow push/pull and branch between branches in the same shared repository.
88
            # check that last_revision is in 'from' and then return a no-operation.
89
            if last_revision not in (None, NULL_REVISION):
90
                from_repository.get_revision(last_revision)
91
            return
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
92
        self.to_repository = to_repository
93
        self.from_repository = from_repository
94
        # must not mutate self._last_revision as its potentially a shared instance
1185.65.27 by Robert Collins
Tweak storage towards mergability.
95
        self._last_revision = last_revision
96
        if pb is None:
97
            self.pb = bzrlib.ui.ui_factory.progress_bar()
98
        else:
99
            self.pb = pb
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
100
        self.from_repository.lock_read()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
101
        try:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
102
            self.to_repository.lock_write()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
103
            try:
104
                self.__fetch()
105
            finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
106
                self.to_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
107
        finally:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
108
            self.from_repository.unlock()
1185.65.27 by Robert Collins
Tweak storage towards mergability.
109
110
    def __fetch(self):
111
        """Primary worker function.
112
113
        This initialises all the needed variables, and then fetches the 
114
        requested revisions, finally clearing the progress bar.
115
        """
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
116
        self.to_weaves = self.to_repository.weave_store
117
        self.to_control = self.to_repository.control_weaves
118
        self.from_weaves = self.from_repository.weave_store
119
        self.from_control = self.from_repository.control_weaves
1240 by Martin Pool
- clean up fetch code and add progress bar
120
        self.count_total = 0
1185.33.55 by Martin Pool
[patch] weave fetch optimizations (Goffredo Baroncelli)
121
        self.file_ids_names = {}
1392 by Robert Collins
reinstate testfetch test case
122
        try:
1185.65.30 by Robert Collins
Merge integration.
123
            revs = self._revids_to_fetch()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
124
            # nothing to do
125
            if revs: 
1534.1.11 by Robert Collins
Format tweaks for latest merges.
126
                self._fetch_weave_texts(revs)
127
                self._fetch_inventory_weave(revs)
128
                self._fetch_revision_texts(revs)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
129
                self.count_copied += len(revs)
1185.12.15 by Aaron Bentley
Cleared progress bar properly after fetch
130
        finally:
131
            self.pb.clear()
1231 by Martin Pool
- more progress on fetch on top of weaves
132
1185.65.30 by Robert Collins
Merge integration.
133
    def _revids_to_fetch(self):
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
134
        self.pb.update('get destination history')
1185.65.27 by Robert Collins
Tweak storage towards mergability.
135
        mutter('fetch up to rev {%s}', self._last_revision)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
136
        if self._last_revision is NULL_REVISION:
137
            # explicit limit of no revisions needed
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
138
            return None
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
139
        if (self._last_revision != None and
1185.65.27 by Robert Collins
Tweak storage towards mergability.
140
            self.to_repository.has_revision(self._last_revision)):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
141
            return None
142
            
1417.1.13 by Robert Collins
do not download remote ancestry.weave if the target revision we are stopping at is in our local store
143
        try:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
144
            return self.to_repository.missing_revision_ids(self.from_repository,
145
                                                           self._last_revision)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
146
        except errors.NoSuchRevision:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
147
            raise InstallFailed([self._last_revision])
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
148
1534.1.11 by Robert Collins
Format tweaks for latest merges.
149
    def _fetch_revision_texts(self, revs):
1185.65.30 by Robert Collins
Merge integration.
150
        self.to_repository.revision_store.copy_multi(
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
151
            self.from_repository.revision_store,
152
            revs,
153
            pb=self.pb)
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
154
        # fixup inventory if needed:
155
        # this is expensive because we have no inverse index to current ghosts.
156
        # but on local disk its a few seconds and sftp push is already insane.
157
        # so we just-do-it.
158
        # FIXME: the generic code path should not need this, if it truely is
159
        # generic.
160
        reconciler = RepoReconciler(self.to_repository)
161
        reconciler.reconcile()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
162
1534.1.11 by Robert Collins
Format tweaks for latest merges.
163
    def _fetch_weave_texts(self, revs):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
164
        file_ids = self.from_repository.fileid_involved_by_set(revs)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
165
        count = 0
166
        num_file_ids = len(file_ids)
167
        for file_id in file_ids:
1185.77.1 by John Arbash Meinel
Simplifying what bzr displays when merging
168
            self.pb.update("merge weaves", count, num_file_ids)
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
169
            count +=1
170
            to_weave = self.to_weaves.get_weave_or_empty(file_id,
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
171
                self.to_repository.get_transaction())
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
172
            from_weave = self.from_weaves.get_weave(file_id,
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
173
                self.from_repository.get_transaction())
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
174
175
            if to_weave.numversions() > 0:
176
                # destination has contents, must merge
177
                try:
178
                    to_weave.join(from_weave)
179
                except errors.WeaveParentMismatch:
180
                    to_weave.reweave(from_weave)
181
            else:
182
                # destination is empty, just replace it
1534.1.11 by Robert Collins
Format tweaks for latest merges.
183
                to_weave = from_weave.copy()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
184
185
            self.to_weaves.put_weave(file_id, to_weave,
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
186
                self.to_repository.get_transaction())
1534.1.11 by Robert Collins
Format tweaks for latest merges.
187
        self.pb.clear()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
188
1534.1.11 by Robert Collins
Format tweaks for latest merges.
189
    def _fetch_inventory_weave(self, revs):
1551.3.11 by Aaron Bentley
Merge from Robert
190
        self.pb.update("inventory fetch", 0, 2)
1185.65.30 by Robert Collins
Merge integration.
191
        from_weave = self.from_repository.get_inventory_weave()
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
192
        self.to_inventory_weave = self.to_repository.get_inventory_weave()
1551.3.11 by Aaron Bentley
Merge from Robert
193
        self.pb.update("inventory fetch", 1, 2)
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
194
        self.to_inventory_weave = self.to_control.get_weave('inventory',
1534.4.43 by Robert Collins
Merge from integration
195
                self.to_repository.get_transaction())
1551.3.11 by Aaron Bentley
Merge from Robert
196
        self.pb.update("inventory fetch", 2, 2)
1185.64.4 by Goffredo Baroncelli
Apply some style changes on the basis of Robert suggest
197
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
198
        if self.to_inventory_weave.numversions() > 0:
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
199
            # destination has contents, must merge
200
            try:
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
201
                self.to_inventory_weave.join(from_weave, pb=self.pb, msg='merge inventory')
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
202
            except errors.WeaveParentMismatch:
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
203
                self.to_inventory_weave.reweave(from_weave, pb=self.pb, msg='reweave inventory')
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
204
        else:
205
            # destination is empty, just replace it
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
206
            self.to_inventory_weave = from_weave.copy()
1185.64.3 by Goffredo Baroncelli
This patch changes the fetch code. Before, the original code expanded every inventory and
207
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
208
        # must be written before pulling any revisions
209
        self.to_control.put_weave('inventory', self.to_inventory_weave,
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
210
            self.to_repository.get_transaction())
1185.64.4 by Goffredo Baroncelli
Apply some style changes on the basis of Robert suggest
211
1534.1.11 by Robert Collins
Format tweaks for latest merges.
212
        self.pb.clear()
1240 by Martin Pool
- clean up fetch code and add progress bar
213
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
214
215
class Fetcher(object):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
216
    """Backwards compatability glue for branch.fetch()."""
217
218
    @deprecated_method(zero_eight)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
219
    def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
220
        """Please see branch.fetch()."""
221
        to_branch.fetch(from_branch, last_revision, pb)