/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2220.2.3 by Martin Pool
Add tag: revision namespace.
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1553.5.70 by Martin Pool
doc
2
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1553.5.70 by Martin Pool
doc
7
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1553.5.70 by Martin Pool
doc
12
#
1 by mbp at sourcefrog
import from baz patch-364
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
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
18
from cStringIO import StringIO
19
20
from bzrlib.lazy_import import lazy_import
21
lazy_import(globals(), """
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
22
from copy import deepcopy
23
from unittest import TestSuite
1372 by Martin Pool
- avoid converting inventories to/from StringIO
24
from warnings import warn
1553.5.70 by Martin Pool
doc
25
1 by mbp at sourcefrog
import from baz patch-364
26
import bzrlib
1551.8.4 by Aaron Bentley
Tweak import style
27
from bzrlib import (
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
28
        bzrdir,
29
        cache_utf8,
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
30
        config as _mod_config,
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
31
        errors,
32
        lockdir,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
33
        lockable_files,
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
34
        osutils,
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
35
        revision as _mod_revision,
1911.2.9 by John Arbash Meinel
Fix accidental import removal
36
        transport,
1551.8.4 by Aaron Bentley
Tweak import style
37
        tree,
2418.5.5 by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno
38
        tsort,
1551.8.4 by Aaron Bentley
Tweak import style
39
        ui,
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
40
        urlutils,
1551.8.4 by Aaron Bentley
Tweak import style
41
        )
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
42
from bzrlib.config import BranchConfig, TreeConfig
43
from bzrlib.lockable_files import LockableFiles, TransportLock
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
44
from bzrlib.tag import (
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
45
    BasicTags,
46
    DisabledTags,
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
47
    )
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
48
""")
49
1534.4.28 by Robert Collins
first cut at merge from integration.
50
from bzrlib.decorators import needs_read_lock, needs_write_lock
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
51
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
52
                           HistoryMissing, InvalidRevisionId,
53
                           InvalidRevisionNumber, LockError, NoSuchFile,
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
54
                           NoSuchRevision, NoWorkingTree, NotVersionedError,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
55
                           NotBranchError, UninitializableFormat,
56
                           UnlistableStore, UnlistableBranch,
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
57
                           )
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
58
from bzrlib.hooks import Hooks
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
59
from bzrlib.symbol_versioning import (deprecated_function,
60
                                      deprecated_method,
61
                                      DEPRECATED_PARAMETER,
62
                                      deprecated_passed,
1551.13.5 by Aaron Bentley
Deprecate Branch.get_root_id
63
                                      zero_eight, zero_nine, zero_sixteen,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
64
                                      )
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
65
from bzrlib.trace import mutter, note
1104 by Martin Pool
- Add a simple UIFactory
66
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
67
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
68
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
69
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
70
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
71
72
73
# TODO: Maybe include checks for common corruption of newlines, etc?
1 by mbp at sourcefrog
import from baz patch-364
74
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
75
# TODO: Some operations like log might retrieve the same revisions
76
# repeatedly to calculate deltas.  We could perhaps have a weakref
1223 by Martin Pool
- store inventories in weave
77
# cache in memory to make this faster.  In general anything can be
1185.65.29 by Robert Collins
Implement final review suggestions.
78
# cached in memory between lock and unlock operations. .. nb thats
79
# what the transaction identity map provides
416 by Martin Pool
- bzr log and bzr root now accept an http URL
80
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
81
1 by mbp at sourcefrog
import from baz patch-364
82
######################################################################
83
# branch objects
84
558 by Martin Pool
- All top-level classes inherit from object
85
class Branch(object):
1 by mbp at sourcefrog
import from baz patch-364
86
    """Branch holding a history of revisions.
87
343 by Martin Pool
doc
88
    base
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
89
        Base directory/url of the branch.
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
90
2245.1.2 by Robert Collins
Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list.
91
    hooks: An instance of BranchHooks.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
92
    """
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
93
    # this is really an instance variable - FIXME move it there
94
    # - RBC 20060112
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
95
    base = None
96
2220.2.10 by Martin Pool
(broken) start moving things to branches
97
    # override this to set the strategy for storing tags
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
98
    def _make_tags(self):
99
        return DisabledTags(self)
2220.2.10 by Martin Pool
(broken) start moving things to branches
100
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
101
    def __init__(self, *ignored, **ignored_too):
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
102
        self.tags = self._make_tags()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
103
        self._revision_history_cache = None
2418.5.6 by John Arbash Meinel
Cache the revision_id => revno map as appropriate.
104
        self._revision_id_to_revno_cache = None
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
105
1687.1.8 by Robert Collins
Teach Branch about break_lock.
106
    def break_lock(self):
107
        """Break a lock if one is present from another instance.
108
109
        Uses the ui factory to ask for confirmation if the lock may be from
110
        an active process.
111
112
        This will probe the repository for its lock as well.
113
        """
114
        self.control_files.break_lock()
115
        self.repository.break_lock()
1687.1.10 by Robert Collins
Branch.break_lock should handle bound branches too
116
        master = self.get_master_branch()
117
        if master is not None:
118
            master.break_lock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
119
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
120
    @staticmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
121
    @deprecated_method(zero_eight)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
122
    def open_downlevel(base):
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
123
        """Open a branch which may be of an old format."""
124
        return Branch.open(base, _unsupported=True)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
125
        
126
    @staticmethod
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
127
    def open(base, _unsupported=False):
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
128
        """Open the branch rooted at base.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
129
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
130
        For instance, if the branch is at URL/.bzr/branch,
131
        Branch.open(URL) -> a Branch instance.
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
132
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
133
        control = bzrdir.BzrDir.open(base, _unsupported)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
134
        return control.open_branch(_unsupported)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
135
136
    @staticmethod
1185.2.8 by Lalo Martins
creating the new branch constructors
137
    def open_containing(url):
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
138
        """Open an existing branch which contains url.
139
        
140
        This probes for a branch at url, and searches upwards from there.
1185.17.2 by Martin Pool
[pick] avoid problems in fetching when .bzr is not listable
141
142
        Basically we keep looking up until we find the control directory or
143
        run into the root.  If there isn't one, raises NotBranchError.
1534.4.22 by Robert Collins
update TODOs and move abstract methods that were misplaced on BzrBranchFormat5 to Branch.
144
        If there is one and it is either an unrecognised format or an unsupported 
145
        format, UnknownFormatError or UnsupportedFormatError are raised.
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
146
        If there is one, it is returned, along with the unused portion of url.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
147
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
148
        control, relpath = bzrdir.BzrDir.open_containing(url)
149
        return control.open_branch(), relpath
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
150
151
    @staticmethod
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
152
    @deprecated_function(zero_eight)
153
    def initialize(base):
154
        """Create a new working tree and branch, rooted at 'base' (url)
1551.1.2 by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir
155
156
        NOTE: This will soon be deprecated in favour of creation
157
        through a BzrDir.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
158
        """
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.
159
        return bzrdir.BzrDir.create_standalone_workingtree(base).branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
160
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
161
    @deprecated_function(zero_eight)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
162
    def setup_caching(self, cache_root):
163
        """Subclasses that care about caching should override this, and set
164
        up cached stores located under cache_root.
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
165
        
166
        NOTE: This is unused.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
167
        """
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
168
        pass
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
169
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
170
    def get_config(self):
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
171
        return BranchConfig(self)
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
172
1185.35.11 by Aaron Bentley
Added support for branch nicks
173
    def _get_nick(self):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
174
        return self.get_config().get_nickname()
1185.35.11 by Aaron Bentley
Added support for branch nicks
175
176
    def _set_nick(self, nick):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
177
        self.get_config().set_user_option('nickname', nick)
1185.35.11 by Aaron Bentley
Added support for branch nicks
178
179
    nick = property(_get_nick, _set_nick)
