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