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