1694.2.6 by Martin Pool
[merge] bzr.dev
180
181
    def is_locked(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
182
        raise NotImplementedError(self.is_locked)
1694.2.6 by Martin Pool
[merge] bzr.dev
183
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
184
    def lock_write(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
185
        raise NotImplementedError(self.lock_write)
1694.2.6 by Martin Pool
[merge] bzr.dev
186
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
187
    def lock_read(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
188
        raise NotImplementedError(self.lock_read)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
189
190
    def unlock(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
191
        raise NotImplementedError(self.unlock)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
192
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
193
    def peek_lock_mode(self):
194
        """Return lock mode for the Branch: 'r', 'w' or None"""
1185.70.6 by Martin Pool
review fixups from John
195
        raise NotImplementedError(self.peek_lock_mode)
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
196
1694.2.6 by Martin Pool
[merge] bzr.dev
197
    def get_physical_lock_status(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
198
        raise NotImplementedError(self.get_physical_lock_status)
1694.2.6 by Martin Pool
[merge] bzr.dev
199
2418.5.12 by John Arbash Meinel
Move functions from BzrBranch to base Branch object.
200
    @needs_read_lock
201
    def get_revision_id_to_revno_map(self):
202
        """Return the revision_id => dotted revno map.
203
204
        This will be regenerated on demand, but will be cached.
205
206
        :return: A dictionary mapping revision_id => dotted revno.
207
            This dictionary should not be modified by the caller.
208
        """
209
        if self._revision_id_to_revno_cache is not None:
210
            mapping = self._revision_id_to_revno_cache
211
        else:
212
            mapping = self._gen_revno_map()
213
            self._cache_revision_id_to_revno(mapping)
214
        # TODO: jam 20070417 Since this is being cached, should we be returning
215
        #       a copy?
216
        # I would rather not, and instead just declare that users should not
217
        # modify the return value.
218
        return mapping
219
220
    def _gen_revno_map(self):
221
        """Create a new mapping from revision ids to dotted revnos.
222
223
        Dotted revnos are generated based on the current tip in the revision
224
        history.
225
        This is the worker function for get_revision_id_to_revno_map, which
226
        just caches the return value.
227
228
        :return: A dictionary mapping revision_id => dotted revno.
229
        """
230
        last_revision = self.last_revision()
231
        revision_graph = self.repository.get_revision_graph(last_revision)
232
        merge_sorted_revisions = tsort.merge_sort(
233
            revision_graph,
234
            last_revision,
235
            None,
236
            generate_revno=True)
237
        revision_id_to_revno = dict((rev_id, revno)
238
                                    for seq_num, rev_id, depth, revno, end_of_merge
239
                                     in merge_sorted_revisions)
240
        return revision_id_to_revno
241
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
242
    def leave_lock_in_place(self):
243
        """Tell this branch object not to release the physical lock when this
244
        object is unlocked.
245
        
246
        If lock_write doesn't return a token, then this method is not supported.
247
        """
248
        self.control_files.leave_in_place()
249
250
    def dont_leave_lock_in_place(self):
251
        """Tell this branch object to release the physical lock when this
252
        object is unlocked, even if it didn't originally acquire it.
253
254
        If lock_write doesn't return a token, then this method is not supported.
255
        """
256
        self.control_files.dont_leave_in_place()
257
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
258
    def abspath(self, name):
259
        """Return absolute filename for something in the branch
260
        
261
        XXX: Robert Collins 20051017 what is this used for? why is it a branch
262
        method and not a tree method.
263
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
264
        raise NotImplementedError(self.abspath)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
265
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
266
    def bind(self, other):
267
        """Bind the local branch the other branch.
268
269
        :param other: The branch to bind to
270
        :type other: Branch
271
        """
272
        raise errors.UpgradeRequired(self.base)
273
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.
274
    @needs_write_lock
275
    def fetch(self, from_branch, last_revision=None, pb=None):
276
        """Copy revisions from from_branch into this branch.
277
278
        :param from_branch: Where to copy from.
279
        :param last_revision: What revision to stop at (None for at the end
280
                              of the branch.
281
        :param pb: An optional progress bar to use.
282
283
        Returns the copied revision count and the failed revisions in a tuple:
284
        (copied, failures).
285
        """
286
        if self.base == from_branch.base:
1558.4.11 by Aaron Bentley
Allow merge against self, make fetching self a noop
287
            return (0, [])
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.
288
        if pb is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
289
            nested_pb = ui.ui_factory.nested_progress_bar()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
290
            pb = nested_pb
291
        else:
292
            nested_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.
293
294
        from_branch.lock_read()
295
        try:
296
            if last_revision is None:
297
                pb.update('get source history')
2230.3.9 by Aaron Bentley
Fix most fetch tests
298
                last_revision = from_branch.last_revision()
299
                if last_revision is None:
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
300
                    last_revision = _mod_revision.NULL_REVISION
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.
301
            return self.repository.fetch(from_branch.repository,
302
                                         revision_id=last_revision,
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
303
                                         pb=nested_pb)
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.
304
        finally:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
305
            if nested_pb is not None:
306
                nested_pb.finished()
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.
307
            from_branch.unlock()
308
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
309
    def get_bound_location(self):
1558.7.6 by Aaron Bentley
Fixed typo (Olaf Conradi)
310
        """Return the URL of the branch we are bound to.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
311
312
        Older format branches cannot bind, please be sure to use a metadir
313
        branch.
314
        """
315
        return None
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
316
    
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
317
    def get_old_bound_location(self):
318
        """Return the URL of the branch we used to be bound to
319
        """
320
        raise errors.UpgradeRequired(self.base)
321
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
322
    def get_commit_builder(self, parents, config=None, timestamp=None, 
323
                           timezone=None, committer=None, revprops=None, 
324
                           revision_id=None):
325
        """Obtain a CommitBuilder for this branch.
326
        
327
        :param parents: Revision ids of the parents of the new revision.
328
        :param config: Optional configuration to use.
329
        :param timestamp: Optional timestamp recorded for commit.
330
        :param timezone: Optional timezone for timestamp.
331
        :param committer: Optional committer to set for commit.
332
        :param revprops: Optional dictionary of revision properties.
333
        :param revision_id: Optional revision id.
334
        """
335
336
        if config is None:
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
337
            config = self.get_config()
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
338
        
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
339
        return self.repository.get_commit_builder(self, parents, config,
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
340
            timestamp, timezone, committer, revprops, revision_id)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
341
342
    def get_master_branch(self):
343
        """Return the branch we are bound to.
344
        
345
        :return: Either a Branch, or None
346
        """
347
        return None
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
348
1770.3.2 by Jelmer Vernooij
Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic.
349
    def get_revision_delta(self, revno):
350
        """Return the delta for one revision.
351
352
        The delta is relative to its mainline predecessor, or the
353
        empty tree for revision 1.
354
        """
355
        assert isinstance(revno, int)
356
        rh = self.revision_history()
357
        if not (1 <= revno <= len(rh)):
358
            raise InvalidRevisionNumber(revno)
359
        return self.repository.get_revision_delta(rh[revno-1])
360
1551.13.5 by Aaron Bentley
Deprecate Branch.get_root_id
361
    @deprecated_method(zero_sixteen)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
362
    def get_root_id(self):
1551.13.5 by Aaron Bentley
Deprecate Branch.get_root_id
363
        """Return the id of this branches root
364
365
        Deprecated: branches don't have root ids-- trees do.
366
        Use basis_tree().get_root_id() instead.
367
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
368
        raise NotImplementedError(self.get_root_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
369
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
370
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
371
        """Print `file` to stdout."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
372
        raise NotImplementedError(self.print_file)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
373
374
    def append_revision(self, *revision_ids):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
375
        raise NotImplementedError(self.append_revision)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
376
377
    def set_revision_history(self, rev_history):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
378
        raise NotImplementedError(self.set_revision_history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
379
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
380
    def _cache_revision_history(self, rev_history):
381
        """Set the cached revision history to rev_history.
382
383
        The revision_history method will use this cache to avoid regenerating
384
        the revision history.
385
386
        This API is semi-public; it only for use by subclasses, all other code
387
        should consider it to be private.
388
        """
389
        self._revision_history_cache = rev_history
390
2418.5.6 by John Arbash Meinel
Cache the revision_id => revno map as appropriate.
391
    def _cache_revision_id_to_revno(self, revision_id_to_revno):
392
        """Set the cached revision_id => revno map to revision_id_to_revno.
393
394
        This API is semi-public; it only for use by subclasses, all other code
395
        should consider it to be private.
396
        """
397
        self._revision_id_to_revno_cache = revision_id_to_revno
398
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
399
    def _clear_cached_state(self):
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
400
        """Clear any cached data on this branch, e.g. cached revision history.
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
401
402
        This means the next call to revision_history will need to call
403
        _gen_revision_history.
404
405
        This API is semi-public; it only for use by subclasses, all other code
406
        should consider it to be private.
407
        """
408
        self._revision_history_cache = None
2418.5.6 by John Arbash Meinel
Cache the revision_id => revno map as appropriate.
409
        self._revision_id_to_revno_cache = None
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
410
411
    def _gen_revision_history(self):
412
        """Return sequence of revision hashes on to this branch.
413
        
414
        Unlike revision_history, this method always regenerates or rereads the
415
        revision history, i.e. it does not cache the result, so repeated calls
416
        may be expensive.
417
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
418
        Concrete subclasses should override this instead of revision_history so
419
        that subclasses do not need to deal with caching logic.
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
420
        
421
        This API is semi-public; it only for use by subclasses, all other code
422
        should consider it to be private.
423
        """
424
        raise NotImplementedError(self._gen_revision_history)
425
426
    @needs_read_lock
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
427
    def revision_history(self):
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
428
        """Return sequence of revision hashes on to this branch.
429
        
430
        This method will cache the revision history for as long as it is safe to
431
        do so.
432
        """
433
        if self._revision_history_cache is not None:
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
434
            history = self._revision_history_cache
435
        else:
436
            history = self._gen_revision_history()
437
            self._cache_revision_history(history)
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
438
        return list(history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
439
440
    def revno(self):
441
        """Return current revision number for this branch.
442
443
        That is equivalent to the number of revisions committed to
444
        this branch.
445
        """
446
        return len(self.revision_history())
447
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
448
    def unbind(self):
449
        """Older format branches cannot bind or unbind."""
450
        raise errors.UpgradeRequired(self.base)
451
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
452
    def set_append_revisions_only(self, enabled):
453
        """Older format branches are never restricted to append-only"""
2230.3.32 by Aaron Bentley
Implement strict history policy
454
        raise errors.UpgradeRequired(self.base)
455
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
456
    def last_revision(self):
1819.1.7 by Martin Pool
Fix up code to get revision_id of bzr for benchmark log file
457
        """Return last revision id, or None"""
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
458
        ph = self.revision_history()
459
        if ph:
460
            return ph[-1]
461
        else:
462
            return None
463
2249.4.1 by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow
464
    def last_revision_info(self):
465
        """Return information about the last revision.
466
467
        :return: A tuple (revno, last_revision_id).
468
        """
469
        rh = self.revision_history()
470
        revno = len(rh)
471
        if revno:
472
            return (revno, rh[-1])
473
        else:
474
            return (0, _mod_revision.NULL_REVISION)
475
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
476
    def missing_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
477
        """Return a list of new revisions that would perfectly fit.
478
        
479
        If self and other have not diverged, return a list of the revisions
480
        present in other, but missing from self.
481
        """
482
        self_history = self.revision_history()
483
        self_len = len(self_history)
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
484
        other_history = other.revision_history()
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
485
        other_len = len(other_history)
486
        common_index = min(self_len, other_len) -1
487
        if common_index >= 0 and \
488
            self_history[common_index] != other_history[common_index]:
489
            raise DivergedBranches(self, other)
490
491
        if stop_revision is None:
492
            stop_revision = other_len
493
        else:
494
            assert isinstance(stop_revision, int)
495
            if stop_revision > other_len:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
496
                raise errors.NoSuchRevision(self, stop_revision)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
497
        return other_history[self_len:stop_revision]
1185.66.1 by Aaron Bentley
Merged from mainline
498
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
499
    def update_revisions(self, other, stop_revision=None):
1505.1.16 by John Arbash Meinel
[merge] robertc's integration, updated tests to check for retcode=3
500
        """Pull in new perfect-fit revisions.
501
502
        :param other: Another Branch to pull from
503
        :param stop_revision: Updated until the given revision
504
        :return: None
505
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
506
        raise NotImplementedError(self.update_revisions)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
507
508
    def revision_id_to_revno(self, revision_id):
509
        """Given a revision id, return its revno"""
510
        if revision_id is None:
511
            return 0
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
512
        revision_id = osutils.safe_revision_id(revision_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
513
        history = self.revision_history()
514
        try:
515
            return history.index(revision_id) + 1
516
        except ValueError:
2418.5.5 by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno
517
            raise errors.NoSuchRevision(self, revision_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
518
519
    def get_rev_id(self, revno, history=None):
520
        """Find the revision id of the specified revno."""
521
        if revno == 0:
522
            return None
523
        if history is None:
524
            history = self.revision_history()
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
525
        if revno <= 0 or revno > len(history):
2418.5.5 by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno
526
            raise errors.NoSuchRevision(self, revno)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
527
        return history[revno - 1]
528
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
529
    def pull(self, source, overwrite=False, stop_revision=None):
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
530
        """Mirror source into this branch.
531
532
        This branch is considered to be 'local', having low latency.
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
533
534
        :returns: PullResult instance
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
535
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
536
        raise NotImplementedError(self.pull)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
537
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
538
    def push(self, target, overwrite=False, stop_revision=None):
539
        """Mirror this branch into target.
540
541
        This branch is considered to be 'local', having low latency.
542
        """
543
        raise NotImplementedError(self.push)
544
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
545
    def basis_tree(self):
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
546
        """Return `Tree` object for last revision."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
547
        return self.repository.revision_tree(self.last_revision())
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
548
549
    def rename_one(self, from_rel, to_rel):
550
        """Rename one file.
551
552
        This can change the directory or the filename or both.
553
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
554
        raise NotImplementedError(self.rename_one)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
555
556
    def move(self, from_paths, to_name):
557
        """Rename files.
558
559
        to_name must exist as a versioned directory.
560
561
        If to_name exists and is a directory, the files are moved into
562
        it, keeping their old names.  If it is a directory, 
563
564
        Note that to_name is only the last component of the new name;
565
        this doesn't change the directory.
566
567
        This returns a list of (from_path, to_path) pairs for each
568
        entry that is moved.
569
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
570
        raise NotImplementedError(self.move)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
571
572
    def get_parent(self):
573
        """Return the parent location of the branch.
574
575
        This is the default location for push/pull/missing.  The usual
576
        pattern is that the user can override it by specifying a
577
        location.
578
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
579
        raise NotImplementedError(self.get_parent)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
580
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
581
    def _set_config_location(self, name, url, config=None,
582
                             make_relative=False):
583
        if config is None:
584
            config = self.get_config()
585
        if url is None:
586
            url = ''
587
        elif make_relative:
588
            url = urlutils.relative_url(self.base, url)
589
        config.set_user_option(name, url)
590
591
    def _get_config_location(self, name, config=None):
592
        if config is None:
593
            config = self.get_config()
594
        location = config.get_user_option(name)
595
        if location == '':
596
            location = None
597
        return location
598
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
599
    def get_submit_branch(self):
600
        """Return the submit location of the branch.
601
602
        This is the default location for bundle.  The usual
603
        pattern is that the user can override it by specifying a
604
        location.
605
        """
606
        return self.get_config().get_user_option('submit_branch')
607
608
    def set_submit_branch(self, location):
609
        """Return the submit location of the branch.
610
611
        This is the default location for bundle.  The usual
612
        pattern is that the user can override it by specifying a
613
        location.
614
        """
615
        self.get_config().set_user_option('submit_branch', location)
616
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
617
    def get_public_branch(self):
618
        """Return the public location of the branch.
619
620
        This is is used by merge directives.
621
        """
622
        return self._get_config_location('public_branch')
623
624
    def set_public_branch(self, location):
625
        """Return the submit location of the branch.
626
627
        This is the default location for bundle.  The usual
628
        pattern is that the user can override it by specifying a
629
        location.
630
        """
631
        self._set_config_location('public_branch', location)
632
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
633
    def get_push_location(self):
634
        """Return the None or the location to push this branch to."""
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
635
        push_loc = self.get_config().get_user_option('push_location')
636
        return push_loc
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
637
638
    def set_push_location(self, location):
639
        """Set a new push location for this branch."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
640
        raise NotImplementedError(self.set_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
641
642
    def set_parent(self, url):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
643
        raise NotImplementedError(self.set_parent)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
644
1587.1.10 by Robert Collins
update updates working tree and branch together.
645
    @needs_write_lock
646
    def update(self):
647
        """Synchronise this branch with the master branch if any. 
648
649
        :return: None or the last_revision pivoted out during the update.
650
        """
651
        return None
652
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
653
    def check_revno(self, revno):
654
        """\
655
        Check whether a revno corresponds to any revision.
656
        Zero (the NULL revision) is considered valid.
657
        """
658
        if revno != 0:
659
            self.check_real_revno(revno)
660
            
661
    def check_real_revno(self, revno):
662
        """\
663
        Check whether a revno corresponds to a real revision.
664
        Zero (the NULL revision) is considered invalid
665
        """
666
        if revno < 1 or revno > self.revno():
667
            raise InvalidRevisionNumber(revno)
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.
668
669
    @needs_read_lock
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
670
    def clone(self, to_bzrdir, revision_id=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.
671
        """Clone this branch into to_bzrdir preserving all semantic values.
672
        
673
        revision_id: if not None, the revision history in the new branch will
674
                     be truncated to end with revision_id.
675
        """
676
        result = self._format.initialize(to_bzrdir)
677
        self.copy_content_into(result, revision_id=revision_id)
678
        return  result
679
680
    @needs_read_lock
681
    def sprout(self, to_bzrdir, revision_id=None):
682
        """Create a new line of development from the branch, into to_bzrdir.
683
        
684
        revision_id: if not None, the revision history in the new branch will
685
                     be truncated to end with revision_id.
686
        """
687
        result = self._format.initialize(to_bzrdir)
688
        self.copy_content_into(result, revision_id=revision_id)
689
        result.set_parent(self.bzrdir.root_transport.base)
690
        return result
691
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
692
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
693
        """Synchronize last revision and revision history between branches.
694
695
        This version is most efficient when the destination is also a
696
        BzrBranch5, but works for BzrBranch6 as long as the revision
697
        history is the true lefthand parent history, and all of the revisions
698
        are in the destination's repository.  If not, set_revision_history
699
        will fail.
700
701
        :param destination: The branch to copy the history into
702
        :param revision_id: The revision-id to truncate history at.  May
703
          be None to copy complete history.
704
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
705
        new_history = self.revision_history()
706
        if revision_id is not None:
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
707
            revision_id = osutils.safe_revision_id(revision_id)
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
708
            try:
709
                new_history = new_history[:new_history.index(revision_id) + 1]
710
            except ValueError:
711
                rev = self.repository.get_revision(revision_id)
712
                new_history = rev.get_history(self.repository)[1:]
713
        destination.set_revision_history(new_history)
714
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.
715
    @needs_read_lock
716
    def copy_content_into(self, destination, revision_id=None):
717
        """Copy the content of self into destination.
718
719
        revision_id: if not None, the revision history in the new branch will
720
                     be truncated to end with revision_id.
721
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
722
        self._synchronize_history(destination, revision_id)
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
723
        try:
724
            parent = self.get_parent()
725
        except errors.InaccessibleParent, e:
726
            mutter('parent was not accessible to copy: %s', e)
727
        else:
728
            if parent:
729
                destination.set_parent(parent)
2348.2.1 by Marien Zwart
Properly push tags if push creates a new branch.
730
        self.tags.merge_to(destination.tags)
1185.66.1 by Aaron Bentley
Merged from mainline
731
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
732
    @needs_read_lock
733
    def check(self):
734
        """Check consistency of the branch.
735
736
        In particular this checks that revisions given in the revision-history
737
        do actually match up in the revision graph, and that they're all 
738
        present in the repository.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
739
        
740
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
741
742
        :return: A BranchCheckResult.
743
        """
744
        mainline_parent_id = None
745
        for revision_id in self.revision_history():
746
            try:
747
                revision = self.repository.get_revision(revision_id)
748
            except errors.NoSuchRevision, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
749
                raise errors.BzrCheckError("mainline revision {%s} not in repository"
750
                            % revision_id)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
751
            # In general the first entry on the revision history has no parents.
752
            # But it's not illegal for it to have parents listed; this can happen
753
            # in imports from Arch when the parents weren't reachable.
754
            if mainline_parent_id is not None:
755
                if mainline_parent_id not in revision.parent_ids:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
756
                    raise errors.BzrCheckError("previous revision {%s} not listed among "
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
757
                                        "parents of {%s}"
758
                                        % (mainline_parent_id, revision_id))
759
            mainline_parent_id = revision_id
760
        return BranchCheckResult(self)
761
1910.2.39 by Aaron Bentley
Fix checkout bug
762
    def _get_checkout_format(self):
763
        """Return the most suitable metadir for a checkout of this branch.
2018.5.87 by Andrew Bennetts
Make make_branch_and_tree fall back to creating a local checkout if the transport doesn't support working trees, allowing several more Remote tests to pass.
764
        Weaves are used if this branch's repository uses weaves.
1910.2.39 by Aaron Bentley
Fix checkout bug
765
        """
2018.5.89 by Andrew Bennetts
Fix thinko in _get_checkout_format; checkouts for RemoteBranches should be in the default bzrdir/repo format, of course. Thanks Robert.
766
        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
767
            from bzrlib.repofmt import weaverepo
1910.2.39 by Aaron Bentley
Fix checkout bug
768
            format = bzrdir.BzrDirMetaFormat1()
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
769
            format.repository_format = weaverepo.RepositoryFormat7()
1910.2.39 by Aaron Bentley
Fix checkout bug
770
        else:
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
771
            format = self.repository.bzrdir.checkout_metadir()
2370.3.2 by John Arbash Meinel
Use BzrDir.set_branch_format() rather than setting it directly.
772
            format.set_branch_format(self._format)
1910.2.39 by Aaron Bentley
Fix checkout bug
773
        return format
774
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
775
    def create_checkout(self, to_location, revision_id=None,
1551.8.5 by Aaron Bentley
Change name to create_checkout
776
                        lightweight=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
777
        """Create a checkout of a branch.
778
        
779
        :param to_location: The url to produce the checkout at
780
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
781
        :param lightweight: If True, produce a lightweight checkout, otherwise,
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
782
        produce a bound branch (heavyweight checkout)
783
        :return: The tree of the created checkout
784
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
785
        t = transport.get_transport(to_location)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
786
        t.ensure_base()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
787
        if lightweight:
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
788
            format = self._get_checkout_format()
789
            checkout = format.initialize_on_transport(t)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
790
            BranchReferenceFormat().initialize(checkout, self)
791
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
792
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
793
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
794
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
795
            checkout = checkout_branch.bzrdir
796
            checkout_branch.bind(self)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
797
            # pull up to the specified revision_id to set the initial 
798
            # branch tip correctly, and seed it with history.
799
            checkout_branch.pull(self, stop_revision=revision_id)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
800
        tree = checkout.create_workingtree(revision_id)
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
801
        basis_tree = tree.basis_tree()
802
        basis_tree.lock_read()
803
        try:
804
            for path, file_id in basis_tree.iter_references():
805
                reference_parent = self.reference_parent(file_id, path)
806
                reference_parent.create_checkout(tree.abspath(path),
807
                    basis_tree.get_reference_revision(file_id, path),
808
                    lightweight)
809
        finally:
810
            basis_tree.unlock()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
811
        return tree
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
812
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
813
    def reference_parent(self, file_id, path):
2100.3.29 by Aaron Bentley
Get merge working initially
814
        """Return the parent branch for a tree-reference file_id
815
        :param file_id: The file_id of the tree reference
816
        :param path: The path of the file_id in the tree
817
        :return: A branch associated with the file_id
818
        """
819
        # FIXME should provide multiple branches, based on config
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
820
        return Branch.open(self.bzrdir.root_transport.clone(path).base)
821
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
822
    def supports_tags(self):
823
        return self._format.supports_tags()
824
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
825
826
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
827
    """An encapsulation of the initialization and open routines for a format.
828
829
    Formats provide three things:
830
     * An initialization routine,
831
     * a format string,
832
     * an open routine.
833
834
    Formats are placed in an dict by their format string for reference 
835
    during branch opening. Its not required that these be instances, they
836
    can be classes themselves with class methods - it simply depends on 
837
    whether state is needed for a given format or not.
838
839
    Once a format is deprecated, just deprecate the initialize and open
840
    methods on the format class. Do not deprecate the object, as the 
841
    object will be created every time regardless.
842
    """
843
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
844
    _default_format = None
845
    """The default format used for new branches."""
846
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
847
    _formats = {}
848
    """The known formats."""
849
2363.5.5 by Aaron Bentley
add info.describe_format
850
    def __eq__(self, other):
851
        return self.__class__ is other.__class__
852
853
    def __ne__(self, other):
854
        return not (self == other)
855
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
856
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
857
    def find_format(klass, a_bzrdir):
858
        """Return the format for the branch object in a_bzrdir."""
859
        try:
860
            transport = a_bzrdir.get_branch_transport(None)
861
            format_string = transport.get("format").read()
862
            return klass._formats[format_string]
863
        except NoSuchFile:
864
            raise NotBranchError(path=transport.base)
865
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
866
            raise errors.UnknownFormatError(format=format_string)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
867
868
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
869
    def get_default_format(klass):
870
        """Return the current default format."""
871
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
872
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
873
    def get_reference(self, a_bzrdir):
874
        """Get the target reference of the branch in a_bzrdir.
875
876
        format probing must have been completed before calling
877
        this method - it is assumed that the format of the branch
878
        in a_bzrdir is correct.
879
880
        :param a_bzrdir: The bzrdir to get the branch data from.
881
        :return: None if the branch is not a reference branch.
882
        """
883
        return None
884
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
885
    def get_format_string(self):
886
        """Return the ASCII format string that identifies this format."""
887
        raise NotImplementedError(self.get_format_string)
888
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
889
    def get_format_description(self):
890
        """Return the short format description for this format."""
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
891
        raise NotImplementedError(self.get_format_description)
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
892
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
893
    def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
894
                           set_format=True):
895
        """Initialize a branch in a bzrdir, with specified files
896
897
        :param a_bzrdir: The bzrdir to initialize the branch in
898
        :param utf8_files: The files to create as a list of
899
            (filename, content) tuples
900
        :param set_format: If True, set the format with
901
            self.get_format_string.  (BzrBranch4 has its format set
902
            elsewhere)
903
        :return: a branch in this format
904
        """
905
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
906
        branch_transport = a_bzrdir.get_branch_transport(self)
907
        lock_map = {
908
            'metadir': ('lock', lockdir.LockDir),
909
            'branch4': ('branch-lock', lockable_files.TransportLock),
910
        }
911
        lock_name, lock_class = lock_map[lock_type]
912
        control_files = lockable_files.LockableFiles(branch_transport,
913
            lock_name, lock_class)
914
        control_files.create_lock()
915
        control_files.lock_write()
916
        if set_format:
917
            control_files.put_utf8('format', self.get_format_string())
918
        try:
919
            for file, content in utf8_files:
920
                control_files.put_utf8(file, content)
921
        finally:
922
            control_files.unlock()
923
        return self.open(a_bzrdir, _found=True)
924
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
925
    def initialize(self, a_bzrdir):
926
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
927
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
928
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
929
    def is_supported(self):
930
        """Is this format supported?
931
932
        Supported formats can be initialized and opened.
933
        Unsupported formats may not support initialization or committing or 
934
        some other features depending on the reason for not being supported.
935
        """
936
        return True
937
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
938
    def open(self, a_bzrdir, _found=False):
939
        """Return the branch object for a_bzrdir
940
941
        _found is a private parameter, do not use it. It is used to indicate
942
               if format probing has already be done.
943
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
944
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
945
946
    @classmethod
947
    def register_format(klass, format):
948
        klass._formats[format.get_format_string()] = format
949
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
950
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
951
    def set_default_format(klass, format):
952
        klass._default_format = format
953
954
    @classmethod
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
955
    def unregister_format(klass, format):
956
        assert klass._formats[format.get_format_string()] is format
957
        del klass._formats[format.get_format_string()]
958
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
959
    def __str__(self):
960
        return self.get_format_string().rstrip()
961
2220.2.10 by Martin Pool
(broken) start moving things to branches
962
    def supports_tags(self):
963
        """True if this format supports tags stored in the branch"""
964
        return False  # by default
965
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
966
    # XXX: Probably doesn't really belong here -- mbp 20070212
2220.2.10 by Martin Pool
(broken) start moving things to branches
967
    def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
968
            lock_class):
969
        branch_transport = a_bzrdir.get_branch_transport(self)
970
        control_files = lockable_files.LockableFiles(branch_transport,
971
            lock_filename, lock_class)
972
        control_files.create_lock()
973
        control_files.lock_write()
974
        try:
975
            for filename, content in utf8_files:
976
                control_files.put_utf8(filename, content)
977
        finally:
978
            control_files.unlock()
979
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
980
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
981
class BranchHooks(Hooks):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
982
    """A dictionary mapping hook name to a list of callables for branch hooks.
983
    
984
    e.g. ['set_rh'] Is the list of items to be called when the
985
    set_revision_history function is invoked.
986
    """
987
988
    def __init__(self):
989
        """Create the default hooks.
990
991
        These are all empty initially, because by default nothing should get
992
        notified.
993
        """
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
994
        Hooks.__init__(self)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
995
        # Introduced in 0.15:
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
996
        # invoked whenever the revision history has been set
997
        # with set_revision_history. The api signature is
998
        # (branch, revision_history), and the branch will
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
999
        # be write-locked.
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1000
        self['set_rh'] = []
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1001
        # invoked after a push operation completes.
1002
        # the api signature is
2297.1.5 by Martin Pool
Update hook docs
1003
        # (push_result)
1004
        # containing the members
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1005
        # (source, local, master, old_revno, old_revid, new_revno, new_revid)
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1006
        # where local is the local target branch or None, master is the target 
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1007
        # master branch, and the rest should be self explanatory. The source
1008
        # is read locked and the target branches write locked. Source will
1009
        # be the local low-latency branch.
1010
        self['post_push'] = []
1011
        # invoked after a pull operation completes.
1012
        # the api signature is
2297.1.5 by Martin Pool
Update hook docs
1013
        # (pull_result)
1014
        # containing the members
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1015
        # (source, local, master, old_revno, old_revid, new_revno, new_revid)
1016
        # where local is the local branch or None, master is the target 
1017
        # master branch, and the rest should be self explanatory. The source
1018
        # is read locked and the target branches write locked. The local
1019
        # branch is the low-latency branch.
1020
        self['post_pull'] = []
1021
        # invoked after a commit operation completes.
1022
        # the api signature is 
1023
        # (local, master, old_revno, old_revid, new_revno, new_revid)
1024
        # old_revid is NULL_REVISION for the first commit to a branch.
1025
        self['post_commit'] = []
1026
        # invoked after a uncommit operation completes.
1027
        # the api signature is
1028
        # (local, master, old_revno, old_revid, new_revno, new_revid) where
1029
        # local is the local branch or None, master is the target branch,
1030
        # and an empty branch recieves new_revno of 0, new_revid of None.
1031
        self['post_uncommit'] = []
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1032
1033
1034
# install the default hooks into the Branch class.
1035
Branch.hooks = BranchHooks()
1036
1037
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1038
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1039
    """Bzr branch format 4.
1040
1041
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1042
     - a revision-history file.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1043
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1044
    """
1045
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1046
    def get_format_description(self):
1047
        """See BranchFormat.get_format_description()."""
1048
        return "Branch format 4"
1049
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1050
    def initialize(self, a_bzrdir):
1051
        """Create a branch of this format in a_bzrdir."""
1052
        utf8_files = [('revision-history', ''),
1053
                      ('branch-name', ''),
1054
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1055
        return self._initialize_helper(a_bzrdir, utf8_files,
1056
                                       lock_type='branch4', set_format=False)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1057
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1058
    def __init__(self):
1059
        super(BzrBranchFormat4, self).__init__()
1060
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1061
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1062
    def open(self, a_bzrdir, _found=False):
1063
        """Return the branch object for a_bzrdir
1064
1065
        _found is a private parameter, do not use it. It is used to indicate
1066
               if format probing has already be done.
1067
        """
1068
        if not _found:
1069
            # we are being called directly and must probe.
1070
            raise NotImplementedError
1071
        return BzrBranch(_format=self,
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
1072
                         _control_files=a_bzrdir._control_files,
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
1073
                         a_bzrdir=a_bzrdir,
1074
                         _repository=a_bzrdir.open_repository())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1075
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1076
    def __str__(self):
1077
        return "Bazaar-NG branch format 4"
1078
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1079
1080
class BzrBranchFormat5(BranchFormat):
1081
    """Bzr branch format 5.
1082
1083
    This format has:
1084
     - a revision-history file.
1085
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1086
     - a lock dir guarding the branch itself
1087
     - all of this stored in a branch/ subdirectory
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
1088
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1089
1090
    This format is new in bzr 0.8.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1091
    """
1092
1093
    def get_format_string(self):
1094
        """See BranchFormat.get_format_string()."""
1095
        return "Bazaar-NG branch format 5\n"
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1096
1097
    def get_format_description(self):
1098
        """See BranchFormat.get_format_description()."""
1099
        return "Branch format 5"
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1100
        
1101
    def initialize(self, a_bzrdir):
1102
        """Create a branch of this format in a_bzrdir."""
1103
        utf8_files = [('revision-history', ''),
1104
                      ('branch-name', ''),
1105
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1106
        return self._initialize_helper(a_bzrdir, utf8_files)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1107
1108
    def __init__(self):
1109
        super(BzrBranchFormat5, self).__init__()
1110
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1111
1112
    def open(self, a_bzrdir, _found=False):
1113
        """Return the branch object for a_bzrdir
1114
1115
        _found is a private parameter, do not use it. It is used to indicate
1116
               if format probing has already be done.
1117
        """
1118
        if not _found:
1119
            format = BranchFormat.find_format(a_bzrdir)
1120
            assert format.__class__ == self.__class__
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1121
        try:
1122
            transport = a_bzrdir.get_branch_transport(None)
1752.2.86 by Andrew Bennetts
Merge from bzr.dev.
1123
            control_files = lockable_files.LockableFiles(transport, 'lock',
1124
                                                         lockdir.LockDir)
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1125
            return BzrBranch5(_format=self,
1126
                              _control_files=control_files,
1127
                              a_bzrdir=a_bzrdir,
1128
                              _repository=a_bzrdir.find_repository())
1129
        except NoSuchFile:
1130
            raise NotBranchError(path=transport.base)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1131
2220.2.10 by Martin Pool
(broken) start moving things to branches
1132
2230.3.1 by Aaron Bentley
Get branch6 creation working
1133
class BzrBranchFormat6(BzrBranchFormat5):
1134
    """Branch format with last-revision
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1135
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
1136
    Unlike previous formats, this has no explicit revision history. Instead,
1137
    this just stores the last-revision, and the left-hand history leading
1138
    up to there is the history.
1139
1140
    This format was introduced in bzr 0.15
2230.3.1 by Aaron Bentley
Get branch6 creation working
1141
    """
1142
1143
    def get_format_string(self):
1144
        """See BranchFormat.get_format_string()."""
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
1145
        return "Bazaar Branch Format 6 (bzr 0.15)\n"
2230.3.1 by Aaron Bentley
Get branch6 creation working
1146
1147
    def get_format_description(self):
1148
        """See BranchFormat.get_format_description()."""
1149
        return "Branch format 6"
1150
1151
    def initialize(self, a_bzrdir):
1152
        """Create a branch of this format in a_bzrdir."""
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1153
        utf8_files = [('last-revision', '0 null:\n'),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1154
                      ('branch-name', ''),
2220.2.28 by Martin Pool
Integrate tags with Branch6:
1155
                      ('branch.conf', ''),
1156
                      ('tags', ''),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1157
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1158
        return self._initialize_helper(a_bzrdir, utf8_files)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1159
1160
    def open(self, a_bzrdir, _found=False):
1161
        """Return the branch object for a_bzrdir
1162
1163
        _found is a private parameter, do not use it. It is used to indicate
1164
               if format probing has already be done.
1165
        """
1166
        if not _found:
1167
            format = BranchFormat.find_format(a_bzrdir)
1168
            assert format.__class__ == self.__class__
1169
        transport = a_bzrdir.get_branch_transport(None)
1170
        control_files = lockable_files.LockableFiles(transport, 'lock',
1171
                                                     lockdir.LockDir)
1172
        return BzrBranch6(_format=self,
1173
                          _control_files=control_files,
1174
                          a_bzrdir=a_bzrdir,
1175
                          _repository=a_bzrdir.find_repository())
1176
2220.2.27 by Martin Pool
Start adding tags to Branch6
1177
    def supports_tags(self):
1178
        return True
1179
2230.3.1 by Aaron Bentley
Get branch6 creation working
1180
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.
1181
class BranchReferenceFormat(BranchFormat):
1182
    """Bzr branch reference format.
1183
1184
    Branch references are used in implementing checkouts, they
1185
    act as an alias to the real branch which is at some other url.
1186
1187
    This format has:
1188
     - A location file
1189
     - a format string
1190
    """
1191
1192
    def get_format_string(self):
1193
        """See BranchFormat.get_format_string()."""
1194
        return "Bazaar-NG Branch Reference Format 1\n"
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1195
1196
    def get_format_description(self):
1197
        """See BranchFormat.get_format_description()."""
1198
        return "Checkout reference format 1"
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.
1199
        
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1200
    def get_reference(self, a_bzrdir):
1201
        """See BranchFormat.get_reference()."""
1202
        transport = a_bzrdir.get_branch_transport(None)
1203
        return transport.get('location').read()
1204
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.
1205
    def initialize(self, a_bzrdir, target_branch=None):
1206
        """Create a branch of this format in a_bzrdir."""
1207
        if target_branch is None:
1208
            # this format does not implement branch itself, thus the implicit
1209
            # creation contract must see it as uninitializable
1210
            raise errors.UninitializableFormat(self)
1211
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
1212
        branch_transport = a_bzrdir.get_branch_transport(self)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
1213
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
1214
            target_branch.bzrdir.root_transport.base)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
1215
        branch_transport.put_bytes('format', self.get_format_string())
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.
1216
        return self.open(a_bzrdir, _found=True)
1217
1218
    def __init__(self):
1219
        super(BranchReferenceFormat, self).__init__()
1220
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1221
1222
    def _make_reference_clone_function(format, a_branch):
1223
        """Create a clone() routine for a branch dynamically."""
1224
        def clone(to_bzrdir, revision_id=None):
1225
            """See Branch.clone()."""
1226
            return format.initialize(to_bzrdir, a_branch)
1227
            # cannot obey revision_id limits when cloning a reference ...
1228
            # FIXME RBC 20060210 either nuke revision_id for clone, or
1229
            # emit some sort of warning/error to the caller ?!
1230
        return clone
1231
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
1232
    def open(self, a_bzrdir, _found=False, location=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.
1233
        """Return the branch that the branch reference in a_bzrdir points at.
1234
1235
        _found is a private parameter, do not use it. It is used to indicate
1236
               if format probing has already be done.
1237
        """
1238
        if not _found:
1239
            format = BranchFormat.find_format(a_bzrdir)
1240
            assert format.__class__ == self.__class__
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
1241
        if location is None:
1242
            location = self.get_reference(a_bzrdir)
1243
        real_bzrdir = bzrdir.BzrDir.open(location)
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.
1244
        result = real_bzrdir.open_branch()
1245
        # this changes the behaviour of result.clone to create a new reference
1246
        # rather than a copy of the content of the branch.
1247
        # I did not use a proxy object because that needs much more extensive
1248
        # testing, and we are only changing one behaviour at the moment.
1249
        # If we decide to alter more behaviours - i.e. the implicit nickname
1250
        # then this should be refactored to introduce a tested proxy branch
1251
        # and a subclass of that for use in overriding clone() and ....
1252
        # - RBC 20060210
1253
        result.clone = self._make_reference_clone_function(result)
1254
        return result
1255
1256
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1257
# formats which have no format string are not discoverable
1258
# and not independently creatable, so are not registered.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1259
__default_format = BzrBranchFormat5()
1260
BranchFormat.register_format(__default_format)
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.
1261
BranchFormat.register_format(BranchReferenceFormat())
2230.3.1 by Aaron Bentley
Get branch6 creation working
1262
BranchFormat.register_format(BzrBranchFormat6())
2230.3.28 by Aaron Bentley
Restore default formats
1263
BranchFormat.set_default_format(__default_format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1264
_legacy_formats = [BzrBranchFormat4(),
1265
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1266
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
1267
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1268
    """A branch stored in the actual filesystem.
1269
1270
    Note that it's "local" in the context of the filesystem; it doesn't
1271
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
1272
    it's writable, and can be accessed via the normal filesystem API.
1 by mbp at sourcefrog
import from baz patch-364
1273
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
1274
    
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
1275
    def __init__(self, _format=None,
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
1276
                 _control_files=None, a_bzrdir=None, _repository=None):
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
1277
        """Create new branch object at a particular location."""
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
1278
        Branch.__init__(self)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1279
        if a_bzrdir is None:
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
1280
            raise ValueError('a_bzrdir must be supplied')
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1281
        else:
1282
            self.bzrdir = a_bzrdir
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1283
        # self._transport used to point to the directory containing the
1284
        # control directory, but was not used - now it's just the transport
1285
        # for the branch control files.  mbp 20070212
1286
        self._base = self.bzrdir.transport.clone('..').base
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1287
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
1288
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1289
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
1290
        self.control_files = _control_files
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1291
        self._transport = _control_files._transport
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
1292
        self.repository = _repository
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1293
1 by mbp at sourcefrog
import from baz patch-364
1294
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1295
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
1296
1297
    __repr__ = __str__
1298
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1299
    def _get_base(self):
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1300
        """Returns the directory containing the control directory."""
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
1301
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1302
1442.1.5 by Robert Collins
Give branch.base a docstring.
1303
    base = property(_get_base, doc="The URL for the root of this branch.")
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
1304
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
1305
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1306
        """See Branch.abspath."""
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1307
        return self.control_files._transport.abspath(name)
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
1308
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1309
1551.13.5 by Aaron Bentley
Deprecate Branch.get_root_id
1310
    @deprecated_method(zero_sixteen)
1508.1.15 by Robert Collins
Merge from mpool.
1311
    @needs_read_lock
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1312
    def get_root_id(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1313
        """See Branch.get_root_id."""
1534.4.28 by Robert Collins
first cut at merge from integration.
1314
        tree = self.repository.revision_tree(self.last_revision())
1315
        return tree.inventory.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
1316
1694.2.6 by Martin Pool
[merge] bzr.dev
1317
    def is_locked(self):
1318
        return self.control_files.is_locked()
1319
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
1320
    def lock_write(self, token=None):
1321
        repo_token = self.repository.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1322
        try:
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
1323
            token = self.control_files.lock_write(token=token)
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1324
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1325
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1326
            raise
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
1327
        return token
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1328
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1329
    def lock_read(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1330
        self.repository.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1331
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1332
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1333
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1334
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1335
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1336
1337
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1338
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1339
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1340
            self.control_files.unlock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1341
        finally:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1342
            self.repository.unlock()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1343
        if not self.control_files.is_locked():
1344
            # we just released the lock
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
1345
            self._clear_cached_state()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1346
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1347
    def peek_lock_mode(self):
1348
        if self.control_files._lock_count == 0:
1349
            return None
1350
        else:
1351
            return self.control_files._lock_mode
1352
1694.2.6 by Martin Pool
[merge] bzr.dev
1353
    def get_physical_lock_status(self):
1354
        return self.control_files.get_physical_lock_status()
1355
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1356
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1357
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1358
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1359
        return self.repository.print_file(file, revision_id)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1360
1361
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
1362
    def append_revision(self, *revision_ids):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1363
        """See Branch.append_revision."""
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1364
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
905 by Martin Pool
- merge aaron's append_multiple.patch
1365
        for revision_id in revision_ids:
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
1366
            _mod_revision.check_not_reserved_id(revision_id)
905 by Martin Pool
- merge aaron's append_multiple.patch
1367
            mutter("add {%s} to revision-history" % revision_id)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1368
        rev_history = self.revision_history()
1369
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1370
        self.set_revision_history(rev_history)
1371
2230.3.49 by Aaron Bentley
Fix cache updating
1372
    def _write_revision_history(self, history):
1373
        """Factored out of set_revision_history.
1374
1375
        This performs the actual writing to disk.
1376
        It is intended to be called by BzrBranch5.set_revision_history."""
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1377
        self.control_files.put_bytes(
2230.3.49 by Aaron Bentley
Fix cache updating
1378
            'revision-history', '\n'.join(history))
1379
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1380
    @needs_write_lock
1381
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1382
        """See Branch.set_revision_history."""
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1383
        rev_history = [osutils.safe_revision_id(r) for r in rev_history]
2418.5.6 by John Arbash Meinel
Cache the revision_id => revno map as appropriate.
1384
        self._clear_cached_state()
2230.3.49 by Aaron Bentley
Fix cache updating
1385
        self._write_revision_history(rev_history)
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1386
        self._cache_revision_history(rev_history)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
1387
        for hook in Branch.hooks['set_rh']:
1388
            hook(self, rev_history)
233 by mbp at sourcefrog
- more output from test.sh
1389
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1390
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1391
    def set_last_revision_info(self, revno, revision_id):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1392
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1393
        history = self._lefthand_history(revision_id)
1394
        assert len(history) == revno, '%d != %d' % (len(history), revno)
1395
        self.set_revision_history(history)
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1396
2230.4.1 by Aaron Bentley
Get log as fast branch5
1397
    def _gen_revision_history(self):
2309.4.11 by John Arbash Meinel
Change Branch5._gen_revision_history() to be a bit faster about reading all revisions.
1398
        history = self.control_files.get('revision-history').read().split('\n')
1399
        if history[-1:] == ['']:
1400
            # There shouldn't be a trailing newline, but just in case.
1401
            history.pop()
2230.4.1 by Aaron Bentley
Get log as fast branch5
1402
        return history
1403
2230.3.2 by Aaron Bentley
Get all branch tests passing
1404
    def _lefthand_history(self, revision_id, last_rev=None,
1405
                          other_branch=None):
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1406
        # stop_revision must be a descendant of last_revision
1407
        stop_graph = self.repository.get_revision_graph(revision_id)
1408
        if last_rev is not None and last_rev not in stop_graph:
1409
            # our previous tip is not merged into stop_revision
1410
            raise errors.DivergedBranches(self, other_branch)
1411
        # make a new revision history from the graph
1412
        current_rev_id = revision_id
1413
        new_history = []
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
1414
        while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1415
            new_history.append(current_rev_id)
1416
            current_rev_id_parents = stop_graph[current_rev_id]
1417
            try:
1418
                current_rev_id = current_rev_id_parents[0]
1419
            except IndexError:
1420
                current_rev_id = None
1421
        new_history.reverse()
2230.3.2 by Aaron Bentley
Get all branch tests passing
1422
        return new_history
1423
1424
    @needs_write_lock
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1425
    def generate_revision_history(self, revision_id, last_rev=None,
2230.3.2 by Aaron Bentley
Get all branch tests passing
1426
        other_branch=None):
1427
        """Create a new revision history that will finish with revision_id.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1428
2230.3.2 by Aaron Bentley
Get all branch tests passing
1429
        :param revision_id: the new tip to use.
1430
        :param last_rev: The previous last_revision. If not None, then this
1431
            must be a ancestory of revision_id, or DivergedBranches is raised.
1432
        :param other_branch: The other branch that DivergedBranches should
1433
            raise with respect to.
1434
        """
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1435
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.2 by Aaron Bentley
Get all branch tests passing
1436
        self.set_revision_history(self._lefthand_history(revision_id,
1437
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1438
1439
    @needs_write_lock
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
1440
    def update_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1441
        """See Branch.update_revisions."""
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1442
        other.lock_read()
1443
        try:
1444
            if stop_revision is None:
1445
                stop_revision = other.last_revision()
1446
                if stop_revision is None:
1447
                    # if there are no commits, we're done.
1448
                    return
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1449
            else:
1450
                stop_revision = osutils.safe_revision_id(stop_revision)
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1451
            # whats the current last revision, before we fetch [and change it
1452
            # possibly]
1453
            last_rev = self.last_revision()
1454
            # we fetch here regardless of whether we need to so that we pickup
1455
            # filled in ghosts.
1456
            self.fetch(other, stop_revision)
1457
            my_ancestry = self.repository.get_ancestry(last_rev)
1458
            if stop_revision in my_ancestry:
1459
                # last_revision is a descendant of stop_revision
1460
                return
1800.1.1 by Robert Collins
(robertc)Merge Branch.generate_revision_history() helper routine to create new revision histories.
1461
            self.generate_revision_history(stop_revision, last_rev=last_rev,
1462
                other_branch=other)
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1463
        finally:
1464
            other.unlock()
1185.12.44 by abentley
Restored branch convergence to bzr pull
1465
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1466
    def basis_tree(self):
1467
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1468
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1469
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1470
    @deprecated_method(zero_eight)
1 by mbp at sourcefrog
import from baz patch-364
1471
    def working_tree(self):
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1472
        """Create a Working tree object for this branch."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1473
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1474
        from bzrlib.transport.local import LocalTransport
1534.4.28 by Robert Collins
first cut at merge from integration.
1475
        if (self.base.find('://') != -1 or 
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1476
            not isinstance(self._transport, LocalTransport)):
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1477
            raise NoWorkingTree(self.base)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1478
        return self.bzrdir.open_workingtree()
1 by mbp at sourcefrog
import from baz patch-364
1479
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1480
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1481
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1482
             _hook_master=None, run_hooks=True):
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1483
        """See Branch.pull.
1484
1485
        :param _hook_master: Private parameter - set the branch to 
1486
            be supplied as the master to push hooks.
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1487
        :param run_hooks: Private parameter - if false, this branch
1488
            is being called because it's the master of the primary branch,
1489
            so it should not run its hooks.
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1490
        """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1491
        result = PullResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1492
        result.source_branch = source
1493
        result.target_branch = self
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1494
        source.lock_read()
1495
        try:
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1496
            result.old_revno, result.old_revid = self.last_revision_info()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1497
            try:
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1498
                self.update_revisions(source, stop_revision)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1499
            except DivergedBranches:
1500
                if not overwrite:
1501
                    raise
1185.50.5 by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
1502
            if overwrite:
1551.10.22 by Aaron Bentley
Fix pull --overwrite for bundles
1503
                if stop_revision is None:
1504
                    stop_revision = source.last_revision()
1505
                self.generate_revision_history(stop_revision)
2220.2.36 by Martin Pool
Push and pull operations now merge tags and report conflicts in their result
1506
            result.tag_conflicts = source.tags.merge_to(self.tags)
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1507
            result.new_revno, result.new_revid = self.last_revision_info()
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1508
            if _hook_master:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1509
                result.master_branch = _hook_master
1510
                result.local_branch = self
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1511
            else:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1512
                result.master_branch = self
1513
                result.local_branch = None
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1514
            if run_hooks:
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1515
                for hook in Branch.hooks['post_pull']:
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1516
                    hook(result)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1517
        finally:
1518
            source.unlock()
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1519
        return result
1 by mbp at sourcefrog
import from baz patch-364
1520
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1521
    def _get_parent_location(self):
1522
        _locs = ['parent', 'pull', 'x-pull']
1523
        for l in _locs:
1524
            try:
1525
                return self.control_files.get(l).read().strip('\n')
1526
            except NoSuchFile:
1527
                pass
1528
        return None
1529
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1530
    @needs_read_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1531
    def push(self, target, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1532
             _override_hook_source_branch=None):
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1533
        """See Branch.push.
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1534
1535
        This is the basic concrete implementation of push()
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1536
1537
        :param _override_hook_source_branch: If specified, run
1538
        the hooks passing this Branch as the source, rather than self.  
1539
        This is for use of RemoteBranch, where push is delegated to the
1540
        underlying vfs-based Branch. 
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1541
        """
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1542
        # TODO: Public option to disable running hooks - should be trivial but
1543
        # needs tests.
1544
        target.lock_write()
1545
        try:
1546
            result = self._push_with_bound_branches(target, overwrite,
1547
                    stop_revision,
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1548
                    _override_hook_source_branch=_override_hook_source_branch)
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1549
            return result
1550
        finally:
1551
            target.unlock()
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1552
1553
    def _push_with_bound_branches(self, target, overwrite,
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1554
            stop_revision,
1555
            _override_hook_source_branch=None):
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1556
        """Push from self into target, and into target's master if any.
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1557
        
1558
        This is on the base BzrBranch class even though it doesn't support 
1559
        bound branches because the *target* might be bound.
1560
        """
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1561
        def _run_hooks():
1562
            if _override_hook_source_branch:
1563
                result.source_branch = _override_hook_source_branch
1564
            for hook in Branch.hooks['post_push']:
1565
                hook(result)
1566
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1567
        bound_location = target.get_bound_location()
1568
        if bound_location and target.base != bound_location:
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1569
            # there is a master branch.
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1570
            #
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1571
            # XXX: Why the second check?  Is it even supported for a branch to
1572
            # be bound to itself? -- mbp 20070507
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1573
            master_branch = target.get_master_branch()
1574
            master_branch.lock_write()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1575
            try:
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1576
                # push into the master from this branch.
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1577
                self._basic_push(master_branch, overwrite, stop_revision)
1578
                # and push into the target branch from this. Note that we push from
1579
                # this branch again, because its considered the highest bandwidth
1580
                # repository.
1581
                result = self._basic_push(target, overwrite, stop_revision)
1582
                result.master_branch = master_branch
1583
                result.local_branch = target
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1584
                _run_hooks()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1585
                return result
1586
            finally:
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1587
                master_branch.unlock()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1588
        else:
1589
            # no master branch
1590
            result = self._basic_push(target, overwrite, stop_revision)
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1591
            # TODO: Why set master_branch and local_branch if there's no
1592
            # binding?  Maybe cleaner to just leave them unset? -- mbp
1593
            # 20070504
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1594
            result.master_branch = target
1595
            result.local_branch = None
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1596
            _run_hooks()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1597
            return result
1598
1599
    def _basic_push(self, target, overwrite, stop_revision):
1600
        """Basic implementation of push without bound branches or hooks.
1601
1602
        Must be called with self read locked and target write locked.
1603
        """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1604
        result = PushResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1605
        result.source_branch = self
1606
        result.target_branch = target
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1607
        result.old_revno, result.old_revid = target.last_revision_info()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1608
        try:
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1609
            target.update_revisions(self, stop_revision)
1610
        except DivergedBranches:
1611
            if not overwrite:
1612
                raise
1613
        if overwrite:
1614
            target.set_revision_history(self.revision_history())
1615
        result.tag_conflicts = self.tags.merge_to(target.tags)
1616
        result.new_revno, result.new_revid = target.last_revision_info()
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1617
        return result
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1618
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1619
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1620
        """See Branch.get_parent."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1621
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1622
        assert self.base[-1] == '/'
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1623
        parent = self._get_parent_location()
1624
        if parent is None:
1625
            return parent
1626
        # This is an old-format absolute path to a local branch
1627
        # turn it into a url
1628
        if parent.startswith('/'):
1629
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1630
        try:
1631
            return urlutils.join(self.base[:-1], parent)
1632
        except errors.InvalidURLJoin, e:
1633
            raise errors.InaccessibleParent(parent, self.base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1634
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1635
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1636
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1637
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1638
            'push_location', location,
1639
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1640
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1641
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1642
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1643
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1644
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1645
        # URLs should never be unicode, even on the local fs,
1646
        # FIXUP this and get_parent in a future branch format bump:
1647
        # read and rewrite the file, and have the new format code read
1648
        # using .get not .get_utf8. RBC 20060125
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1649
        if url is not None:
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
1650
            if isinstance(url, unicode):
1651
                try: 
1652
                    url = url.encode('ascii')
1653
                except UnicodeEncodeError:
2418.5.5 by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno
1654
                    raise errors.InvalidURL(url,
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
1655
                        "Urls must be 7-bit ascii, "
1656
                        "use bzrlib.urlutils.escape")
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1657
            url = urlutils.relative_url(self.base, url)
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1658
        self._set_parent_location(url)
1659
1660
    def _set_parent_location(self, url):
1661
        if url is None:
1662
            self.control_files._transport.delete('parent')
1663
        else:
1664
            assert isinstance(url, str)
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1665
            self.control_files.put_bytes('parent', url + '\n')
1150 by Martin Pool
- add new Branch.set_parent and tests
1666
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1667
    @deprecated_function(zero_nine)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1668
    def tree_config(self):
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1669
        """DEPRECATED; call get_config instead.  
1670
        TreeConfig has become part of BranchConfig."""
1185.35.11 by Aaron Bentley
Added support for branch nicks
1671
        return TreeConfig(self)
1672
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1673
1674
class BzrBranch5(BzrBranch):
1675
    """A format 5 branch. This supports new features over plan branches.
1676
1677
    It has support for a master_branch which is the data for bound branches.
1678
    """
1679
1680
    def __init__(self,
1681
                 _format,
1682
                 _control_files,
1683
                 a_bzrdir,
1684
                 _repository):
1685
        super(BzrBranch5, self).__init__(_format=_format,
1686
                                         _control_files=_control_files,
1687
                                         a_bzrdir=a_bzrdir,
1688
                                         _repository=_repository)
1689
        
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1690
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1691
    def pull(self, source, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1692
             run_hooks=True):
1693
        """Pull from source into self, updating my master if any.
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1694
        
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1695
        :param run_hooks: Private parameter - if false, this branch
1696
            is being called because it's the master of the primary branch,
1697
            so it should not run its hooks.
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1698
        """
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1699
        bound_location = self.get_bound_location()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1700
        master_branch = None
1701
        if bound_location and source.base != bound_location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1702
            # not pulling from master, so we need to update master.
1703
            master_branch = self.get_master_branch()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1704
            master_branch.lock_write()
1705
        try:
1706
            if master_branch:
1707
                # pull from source into master.
1708
                master_branch.pull(source, overwrite, stop_revision,
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1709
                    run_hooks=False)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1710
            return super(BzrBranch5, self).pull(source, overwrite,
1711
                stop_revision, _hook_master=master_branch,
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1712
                run_hooks=run_hooks)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1713
        finally:
1714
            if master_branch:
1715
                master_branch.unlock()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1716
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1717
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1718
        try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1719
            return self.control_files.get_utf8('bound').read()[:-1]
1720
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1721
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1722
1723
    @needs_read_lock
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1724
    def get_master_branch(self):
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1725
        """Return the branch we are bound to.
1726
        
1727
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1728
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1729
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1730
        it must be revalidated on each new lock.
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1731
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1732
        # RBC 20060304 review this decision.
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1733
        """
1734
        bound_loc = self.get_bound_location()
1735
        if not bound_loc:
1736
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1737
        try:
1738
            return Branch.open(bound_loc)
1739
        except (errors.NotBranchError, errors.ConnectionError), e:
1740
            raise errors.BoundBranchConnectionFailure(
1741
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1742
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1743
    @needs_write_lock
1744
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1745
        """Set the target where this branch is bound to.
1746
1747
        :param location: URL to the target branch
1748
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1749
        if location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1750
            self.control_files.put_utf8('bound', location+'\n')
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1751
        else:
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1752
            try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1753
                self.control_files._transport.delete('bound')
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1754
            except NoSuchFile:
1755
                return False
1756
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1757
1758
    @needs_write_lock
1759
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1760
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1761
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1762
        This does not push or pull data between the branches, though it does
1763
        check for divergence to raise an error when the branches are not
1764
        either the same, or one a prefix of the other. That behaviour may not
1765
        be useful, so that check may be removed in future.
1766
        
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1767
        :param other: The branch to bind to
1768
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1769
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1770
        # TODO: jam 20051230 Consider checking if the target is bound
1771
        #       It is debatable whether you should be able to bind to
1772
        #       a branch which is itself bound.
1773
        #       Committing is obviously forbidden,
1774
        #       but binding itself may not be.
1775
        #       Since we *have* to check at commit time, we don't
1776
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1777
1778
        # we want to raise diverged if:
1779
        # last_rev is not in the other_last_rev history, AND
1780
        # other_last_rev is not in our history, and do it without pulling
1781
        # history around
1782
        last_rev = self.last_revision()
1783
        if last_rev is not None:
1784
            other.lock_read()
1785
            try:
1786
                other_last_rev = other.last_revision()
1787
                if other_last_rev is not None:
1788
                    # neither branch is new, we have to do some work to
1789
                    # ascertain diversion.
1790
                    remote_graph = other.repository.get_revision_graph(
1791
                        other_last_rev)
1792
                    local_graph = self.repository.get_revision_graph(last_rev)
1793
                    if (last_rev not in remote_graph and
1794
                        other_last_rev not in local_graph):
1795
                        raise errors.DivergedBranches(self, other)
1796
            finally:
1797
                other.unlock()
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1798
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
1799
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
1800
    @needs_write_lock
1801
    def unbind(self):
1802
        """If bound, unbind"""
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1803
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1804
1587.1.10 by Robert Collins
update updates working tree and branch together.
1805
    @needs_write_lock
1806
    def update(self):
1807
        """Synchronise this branch with the master branch if any. 
1808
1809
        :return: None or the last_revision that was pivoted out during the
1810
                 update.
1811
        """
1812
        master = self.get_master_branch()
1813
        if master is not None:
1814
            old_tip = self.last_revision()
1815
            self.pull(master, overwrite=True)
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1816
            if old_tip in self.repository.get_ancestry(self.last_revision()):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1817
                return None
1818
            return old_tip
1819
        return None
1820
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1821
2220.2.10 by Martin Pool
(broken) start moving things to branches
1822
class BzrBranchExperimental(BzrBranch5):
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
1823
    """Bzr experimental branch format
1824
1825
    This format has:
1826
     - a revision-history file.
1827
     - a format string
1828
     - a lock dir guarding the branch itself
1829
     - all of this stored in a branch/ subdirectory
1830
     - works with shared repositories.
1831
     - a tag dictionary in the branch
1832
1833
    This format is new in bzr 0.15, but shouldn't be used for real data, 
1834
    only for testing.
1835
1836
    This class acts as it's own BranchFormat.
1837
    """
1838
1839
    _matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1840
1841
    @classmethod
1842
    def get_format_string(cls):
1843
        """See BranchFormat.get_format_string()."""
1844
        return "Bazaar-NG branch format experimental\n"
1845
1846
    @classmethod
1847
    def get_format_description(cls):
1848
        """See BranchFormat.get_format_description()."""
1849
        return "Experimental branch format"
1850
1851
    @classmethod
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1852
    def get_reference(cls, a_bzrdir):
1853
        """Get the target reference of the branch in a_bzrdir.
1854
1855
        format probing must have been completed before calling
1856
        this method - it is assumed that the format of the branch
1857
        in a_bzrdir is correct.
1858
1859
        :param a_bzrdir: The bzrdir to get the branch data from.
1860
        :return: None if the branch is not a reference branch.
1861
        """
1862
        return None
1863
1864
    @classmethod
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
1865
    def _initialize_control_files(cls, a_bzrdir, utf8_files, lock_filename,
1866
            lock_class):
1867
        branch_transport = a_bzrdir.get_branch_transport(cls)
1868
        control_files = lockable_files.LockableFiles(branch_transport,
1869
            lock_filename, lock_class)
1870
        control_files.create_lock()
1871
        control_files.lock_write()
1872
        try:
1873
            for filename, content in utf8_files:
1874
                control_files.put_utf8(filename, content)
1875
        finally:
1876
            control_files.unlock()
1877
        
1878
    @classmethod
1879
    def initialize(cls, a_bzrdir):
1880
        """Create a branch of this format in a_bzrdir."""
1881
        utf8_files = [('format', cls.get_format_string()),
1882
                      ('revision-history', ''),
1883
                      ('branch-name', ''),
1884
                      ('tags', ''),
1885
                      ]
1886
        cls._initialize_control_files(a_bzrdir, utf8_files,
1887
            'lock', lockdir.LockDir)
1888
        return cls.open(a_bzrdir, _found=True)
1889
1890
    @classmethod
1891
    def open(cls, a_bzrdir, _found=False):
1892
        """Return the branch object for a_bzrdir
1893
1894
        _found is a private parameter, do not use it. It is used to indicate
1895
               if format probing has already be done.
1896
        """
1897
        if not _found:
1898
            format = BranchFormat.find_format(a_bzrdir)
1899
            assert format.__class__ == cls
1900
        transport = a_bzrdir.get_branch_transport(None)
1901
        control_files = lockable_files.LockableFiles(transport, 'lock',
1902
                                                     lockdir.LockDir)
1903
        return cls(_format=cls,
1904
            _control_files=control_files,
1905
            a_bzrdir=a_bzrdir,
1906
            _repository=a_bzrdir.find_repository())
1907
1908
    @classmethod
1909
    def is_supported(cls):
1910
        return True
1911
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
1912
    def _make_tags(self):
1913
        return BasicTags(self)
2220.2.10 by Martin Pool
(broken) start moving things to branches
1914
2220.2.13 by mbp at sourcefrog
reconnect and fix up lower-level tests for tags
1915
    @classmethod
1916
    def supports_tags(cls):
1917
        return True
1918
2220.2.10 by Martin Pool
(broken) start moving things to branches
1919
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
1920
BranchFormat.register_format(BzrBranchExperimental)
1921
1922
2230.3.1 by Aaron Bentley
Get branch6 creation working
1923
class BzrBranch6(BzrBranch5):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1924
1925
    @needs_read_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1926
    def last_revision_info(self):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1927
        revision_string = self.control_files.get('last-revision').read()
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1928
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1929
        revision_id = cache_utf8.get_cached_utf8(revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1930
        revno = int(revno)
1931
        return revno, revision_id
1932
2230.3.2 by Aaron Bentley
Get all branch tests passing
1933
    def last_revision(self):
1934
        """Return last revision id, or None"""
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1935
        revision_id = self.last_revision_info()[1]
2230.3.2 by Aaron Bentley
Get all branch tests passing
1936
        if revision_id == _mod_revision.NULL_REVISION:
1937
            revision_id = None
1938
        return revision_id
1939
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1940
    def _write_last_revision_info(self, revno, revision_id):
2230.3.49 by Aaron Bentley
Fix cache updating
1941
        """Simply write out the revision id, with no checks.
1942
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1943
        Use set_last_revision_info to perform this safely.
2230.3.49 by Aaron Bentley
Fix cache updating
1944
1945
        Does not update the revision_history cache.
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1946
        Intended to be called by set_last_revision_info and
1947
        _write_revision_history.
2230.3.49 by Aaron Bentley
Fix cache updating
1948
        """
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1949
        if revision_id is None:
1950
            revision_id = 'null:'
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1951
        out_string = '%d %s\n' % (revno, revision_id)
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1952
        self.control_files.put_bytes('last-revision', out_string)
2230.3.2 by Aaron Bentley
Get all branch tests passing
1953
2230.3.49 by Aaron Bentley
Fix cache updating
1954
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1955
    def set_last_revision_info(self, revno, revision_id):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1956
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.49 by Aaron Bentley
Fix cache updating
1957
        if self._get_append_revisions_only():
1958
            self._check_history_violation(revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1959
        self._write_last_revision_info(revno, revision_id)
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
1960
        self._clear_cached_state()
2230.3.49 by Aaron Bentley
Fix cache updating
1961
2230.3.32 by Aaron Bentley
Implement strict history policy
1962
    def _check_history_violation(self, revision_id):
1963
        last_revision = self.last_revision()
1964
        if last_revision is None:
1965
            return
1966
        if last_revision not in self._lefthand_history(revision_id):
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
1967
            raise errors.AppendRevisionsOnlyViolation(self.base)
2230.3.32 by Aaron Bentley
Implement strict history policy
1968
2230.4.1 by Aaron Bentley
Get log as fast branch5
1969
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1970
        """Generate the revision history from last revision
1971
        """
2230.3.54 by Aaron Bentley
Move reverse history iteration to repository
1972
        history = list(self.repository.iter_reverse_revision_history(
1973
            self.last_revision()))
2230.4.1 by Aaron Bentley
Get log as fast branch5
1974
        history.reverse()
1975
        return history
2230.3.2 by Aaron Bentley
Get all branch tests passing
1976
2230.3.49 by Aaron Bentley
Fix cache updating
1977
    def _write_revision_history(self, history):
1978
        """Factored out of set_revision_history.
1979
1980
        This performs the actual writing to disk, with format-specific checks.
1981
        It is intended to be called by BzrBranch5.set_revision_history.
1982
        """
2230.3.2 by Aaron Bentley
Get all branch tests passing
1983
        if len(history) == 0:
2230.3.49 by Aaron Bentley
Fix cache updating
1984
            last_revision = 'null:'
2230.3.2 by Aaron Bentley
Get all branch tests passing
1985
        else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
1986
            if history != self._lefthand_history(history[-1]):
1987
                raise errors.NotLefthandHistory(history)
2230.3.49 by Aaron Bentley
Fix cache updating
1988
            last_revision = history[-1]
1989
        if self._get_append_revisions_only():
1990
            self._check_history_violation(last_revision)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1991
        self._write_last_revision_info(len(history), last_revision)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1992
2230.3.3 by Aaron Bentley
Add more config testing
1993
    @needs_write_lock
2230.3.9 by Aaron Bentley
Fix most fetch tests
1994
    def append_revision(self, *revision_ids):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1995
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
2230.3.9 by Aaron Bentley
Fix most fetch tests
1996
        if len(revision_ids) == 0:
1997
            return
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1998
        prev_revno, prev_revision = self.last_revision_info()
2230.3.9 by Aaron Bentley
Fix most fetch tests
1999
        for revision in self.repository.get_revisions(revision_ids):
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2000
            if prev_revision == _mod_revision.NULL_REVISION:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
2001
                if revision.parent_ids != []:
2002
                    raise errors.NotLeftParentDescendant(self, prev_revision,
2003
                                                         revision.revision_id)
2230.3.9 by Aaron Bentley
Fix most fetch tests
2004
            else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
2005
                if revision.parent_ids[0] != prev_revision:
2006
                    raise errors.NotLeftParentDescendant(self, prev_revision,
2007
                                                         revision.revision_id)
2230.3.9 by Aaron Bentley
Fix most fetch tests
2008
            prev_revision = revision.revision_id
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2009
        self.set_last_revision_info(prev_revno + len(revision_ids),
2010
                                    revision_ids[-1])
2230.3.9 by Aaron Bentley
Fix most fetch tests
2011
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2012
    @needs_write_lock
2013
    def _set_parent_location(self, url):
2014
        """Set the parent branch"""
2015
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
2016
2017
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2018
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
2019
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2020
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
2021
2022
    def set_push_location(self, location):
2023
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2024
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
2025
2026
    def set_bound_location(self, location):
2027
        """See Branch.set_push_location."""
2230.3.7 by Aaron Bentley
Fix binding return values
2028
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2029
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
2030
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2031
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
2032
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2033
            else:
2034
                config.set_user_option('bound', 'False')
2035
                return True
2036
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2037
            self._set_config_location('bound_location', location,
2038
                                      config=config)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2039
            config.set_user_option('bound', 'True')
2040
        return True
2041
2042
    def _get_bound_location(self, bound):
2043
        """Return the bound location in the config file.
2044
2045
        Return None if the bound parameter does not match"""
2046
        config = self.get_config()
2047
        config_bound = (config.get_user_option('bound') == 'True')
2048
        if config_bound != bound:
2049
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2050
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
2051
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2052
    def get_bound_location(self):
2053
        """See Branch.set_push_location."""
2054
        return self._get_bound_location(True)
2055
2056
    def get_old_bound_location(self):
2057
        """See Branch.get_old_bound_location"""
2058
        return self._get_bound_location(False)
2059
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2060
    def set_append_revisions_only(self, enabled):
2061
        if enabled:
2230.3.32 by Aaron Bentley
Implement strict history policy
2062
            value = 'True'
2063
        else:
2064
            value = 'False'
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2065
        self.get_config().set_user_option('append_revisions_only', value)
2230.3.32 by Aaron Bentley
Implement strict history policy
2066
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2067
    def _get_append_revisions_only(self):
2068
        value = self.get_config().get_user_option('append_revisions_only')
2069
        return value == 'True'
2230.3.32 by Aaron Bentley
Implement strict history policy
2070
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2071
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2072
        """Synchronize last revision and revision history between branches.
2073
2074
        This version is most efficient when the destination is also a
2075
        BzrBranch6, but works for BzrBranch5, as long as the destination's
2076
        repository contains all the lefthand ancestors of the intended
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2077
        last_revision.  If not, set_last_revision_info will fail.
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2078
2079
        :param destination: The branch to copy the history into
2080
        :param revision_id: The revision-id to truncate history at.  May
2081
          be None to copy complete history.
2082
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2083
        if revision_id is None:
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2084
            revno, revision_id = self.last_revision_info()
2085
        else:
2524.1.1 by Aaron Bentley
Revert broken changes
2086
            # To figure out the revno for a random revision, we need to build
2087
            # the revision history, and count its length.
2088
            # We don't care about the order, just how long it is.
2089
            # Alternatively, we could start at the current location, and count
2090
            # backwards. But there is no guarantee that we will find it since
2091
            # it may be a merged revision.
2092
            revno = len(list(self.repository.iter_reverse_revision_history(
2093
                                                                revision_id)))
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2094
        destination.set_last_revision_info(revno, revision_id)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2095
2220.2.27 by Martin Pool
Start adding tags to Branch6
2096
    def _make_tags(self):
2097
        return BasicTags(self)
2098
2230.3.34 by Aaron Bentley
cleanup
2099
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2100
class BranchTestProviderAdapter(object):
2101
    """A tool to generate a suite testing multiple branch formats at once.
2102
2103
    This is done by copying the test once for each transport and injecting
2104
    the transport_server, transport_readonly_server, and branch_format
2105
    classes into each copy. Each copy is also given a new id() to make it
2106
    easy to identify.
2107
    """
2108
2018.11.2 by Andrew Bennetts
Hookup RemoteBranch for testing by bzrlib/tests/branch_implementations tests.
2109
    def __init__(self, transport_server, transport_readonly_server, formats,
2110
        vfs_transport_factory=None):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2111
        self._transport_server = transport_server
2112
        self._transport_readonly_server = transport_readonly_server
2113
        self._formats = formats
2114
    
2115
    def adapt(self, test):
2116
        result = TestSuite()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2117
        for branch_format, bzrdir_format in self._formats:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2118
            new_test = deepcopy(test)
2119
            new_test.transport_server = self._transport_server
2120
            new_test.transport_readonly_server = self._transport_readonly_server
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2121
            new_test.bzrdir_format = bzrdir_format
2122
            new_test.branch_format = branch_format
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2123
            def make_new_test_id():
2220.2.13 by mbp at sourcefrog
reconnect and fix up lower-level tests for tags
2124
                # the format can be either a class or an instance
2125
                name = getattr(branch_format, '__name__',
2126
                        branch_format.__class__.__name__)
2127
                new_id = "%s(%s)" % (new_test.id(), name)
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2128
                return lambda: new_id
2129
            new_test.id = make_new_test_id()
2130
            result.addTest(new_test)
2131
        return result
2132
2133
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2134
######################################################################
2135
# results of operations
2136
2220.2.37 by Martin Pool
Report conflicting tags from push.
2137
2138
class _Result(object):
2139
2140
    def _show_tag_conficts(self, to_file):
2141
        if not getattr(self, 'tag_conflicts', None):
2142
            return
2143
        to_file.write('Conflicting tags:\n')
2144
        for name, value1, value2 in self.tag_conflicts:
2145
            to_file.write('    %s\n' % (name, ))
2146
2147
2148
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2149
    """Result of a Branch.pull operation.
2150
2151
    :ivar old_revno: Revision number before pull.
2152
    :ivar new_revno: Revision number after pull.
2153
    :ivar old_revid: Tip revision id before pull.
2154
    :ivar new_revid: Tip revision id after pull.
2155
    :ivar source_branch: Source (local) branch object.
2156
    :ivar master_branch: Master branch of the target, or None.
2157
    :ivar target_branch: Target/destination branch object.
2158
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2159
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
2160
    def __int__(self):
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2161
        # DEPRECATED: pull used to return the change in revno
2162
        return self.new_revno - self.old_revno
2163
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
2164
    def report(self, to_file):
2165
        if self.old_revid == self.new_revid:
2166
            to_file.write('No revisions to pull.\n')
2167
        else:
2168
            to_file.write('Now on revision %d.\n' % self.new_revno)
2169
        self._show_tag_conficts(to_file)
2170
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2171
2220.2.37 by Martin Pool
Report conflicting tags from push.
2172
class PushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2173
    """Result of a Branch.push operation.
2174
2175
    :ivar old_revno: Revision number before push.
2176
    :ivar new_revno: Revision number after push.
2177
    :ivar old_revid: Tip revision id before push.
2178
    :ivar new_revid: Tip revision id after push.
2179
    :ivar source_branch: Source branch object.
2180
    :ivar master_branch: Master branch of the target, or None.
2181
    :ivar target_branch: Target/destination branch object.
2182
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2183
2184
    def __int__(self):
2185
        # DEPRECATED: push used to return the change in revno
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
2186
        return self.new_revno - self.old_revno
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2187
2220.2.37 by Martin Pool
Report conflicting tags from push.
2188
    def report(self, to_file):
2189
        """Write a human-readable description of the result."""
2190
        if self.old_revid == self.new_revid:
2191
            to_file.write('No new revisions to push.\n')
2192
        else:
2193
            to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2194
        self._show_tag_conficts(to_file)
2195
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2196
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2197
class BranchCheckResult(object):
2198
    """Results of checking branch consistency.
2199
2200
    :see: Branch.check
2201
    """
2202
2203
    def __init__(self, branch):
2204
        self.branch = branch
2205
2206
    def report_results(self, verbose):
2207
        """Report the check results via trace.note.
2208
        
2209
        :param verbose: Requests more detailed display of what was checked,
2210
            if any.
2211
        """
2212
        note('checked branch %s format %s',
2213
             self.branch.base,
2214
             self.branch._format)
2215
2216
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2217
class Converter5to6(object):
2218
    """Perform an in-place upgrade of format 5 to format 6"""
2219
2220
    def convert(self, branch):
2221
        # Data for 5 and 6 can peacefully coexist.
2222
        format = BzrBranchFormat6()
2223
        new_branch = format.open(branch.bzrdir, _found=True)
2224
2225
        # Copy source data into target
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2226
        new_branch.set_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2227
        new_branch.set_parent(branch.get_parent())
2228
        new_branch.set_bound_location(branch.get_bound_location())
2229
        new_branch.set_push_location(branch.get_push_location())
2230
2220.2.43 by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning
2231
        # New branch has no tags by default
2232
        new_branch.tags._set_tag_dict({})
2233
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2234
        # Copying done; now update target format
2235
        new_branch.control_files.put_utf8('format',
2236
            format.get_format_string())
2237
2238
        # Clean up old files
2239
        new_branch.control_files._transport.delete('revision-history')
2240
        try:
2241
            branch.set_parent(None)
2242
        except NoSuchFile:
2243
            pass
2244
        branch.set_bound_location(None)