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