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