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