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