/brz/remove-bazaar

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