bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1 |
# Copyright (C) 2005, 2006 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 |
||
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
18 |
from copy import deepcopy |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
19 |
from cStringIO import StringIO |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
20 |
from unittest import TestSuite |
|
1372
by Martin Pool
- avoid converting inventories to/from StringIO |
21 |
from warnings import warn |
|
1553.5.70
by Martin Pool
doc |
22 |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
23 |
import bzrlib |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
24 |
import bzrlib.bzrdir as bzrdir |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
25 |
from bzrlib.config import TreeConfig |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
26 |
from bzrlib.decorators import needs_read_lock, needs_write_lock |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
27 |
from bzrlib.delta import compare_trees |
28 |
import bzrlib.errors as errors |
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
29 |
from bzrlib.errors import (InvalidRevisionNumber, |
30 |
NotBranchError, |
|
31 |
DivergedBranches, |
|
32 |
NoSuchFile, |
|
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
33 |
NoWorkingTree) |
|
1553.5.63
by Martin Pool
Lock type is now mandatory for LockableFiles constructor |
34 |
from bzrlib.lockable_files import LockableFiles, TransportLock |
|
1553.5.71
by Martin Pool
Change branch format 5 to use LockDirs, not transport locks |
35 |
from bzrlib.lockdir import LockDir |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
36 |
from bzrlib.osutils import ( |
|
1692.7.6
by Martin Pool
[patch] force deletion of trees containing readonly files (alexander) |
37 |
rmtree, |
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
38 |
)
|
|
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. |
39 |
from bzrlib.revision import ( |
40 |
NULL_REVISION, |
|
41 |
)
|
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
42 |
from bzrlib.symbol_versioning import (deprecated_function, |
43 |
deprecated_method, |
|
44 |
DEPRECATED_PARAMETER, |
|
45 |
deprecated_passed, |
|
46 |
zero_eight, |
|
47 |
)
|
|
|
1685.1.70
by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken |
48 |
from bzrlib.trace import mutter, note |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
49 |
from bzrlib.tree import EmptyTree |
50 |
import bzrlib.ui as ui |
|
|
1685.1.70
by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken |
51 |
import bzrlib.urlutils as urlutils |
|
1104
by Martin Pool
- Add a simple UIFactory |
52 |
|
|
1094
by Martin Pool
- merge aaron's merge improvements 999..1008 |
53 |
|
|
1186
by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches |
54 |
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n" |
55 |
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n" |
|
|
1429
by Robert Collins
merge in niemeyers prefixed-store patch |
56 |
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n" |
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
57 |
|
58 |
||
59 |
# TODO: Maybe include checks for common corruption of newlines, etc?
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
60 |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
61 |
# TODO: Some operations like log might retrieve the same revisions
|
62 |
# repeatedly to calculate deltas. We could perhaps have a weakref
|
|
|
1223
by Martin Pool
- store inventories in weave |
63 |
# cache in memory to make this faster. In general anything can be
|
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
64 |
# cached in memory between lock and unlock operations. .. nb thats
|
65 |
# what the transaction identity map provides
|
|
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
66 |
|
|
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
67 |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
68 |
######################################################################
|
69 |
# branch objects
|
|
70 |
||
|
558
by Martin Pool
- All top-level classes inherit from object |
71 |
class Branch(object): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
72 |
"""Branch holding a history of revisions. |
73 |
||
|
343
by Martin Pool
doc |
74 |
base
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
75 |
Base directory/url of the branch.
|
76 |
"""
|
|
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
77 |
# this is really an instance variable - FIXME move it there
|
78 |
# - RBC 20060112
|
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
79 |
base = None |
80 |
||
81 |
def __init__(self, *ignored, **ignored_too): |
|
82 |
raise NotImplementedError('The Branch class is abstract') |
|
83 |
||
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
84 |
def break_lock(self): |
85 |
"""Break a lock if one is present from another instance. |
|
86 |
||
87 |
Uses the ui factory to ask for confirmation if the lock may be from
|
|
88 |
an active process.
|
|
89 |
||
90 |
This will probe the repository for its lock as well.
|
|
91 |
"""
|
|
92 |
self.control_files.break_lock() |
|
93 |
self.repository.break_lock() |
|
|
1687.1.10
by Robert Collins
Branch.break_lock should handle bound branches too |
94 |
master = self.get_master_branch() |
95 |
if master is not None: |
|
96 |
master.break_lock() |
|
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
97 |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
98 |
@staticmethod
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
99 |
@deprecated_method(zero_eight) |
|
1393.1.2
by Martin Pool
- better representation in Branch factories of opening old formats |
100 |
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. |
101 |
"""Open a branch which may be of an old format.""" |
102 |
return Branch.open(base, _unsupported=True) |
|
|
1393.1.2
by Martin Pool
- better representation in Branch factories of opening old formats |
103 |
|
104 |
@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. |
105 |
def open(base, _unsupported=False): |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
106 |
"""Open the repository rooted at base. |
107 |
||
108 |
For instance, if the repository is at URL/.bzr/repository,
|
|
109 |
Repository.open(URL) -> a Repository 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. |
110 |
"""
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
111 |
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. |
112 |
return control.open_branch(_unsupported) |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
113 |
|
114 |
@staticmethod
|
|
|
1185.2.8
by Lalo Martins
creating the new branch constructors |
115 |
def open_containing(url): |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
116 |
"""Open an existing branch which contains url. |
117 |
|
|
118 |
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 |
119 |
|
120 |
Basically we keep looking up until we find the control directory or
|
|
121 |
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. |
122 |
If there is one and it is either an unrecognised format or an unsupported
|
123 |
format, UnknownFormatError or UnsupportedFormatError are raised.
|
|
|
1442.1.64
by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path). |
124 |
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. |
125 |
"""
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
126 |
control, relpath = bzrdir.BzrDir.open_containing(url) |
127 |
return control.open_branch(), relpath |
|
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
128 |
|
129 |
@staticmethod
|
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
130 |
@deprecated_function(zero_eight) |
131 |
def initialize(base): |
|
132 |
"""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 |
133 |
|
134 |
NOTE: This will soon be deprecated in favour of creation
|
|
135 |
through a BzrDir.
|
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
136 |
"""
|
|
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. |
137 |
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. |
138 |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
139 |
def setup_caching(self, cache_root): |
140 |
"""Subclasses that care about caching should override this, and set |
|
141 |
up cached stores located under cache_root.
|
|
142 |
"""
|
|
|
1185.70.6
by Martin Pool
review fixups from John |
143 |
# seems to be unused, 2006-01-13 mbp
|
144 |
warn('%s is deprecated' % self.setup_caching) |
|
|
1400.1.1
by Robert Collins
implement a basic test for the ui branch command from http servers |
145 |
self.cache_root = cache_root |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
146 |
|
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
147 |
def _get_nick(self): |
148 |
cfg = self.tree_config() |
|
|
1530.1.3
by Robert Collins
transport implementations now tested consistently. |
149 |
return cfg.get_option(u"nickname", default=self.base.split('/')[-2]) |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
150 |
|
151 |
def _set_nick(self, nick): |
|
152 |
cfg = self.tree_config() |
|
153 |
cfg.set_option(nick, "nickname") |
|
154 |
assert cfg.get_option("nickname") == nick |
|
155 |
||
156 |
nick = property(_get_nick, _set_nick) |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
157 |
|
158 |
def is_locked(self): |
|
159 |
raise NotImplementedError('is_locked is abstract') |
|
160 |
||
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
161 |
def lock_write(self): |
162 |
raise NotImplementedError('lock_write is abstract') |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
163 |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
164 |
def lock_read(self): |
165 |
raise NotImplementedError('lock_read is abstract') |
|
166 |
||
167 |
def unlock(self): |
|
168 |
raise NotImplementedError('unlock is abstract') |
|
169 |
||
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
170 |
def peek_lock_mode(self): |
171 |
"""Return lock mode for the Branch: 'r', 'w' or None""" |
|
|
1185.70.6
by Martin Pool
review fixups from John |
172 |
raise NotImplementedError(self.peek_lock_mode) |
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
173 |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
174 |
def get_physical_lock_status(self): |
175 |
raise NotImplementedError('get_physical_lock_status is abstract') |
|
176 |
||
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
177 |
def abspath(self, name): |
178 |
"""Return absolute filename for something in the branch |
|
179 |
|
|
180 |
XXX: Robert Collins 20051017 what is this used for? why is it a branch
|
|
181 |
method and not a tree method.
|
|
182 |
"""
|
|
183 |
raise NotImplementedError('abspath is abstract') |
|
184 |
||
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
185 |
def bind(self, other): |
186 |
"""Bind the local branch the other branch. |
|
187 |
||
188 |
:param other: The branch to bind to
|
|
189 |
:type other: Branch
|
|
190 |
"""
|
|
191 |
raise errors.UpgradeRequired(self.base) |
|
192 |
||
|
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. |
193 |
@needs_write_lock
|
194 |
def fetch(self, from_branch, last_revision=None, pb=None): |
|
195 |
"""Copy revisions from from_branch into this branch. |
|
196 |
||
197 |
:param from_branch: Where to copy from.
|
|
198 |
:param last_revision: What revision to stop at (None for at the end
|
|
199 |
of the branch.
|
|
200 |
:param pb: An optional progress bar to use.
|
|
201 |
||
202 |
Returns the copied revision count and the failed revisions in a tuple:
|
|
203 |
(copied, failures).
|
|
204 |
"""
|
|
205 |
if self.base == from_branch.base: |
|
|
1558.4.11
by Aaron Bentley
Allow merge against self, make fetching self a noop |
206 |
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. |
207 |
if pb is None: |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
208 |
nested_pb = ui.ui_factory.nested_progress_bar() |
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
209 |
pb = nested_pb |
210 |
else: |
|
211 |
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. |
212 |
|
213 |
from_branch.lock_read() |
|
214 |
try: |
|
215 |
if last_revision is None: |
|
216 |
pb.update('get source history') |
|
217 |
from_history = from_branch.revision_history() |
|
218 |
if from_history: |
|
219 |
last_revision = from_history[-1] |
|
220 |
else: |
|
221 |
# no history in the source branch
|
|
222 |
last_revision = NULL_REVISION |
|
223 |
return self.repository.fetch(from_branch.repository, |
|
224 |
revision_id=last_revision, |
|
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
225 |
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. |
226 |
finally: |
|
1594.1.3
by Robert Collins
Fixup pb usage to use nested_progress_bar. |
227 |
if nested_pb is not None: |
228 |
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. |
229 |
from_branch.unlock() |
230 |
||
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
231 |
def get_bound_location(self): |
|
1558.7.6
by Aaron Bentley
Fixed typo (Olaf Conradi) |
232 |
"""Return the URL of the branch we are bound to. |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
233 |
|
234 |
Older format branches cannot bind, please be sure to use a metadir
|
|
235 |
branch.
|
|
236 |
"""
|
|
237 |
return None |
|
|
1740.3.1
by Jelmer Vernooij
Introduce and use CommitBuilder objects. |
238 |
|
|
1740.3.7
by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder. |
239 |
def get_commit_builder(self, parents, config=None, timestamp=None, |
240 |
timezone=None, committer=None, revprops=None, |
|
241 |
revision_id=None): |
|
242 |
"""Obtain a CommitBuilder for this branch. |
|
243 |
|
|
244 |
:param parents: Revision ids of the parents of the new revision.
|
|
245 |
:param config: Optional configuration to use.
|
|
246 |
:param timestamp: Optional timestamp recorded for commit.
|
|
247 |
:param timezone: Optional timezone for timestamp.
|
|
248 |
:param committer: Optional committer to set for commit.
|
|
249 |
:param revprops: Optional dictionary of revision properties.
|
|
250 |
:param revision_id: Optional revision id.
|
|
251 |
"""
|
|
252 |
||
253 |
if config is None: |
|
254 |
config = bzrlib.config.BranchConfig(self) |
|
255 |
||
256 |
return self.repository.get_commit_builder(self, parents, config, |
|
257 |
timestamp, timezone, committer, revprops, revision_id) |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
258 |
|
259 |
def get_master_branch(self): |
|
260 |
"""Return the branch we are bound to. |
|
261 |
|
|
262 |
:return: Either a Branch, or None
|
|
263 |
"""
|
|
264 |
return None |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
265 |
|
266 |
def get_root_id(self): |
|
267 |
"""Return the id of this branches root""" |
|
268 |
raise NotImplementedError('get_root_id is abstract') |
|
269 |
||
|
1185.50.9
by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision |
270 |
def print_file(self, file, revision_id): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
271 |
"""Print `file` to stdout.""" |
272 |
raise NotImplementedError('print_file is abstract') |
|
273 |
||
274 |
def append_revision(self, *revision_ids): |
|
275 |
raise NotImplementedError('append_revision is abstract') |
|
276 |
||
277 |
def set_revision_history(self, rev_history): |
|
278 |
raise NotImplementedError('set_revision_history is abstract') |
|
279 |
||
280 |
def revision_history(self): |
|
281 |
"""Return sequence of revision hashes on to this branch.""" |
|
282 |
raise NotImplementedError('revision_history is abstract') |
|
283 |
||
284 |
def revno(self): |
|
285 |
"""Return current revision number for this branch. |
|
286 |
||
287 |
That is equivalent to the number of revisions committed to
|
|
288 |
this branch.
|
|
289 |
"""
|
|
290 |
return len(self.revision_history()) |
|
291 |
||
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
292 |
def unbind(self): |
293 |
"""Older format branches cannot bind or unbind.""" |
|
294 |
raise errors.UpgradeRequired(self.base) |
|
295 |
||
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
296 |
def last_revision(self): |
297 |
"""Return last patch hash, or None if no history.""" |
|
298 |
ph = self.revision_history() |
|
299 |
if ph: |
|
300 |
return ph[-1] |
|
301 |
else: |
|
302 |
return None |
|
303 |
||
|
1505.1.21
by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history. |
304 |
def missing_revisions(self, other, stop_revision=None): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
305 |
"""Return a list of new revisions that would perfectly fit. |
306 |
|
|
307 |
If self and other have not diverged, return a list of the revisions
|
|
308 |
present in other, but missing from self.
|
|
309 |
||
|
1534.4.36
by Robert Collins
Finish deprecating Branch.working_tree() |
310 |
>>> from bzrlib.workingtree import WorkingTree
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
311 |
>>> bzrlib.trace.silent = True
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
312 |
>>> d1 = bzrdir.ScratchDir()
|
313 |
>>> br1 = d1.open_branch()
|
|
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
314 |
>>> wt1 = d1.open_workingtree()
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
315 |
>>> d2 = bzrdir.ScratchDir()
|
316 |
>>> br2 = d2.open_branch()
|
|
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
317 |
>>> wt2 = d2.open_workingtree()
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
318 |
>>> br1.missing_revisions(br2)
|
319 |
[]
|
|
|
1534.4.36
by Robert Collins
Finish deprecating Branch.working_tree() |
320 |
>>> wt2.commit("lala!", rev_id="REVISION-ID-1")
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
321 |
>>> br1.missing_revisions(br2)
|
322 |
[u'REVISION-ID-1']
|
|
323 |
>>> br2.missing_revisions(br1)
|
|
324 |
[]
|
|
|
1534.4.36
by Robert Collins
Finish deprecating Branch.working_tree() |
325 |
>>> wt1.commit("lala!", rev_id="REVISION-ID-1")
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
326 |
>>> br1.missing_revisions(br2)
|
327 |
[]
|
|
|
1534.4.36
by Robert Collins
Finish deprecating Branch.working_tree() |
328 |
>>> wt2.commit("lala!", rev_id="REVISION-ID-2A")
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
329 |
>>> br1.missing_revisions(br2)
|
330 |
[u'REVISION-ID-2A']
|
|
|
1534.4.36
by Robert Collins
Finish deprecating Branch.working_tree() |
331 |
>>> wt1.commit("lala!", rev_id="REVISION-ID-2B")
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
332 |
>>> br1.missing_revisions(br2)
|
333 |
Traceback (most recent call last):
|
|
|
1185.56.1
by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull() |
334 |
DivergedBranches: These branches have diverged. Try merge.
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
335 |
"""
|
336 |
self_history = self.revision_history() |
|
337 |
self_len = len(self_history) |
|
|
1505.1.21
by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history. |
338 |
other_history = other.revision_history() |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
339 |
other_len = len(other_history) |
340 |
common_index = min(self_len, other_len) -1 |
|
341 |
if common_index >= 0 and \ |
|
342 |
self_history[common_index] != other_history[common_index]: |
|
343 |
raise DivergedBranches(self, other) |
|
344 |
||
345 |
if stop_revision is None: |
|
346 |
stop_revision = other_len |
|
347 |
else: |
|
348 |
assert isinstance(stop_revision, int) |
|
349 |
if stop_revision > other_len: |
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
350 |
raise errors.NoSuchRevision(self, stop_revision) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
351 |
return other_history[self_len:stop_revision] |
|
1185.66.1
by Aaron Bentley
Merged from mainline |
352 |
|
|
1505.1.21
by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history. |
353 |
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 |
354 |
"""Pull in new perfect-fit revisions. |
355 |
||
356 |
:param other: Another Branch to pull from
|
|
357 |
:param stop_revision: Updated until the given revision
|
|
358 |
:return: None
|
|
359 |
"""
|
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
360 |
raise NotImplementedError('update_revisions is abstract') |
361 |
||
362 |
def revision_id_to_revno(self, revision_id): |
|
363 |
"""Given a revision id, return its revno""" |
|
364 |
if revision_id is None: |
|
365 |
return 0 |
|
366 |
history = self.revision_history() |
|
367 |
try: |
|
368 |
return history.index(revision_id) + 1 |
|
369 |
except ValueError: |
|
370 |
raise bzrlib.errors.NoSuchRevision(self, revision_id) |
|
371 |
||
372 |
def get_rev_id(self, revno, history=None): |
|
373 |
"""Find the revision id of the specified revno.""" |
|
374 |
if revno == 0: |
|
375 |
return None |
|
376 |
if history is None: |
|
377 |
history = self.revision_history() |
|
378 |
elif revno <= 0 or revno > len(history): |
|
379 |
raise bzrlib.errors.NoSuchRevision(self, revno) |
|
380 |
return history[revno - 1] |
|
381 |
||
|
1185.76.1
by Erik BÃ¥gfors
Support for --revision in pull |
382 |
def pull(self, source, overwrite=False, stop_revision=None): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
383 |
raise NotImplementedError('pull is abstract') |
384 |
||
385 |
def basis_tree(self): |
|
386 |
"""Return `Tree` object for last revision. |
|
387 |
||
388 |
If there are no revisions yet, return an `EmptyTree`.
|
|
389 |
"""
|
|
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
390 |
return self.repository.revision_tree(self.last_revision()) |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
391 |
|
392 |
def rename_one(self, from_rel, to_rel): |
|
393 |
"""Rename one file. |
|
394 |
||
395 |
This can change the directory or the filename or both.
|
|
396 |
"""
|
|
397 |
raise NotImplementedError('rename_one is abstract') |
|
398 |
||
399 |
def move(self, from_paths, to_name): |
|
400 |
"""Rename files. |
|
401 |
||
402 |
to_name must exist as a versioned directory.
|
|
403 |
||
404 |
If to_name exists and is a directory, the files are moved into
|
|
405 |
it, keeping their old names. If it is a directory,
|
|
406 |
||
407 |
Note that to_name is only the last component of the new name;
|
|
408 |
this doesn't change the directory.
|
|
409 |
||
410 |
This returns a list of (from_path, to_path) pairs for each
|
|
411 |
entry that is moved.
|
|
412 |
"""
|
|
413 |
raise NotImplementedError('move is abstract') |
|
414 |
||
415 |
def get_parent(self): |
|
416 |
"""Return the parent location of the branch. |
|
417 |
||
418 |
This is the default location for push/pull/missing. The usual
|
|
419 |
pattern is that the user can override it by specifying a
|
|
420 |
location.
|
|
421 |
"""
|
|
422 |
raise NotImplementedError('get_parent is abstract') |
|
423 |
||
424 |
def get_push_location(self): |
|
425 |
"""Return the None or the location to push this branch to.""" |
|
426 |
raise NotImplementedError('get_push_location is abstract') |
|
427 |
||
428 |
def set_push_location(self, location): |
|
429 |
"""Set a new push location for this branch.""" |
|
430 |
raise NotImplementedError('set_push_location is abstract') |
|
431 |
||
432 |
def set_parent(self, url): |
|
433 |
raise NotImplementedError('set_parent is abstract') |
|
434 |
||
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
435 |
@needs_write_lock
|
436 |
def update(self): |
|
437 |
"""Synchronise this branch with the master branch if any. |
|
438 |
||
439 |
:return: None or the last_revision pivoted out during the update.
|
|
440 |
"""
|
|
441 |
return None |
|
442 |
||
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
443 |
def check_revno(self, revno): |
444 |
"""\ |
|
445 |
Check whether a revno corresponds to any revision.
|
|
446 |
Zero (the NULL revision) is considered valid.
|
|
447 |
"""
|
|
448 |
if revno != 0: |
|
449 |
self.check_real_revno(revno) |
|
450 |
||
451 |
def check_real_revno(self, revno): |
|
452 |
"""\ |
|
453 |
Check whether a revno corresponds to a real revision.
|
|
454 |
Zero (the NULL revision) is considered invalid
|
|
455 |
"""
|
|
456 |
if revno < 1 or revno > self.revno(): |
|
457 |
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. |
458 |
|
459 |
@needs_read_lock
|
|
460 |
def clone(self, *args, **kwargs): |
|
461 |
"""Clone this branch into to_bzrdir preserving all semantic values. |
|
462 |
|
|
463 |
revision_id: if not None, the revision history in the new branch will
|
|
464 |
be truncated to end with revision_id.
|
|
465 |
"""
|
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
466 |
# for API compatibility, until 0.8 releases we provide the old api:
|
|
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. |
467 |
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
|
468 |
# after 0.8 releases, the *args and **kwargs should be changed:
|
|
469 |
# def clone(self, to_bzrdir, revision_id=None):
|
|
470 |
if (kwargs.get('to_location', None) or |
|
471 |
kwargs.get('revision', None) or |
|
472 |
kwargs.get('basis_branch', None) or |
|
473 |
(len(args) and isinstance(args[0], basestring))): |
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
474 |
# backwards compatibility api:
|
|
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. |
475 |
warn("Branch.clone() has been deprecated for BzrDir.clone() from" |
476 |
" bzrlib 0.8.", DeprecationWarning, stacklevel=3) |
|
477 |
# get basis_branch
|
|
478 |
if len(args) > 2: |
|
479 |
basis_branch = args[2] |
|
480 |
else: |
|
481 |
basis_branch = kwargs.get('basis_branch', None) |
|
482 |
if basis_branch: |
|
483 |
basis = basis_branch.bzrdir |
|
484 |
else: |
|
485 |
basis = None |
|
486 |
# get revision
|
|
487 |
if len(args) > 1: |
|
488 |
revision_id = args[1] |
|
489 |
else: |
|
490 |
revision_id = kwargs.get('revision', None) |
|
491 |
# get location
|
|
492 |
if len(args): |
|
493 |
url = args[0] |
|
494 |
else: |
|
495 |
# no default to raise if not provided.
|
|
496 |
url = kwargs.get('to_location') |
|
497 |
return self.bzrdir.clone(url, |
|
498 |
revision_id=revision_id, |
|
499 |
basis=basis).open_branch() |
|
500 |
# new cleaner api.
|
|
501 |
# generate args by hand
|
|
502 |
if len(args) > 1: |
|
503 |
revision_id = args[1] |
|
504 |
else: |
|
505 |
revision_id = kwargs.get('revision_id', None) |
|
506 |
if len(args): |
|
507 |
to_bzrdir = args[0] |
|
508 |
else: |
|
509 |
# no default to raise if not provided.
|
|
510 |
to_bzrdir = kwargs.get('to_bzrdir') |
|
511 |
result = self._format.initialize(to_bzrdir) |
|
512 |
self.copy_content_into(result, revision_id=revision_id) |
|
513 |
return result |
|
514 |
||
515 |
@needs_read_lock
|
|
516 |
def sprout(self, to_bzrdir, revision_id=None): |
|
517 |
"""Create a new line of development from the branch, into to_bzrdir. |
|
518 |
|
|
519 |
revision_id: if not None, the revision history in the new branch will
|
|
520 |
be truncated to end with revision_id.
|
|
521 |
"""
|
|
522 |
result = self._format.initialize(to_bzrdir) |
|
523 |
self.copy_content_into(result, revision_id=revision_id) |
|
524 |
result.set_parent(self.bzrdir.root_transport.base) |
|
525 |
return result |
|
526 |
||
527 |
@needs_read_lock
|
|
528 |
def copy_content_into(self, destination, revision_id=None): |
|
529 |
"""Copy the content of self into destination. |
|
530 |
||
531 |
revision_id: if not None, the revision history in the new branch will
|
|
532 |
be truncated to end with revision_id.
|
|
533 |
"""
|
|
534 |
new_history = self.revision_history() |
|
535 |
if revision_id is not None: |
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
536 |
try: |
|
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. |
537 |
new_history = new_history[:new_history.index(revision_id) + 1] |
538 |
except ValueError: |
|
539 |
rev = self.repository.get_revision(revision_id) |
|
540 |
new_history = rev.get_history(self.repository)[1:] |
|
541 |
destination.set_revision_history(new_history) |
|
542 |
parent = self.get_parent() |
|
543 |
if parent: |
|
544 |
destination.set_parent(parent) |
|
|
1185.66.1
by Aaron Bentley
Merged from mainline |
545 |
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
546 |
@needs_read_lock
|
547 |
def check(self): |
|
548 |
"""Check consistency of the branch. |
|
549 |
||
550 |
In particular this checks that revisions given in the revision-history
|
|
551 |
do actually match up in the revision graph, and that they're all
|
|
552 |
present in the repository.
|
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
553 |
|
554 |
Callers will typically also want to check the repository.
|
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
555 |
|
556 |
:return: A BranchCheckResult.
|
|
557 |
"""
|
|
558 |
mainline_parent_id = None |
|
559 |
for revision_id in self.revision_history(): |
|
560 |
try: |
|
561 |
revision = self.repository.get_revision(revision_id) |
|
562 |
except errors.NoSuchRevision, e: |
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
563 |
raise errors.BzrCheckError("mainline revision {%s} not in repository" |
564 |
% revision_id) |
|
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
565 |
# In general the first entry on the revision history has no parents.
|
566 |
# But it's not illegal for it to have parents listed; this can happen
|
|
567 |
# in imports from Arch when the parents weren't reachable.
|
|
568 |
if mainline_parent_id is not None: |
|
569 |
if mainline_parent_id not in revision.parent_ids: |
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
570 |
raise errors.BzrCheckError("previous revision {%s} not listed among " |
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
571 |
"parents of {%s}" |
572 |
% (mainline_parent_id, revision_id)) |
|
573 |
mainline_parent_id = revision_id |
|
574 |
return BranchCheckResult(self) |
|
575 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
576 |
|
577 |
class BranchFormat(object): |
|
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
578 |
"""An encapsulation of the initialization and open routines for a format. |
579 |
||
580 |
Formats provide three things:
|
|
581 |
* An initialization routine,
|
|
582 |
* a format string,
|
|
583 |
* an open routine.
|
|
584 |
||
585 |
Formats are placed in an dict by their format string for reference
|
|
586 |
during branch opening. Its not required that these be instances, they
|
|
587 |
can be classes themselves with class methods - it simply depends on
|
|
588 |
whether state is needed for a given format or not.
|
|
589 |
||
590 |
Once a format is deprecated, just deprecate the initialize and open
|
|
591 |
methods on the format class. Do not deprecate the object, as the
|
|
592 |
object will be created every time regardless.
|
|
593 |
"""
|
|
594 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
595 |
_default_format = None |
596 |
"""The default format used for new branches.""" |
|
597 |
||
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
598 |
_formats = {} |
599 |
"""The known formats.""" |
|
600 |
||
601 |
@classmethod
|
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
602 |
def find_format(klass, a_bzrdir): |
603 |
"""Return the format for the branch object in a_bzrdir.""" |
|
604 |
try: |
|
605 |
transport = a_bzrdir.get_branch_transport(None) |
|
606 |
format_string = transport.get("format").read() |
|
607 |
return klass._formats[format_string] |
|
608 |
except NoSuchFile: |
|
609 |
raise NotBranchError(path=transport.base) |
|
610 |
except KeyError: |
|
611 |
raise errors.UnknownFormatError(format_string) |
|
612 |
||
613 |
@classmethod
|
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
614 |
def get_default_format(klass): |
615 |
"""Return the current default format.""" |
|
616 |
return klass._default_format |
|
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
617 |
|
618 |
def get_format_string(self): |
|
619 |
"""Return the ASCII format string that identifies this format.""" |
|
620 |
raise NotImplementedError(self.get_format_string) |
|
621 |
||
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
622 |
def get_format_description(self): |
623 |
"""Return the short format description for this format.""" |
|
624 |
raise NotImplementedError(self.get_format_string) |
|
625 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
626 |
def initialize(self, a_bzrdir): |
627 |
"""Create a branch of this format in a_bzrdir.""" |
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
628 |
raise NotImplementedError(self.initialize) |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
629 |
|
|
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. |
630 |
def is_supported(self): |
631 |
"""Is this format supported? |
|
632 |
||
633 |
Supported formats can be initialized and opened.
|
|
634 |
Unsupported formats may not support initialization or committing or
|
|
635 |
some other features depending on the reason for not being supported.
|
|
636 |
"""
|
|
637 |
return True |
|
638 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
639 |
def open(self, a_bzrdir, _found=False): |
640 |
"""Return the branch object for a_bzrdir |
|
641 |
||
642 |
_found is a private parameter, do not use it. It is used to indicate
|
|
643 |
if format probing has already be done.
|
|
644 |
"""
|
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
645 |
raise NotImplementedError(self.open) |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
646 |
|
647 |
@classmethod
|
|
648 |
def register_format(klass, format): |
|
649 |
klass._formats[format.get_format_string()] = format |
|
650 |
||
|
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. |
651 |
@classmethod
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
652 |
def set_default_format(klass, format): |
653 |
klass._default_format = format |
|
654 |
||
655 |
@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. |
656 |
def unregister_format(klass, format): |
657 |
assert klass._formats[format.get_format_string()] is format |
|
658 |
del klass._formats[format.get_format_string()] |
|
659 |
||
|
1553.4.8
by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the |
660 |
def __str__(self): |
661 |
return self.get_format_string().rstrip() |
|
662 |
||
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
663 |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
664 |
class BzrBranchFormat4(BranchFormat): |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
665 |
"""Bzr branch format 4. |
666 |
||
667 |
This format has:
|
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
668 |
- 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. |
669 |
- a branch-lock lock file [ to be shared with the bzrdir ]
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
670 |
"""
|
671 |
||
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
672 |
def get_format_description(self): |
673 |
"""See BranchFormat.get_format_description().""" |
|
674 |
return "Branch format 4" |
|
675 |
||
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
676 |
def initialize(self, a_bzrdir): |
677 |
"""Create a branch of this format in a_bzrdir.""" |
|
678 |
mutter('creating branch in %s', a_bzrdir.transport.base) |
|
679 |
branch_transport = a_bzrdir.get_branch_transport(self) |
|
680 |
utf8_files = [('revision-history', ''), |
|
681 |
('branch-name', ''), |
|
682 |
]
|
|
|
1553.5.63
by Martin Pool
Lock type is now mandatory for LockableFiles constructor |
683 |
control_files = LockableFiles(branch_transport, 'branch-lock', |
684 |
TransportLock) |
|
685 |
control_files.create_lock() |
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
686 |
control_files.lock_write() |
687 |
try: |
|
688 |
for file, content in utf8_files: |
|
689 |
control_files.put_utf8(file, content) |
|
690 |
finally: |
|
691 |
control_files.unlock() |
|
692 |
return self.open(a_bzrdir, _found=True) |
|
693 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
694 |
def __init__(self): |
695 |
super(BzrBranchFormat4, self).__init__() |
|
696 |
self._matchingbzrdir = bzrdir.BzrDirFormat6() |
|
697 |
||
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
698 |
def open(self, a_bzrdir, _found=False): |
699 |
"""Return the branch object for a_bzrdir |
|
700 |
||
701 |
_found is a private parameter, do not use it. It is used to indicate
|
|
702 |
if format probing has already be done.
|
|
703 |
"""
|
|
704 |
if not _found: |
|
705 |
# we are being called directly and must probe.
|
|
706 |
raise NotImplementedError |
|
707 |
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. |
708 |
_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. |
709 |
a_bzrdir=a_bzrdir, |
710 |
_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. |
711 |
|
|
1553.4.8
by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the |
712 |
def __str__(self): |
713 |
return "Bazaar-NG branch format 4" |
|
714 |
||
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
715 |
|
716 |
class BzrBranchFormat5(BranchFormat): |
|
717 |
"""Bzr branch format 5. |
|
718 |
||
719 |
This format has:
|
|
720 |
- a revision-history file.
|
|
721 |
- a format string
|
|
|
1553.5.71
by Martin Pool
Change branch format 5 to use LockDirs, not transport locks |
722 |
- a lock dir guarding the branch itself
|
723 |
- 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. |
724 |
- works with shared repositories.
|
|
1553.5.71
by Martin Pool
Change branch format 5 to use LockDirs, not transport locks |
725 |
|
726 |
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. |
727 |
"""
|
728 |
||
729 |
def get_format_string(self): |
|
730 |
"""See BranchFormat.get_format_string().""" |
|
731 |
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 |
732 |
|
733 |
def get_format_description(self): |
|
734 |
"""See BranchFormat.get_format_description().""" |
|
735 |
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. |
736 |
|
737 |
def initialize(self, a_bzrdir): |
|
738 |
"""Create a branch of this format in a_bzrdir.""" |
|
|
1553.5.71
by Martin Pool
Change branch format 5 to use LockDirs, not transport locks |
739 |
mutter('creating branch %r in %s', self, a_bzrdir.transport.base) |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
740 |
branch_transport = a_bzrdir.get_branch_transport(self) |
741 |
utf8_files = [('revision-history', ''), |
|
742 |
('branch-name', ''), |
|
743 |
]
|
|
|
1553.5.71
by Martin Pool
Change branch format 5 to use LockDirs, not transport locks |
744 |
control_files = LockableFiles(branch_transport, 'lock', LockDir) |
|
1553.5.63
by Martin Pool
Lock type is now mandatory for LockableFiles constructor |
745 |
control_files.create_lock() |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
746 |
control_files.lock_write() |
747 |
control_files.put_utf8('format', self.get_format_string()) |
|
748 |
try: |
|
749 |
for file, content in utf8_files: |
|
750 |
control_files.put_utf8(file, content) |
|
751 |
finally: |
|
752 |
control_files.unlock() |
|
753 |
return self.open(a_bzrdir, _found=True, ) |
|
754 |
||
755 |
def __init__(self): |
|
756 |
super(BzrBranchFormat5, self).__init__() |
|
757 |
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1() |
|
758 |
||
759 |
def open(self, a_bzrdir, _found=False): |
|
760 |
"""Return the branch object for a_bzrdir |
|
761 |
||
762 |
_found is a private parameter, do not use it. It is used to indicate
|
|
763 |
if format probing has already be done.
|
|
764 |
"""
|
|
765 |
if not _found: |
|
766 |
format = BranchFormat.find_format(a_bzrdir) |
|
767 |
assert format.__class__ == self.__class__ |
|
768 |
transport = a_bzrdir.get_branch_transport(None) |
|
|
1553.5.71
by Martin Pool
Change branch format 5 to use LockDirs, not transport locks |
769 |
control_files = LockableFiles(transport, 'lock', LockDir) |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
770 |
return BzrBranch5(_format=self, |
771 |
_control_files=control_files, |
|
772 |
a_bzrdir=a_bzrdir, |
|
773 |
_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. |
774 |
|
|
1587.1.14
by Robert Collins
Make bound branch creation happen via 'checkout' |
775 |
def __str__(self): |
776 |
return "Bazaar-NG Metadir branch format 5" |
|
777 |
||
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
778 |
|
|
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. |
779 |
class BranchReferenceFormat(BranchFormat): |
780 |
"""Bzr branch reference format. |
|
781 |
||
782 |
Branch references are used in implementing checkouts, they
|
|
783 |
act as an alias to the real branch which is at some other url.
|
|
784 |
||
785 |
This format has:
|
|
786 |
- A location file
|
|
787 |
- a format string
|
|
788 |
"""
|
|
789 |
||
790 |
def get_format_string(self): |
|
791 |
"""See BranchFormat.get_format_string().""" |
|
792 |
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 |
793 |
|
794 |
def get_format_description(self): |
|
795 |
"""See BranchFormat.get_format_description().""" |
|
796 |
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. |
797 |
|
798 |
def initialize(self, a_bzrdir, target_branch=None): |
|
799 |
"""Create a branch of this format in a_bzrdir.""" |
|
800 |
if target_branch is None: |
|
801 |
# this format does not implement branch itself, thus the implicit
|
|
802 |
# creation contract must see it as uninitializable
|
|
803 |
raise errors.UninitializableFormat(self) |
|
804 |
mutter('creating branch reference in %s', a_bzrdir.transport.base) |
|
805 |
branch_transport = a_bzrdir.get_branch_transport(self) |
|
806 |
# FIXME rbc 20060209 one j-a-ms encoding branch lands this str() cast is not needed.
|
|
807 |
branch_transport.put('location', StringIO(str(target_branch.bzrdir.root_transport.base))) |
|
808 |
branch_transport.put('format', StringIO(self.get_format_string())) |
|
809 |
return self.open(a_bzrdir, _found=True) |
|
810 |
||
811 |
def __init__(self): |
|
812 |
super(BranchReferenceFormat, self).__init__() |
|
813 |
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1() |
|
814 |
||
815 |
def _make_reference_clone_function(format, a_branch): |
|
816 |
"""Create a clone() routine for a branch dynamically.""" |
|
817 |
def clone(to_bzrdir, revision_id=None): |
|
818 |
"""See Branch.clone().""" |
|
819 |
return format.initialize(to_bzrdir, a_branch) |
|
820 |
# cannot obey revision_id limits when cloning a reference ...
|
|
821 |
# FIXME RBC 20060210 either nuke revision_id for clone, or
|
|
822 |
# emit some sort of warning/error to the caller ?!
|
|
823 |
return clone |
|
824 |
||
825 |
def open(self, a_bzrdir, _found=False): |
|
826 |
"""Return the branch that the branch reference in a_bzrdir points at. |
|
827 |
||
828 |
_found is a private parameter, do not use it. It is used to indicate
|
|
829 |
if format probing has already be done.
|
|
830 |
"""
|
|
831 |
if not _found: |
|
832 |
format = BranchFormat.find_format(a_bzrdir) |
|
833 |
assert format.__class__ == self.__class__ |
|
834 |
transport = a_bzrdir.get_branch_transport(None) |
|
835 |
real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read()) |
|
836 |
result = real_bzrdir.open_branch() |
|
837 |
# this changes the behaviour of result.clone to create a new reference
|
|
838 |
# rather than a copy of the content of the branch.
|
|
839 |
# I did not use a proxy object because that needs much more extensive
|
|
840 |
# testing, and we are only changing one behaviour at the moment.
|
|
841 |
# If we decide to alter more behaviours - i.e. the implicit nickname
|
|
842 |
# then this should be refactored to introduce a tested proxy branch
|
|
843 |
# and a subclass of that for use in overriding clone() and ....
|
|
844 |
# - RBC 20060210
|
|
845 |
result.clone = self._make_reference_clone_function(result) |
|
846 |
return result |
|
847 |
||
848 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
849 |
# formats which have no format string are not discoverable
|
850 |
# 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. |
851 |
__default_format = BzrBranchFormat5() |
852 |
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. |
853 |
BranchFormat.register_format(BranchReferenceFormat()) |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
854 |
BranchFormat.set_default_format(__default_format) |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
855 |
_legacy_formats = [BzrBranchFormat4(), |
856 |
]
|
|
|
1534.4.5
by Robert Collins
Turn branch format.open into a factory. |
857 |
|
|
1495.1.5
by Jelmer Vernooij
Rename NativeBranch -> BzrBranch |
858 |
class BzrBranch(Branch): |
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
859 |
"""A branch stored in the actual filesystem. |
860 |
||
861 |
Note that it's "local" in the context of the filesystem; it doesn't
|
|
862 |
really matter if it's on an nfs/smb/afs/coda/... share, as long as
|
|
863 |
it's writable, and can be accessed via the normal filesystem API.
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
864 |
"""
|
|
353
by Martin Pool
- Per-branch locks in read and write modes. |
865 |
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
866 |
def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER, |
|
1534.4.32
by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER |
867 |
relax_version_check=DEPRECATED_PARAMETER, _format=None, |
|
1534.6.4
by Robert Collins
Creating or opening a branch will use the repository if the format supports that. |
868 |
_control_files=None, a_bzrdir=None, _repository=None): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
869 |
"""Create new branch object at a particular location. |
870 |
||
|
907.1.2
by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport. |
871 |
transport -- A Transport object, defining how to access files.
|
|
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
872 |
|
|
254
by Martin Pool
- Doc cleanups from Magnus Therning |
873 |
init -- If True, create new control files in a previously
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
874 |
unversioned directory. If False, the branch must already
|
875 |
be versioned.
|
|
876 |
||
|
1293
by Martin Pool
- add Branch constructor option to relax version check |
877 |
relax_version_check -- If true, the usual check for the branch
|
878 |
version is not applied. This is intended only for
|
|
879 |
upgrade/recovery type use; it's not guaranteed that
|
|
880 |
all operations will work on old format branches.
|
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
881 |
"""
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
882 |
if a_bzrdir is None: |
883 |
self.bzrdir = bzrdir.BzrDir.open(transport.base) |
|
884 |
else: |
|
885 |
self.bzrdir = a_bzrdir |
|
886 |
self._transport = self.bzrdir.transport.clone('..') |
|
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
887 |
self._base = self._transport.base |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
888 |
self._format = _format |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
889 |
if _control_files is None: |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
890 |
raise ValueError('BzrBranch _control_files is None') |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
891 |
self.control_files = _control_files |
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
892 |
if deprecated_passed(init): |
893 |
warn("BzrBranch.__init__(..., init=XXX): The init parameter is " |
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
894 |
"deprecated as of bzr 0.8. Please use Branch.create().", |
895 |
DeprecationWarning, |
|
896 |
stacklevel=2) |
|
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
897 |
if init: |
898 |
# this is slower than before deprecation, oh well never mind.
|
|
899 |
# -> its deprecated.
|
|
900 |
self._initialize(transport.base) |
|
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
901 |
self._check_format(_format) |
|
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. |
902 |
if deprecated_passed(relax_version_check): |
903 |
warn("BzrBranch.__init__(..., relax_version_check=XXX_: The " |
|
904 |
"relax_version_check parameter is deprecated as of bzr 0.8. "
|
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
905 |
"Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
906 |
"open() method.", |
907 |
DeprecationWarning, |
|
908 |
stacklevel=2) |
|
|
1534.4.7
by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same. |
909 |
if (not relax_version_check |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
910 |
and not self._format.is_supported()): |
|
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. |
911 |
raise errors.UnsupportedFormatError( |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
912 |
'sorry, branch format %r not supported' % self._format, |
|
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. |
913 |
['use a different bzr version', |
914 |
'or remove the .bzr directory'
|
|
915 |
' and "bzr init" again']) |
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
916 |
if deprecated_passed(transport): |
917 |
warn("BzrBranch.__init__(transport=XXX...): The transport " |
|
918 |
"parameter is deprecated as of bzr 0.8. "
|
|
919 |
"Please use Branch.open, or bzrdir.open_branch().", |
|
920 |
DeprecationWarning, |
|
921 |
stacklevel=2) |
|
|
1534.6.4
by Robert Collins
Creating or opening a branch will use the repository if the format supports that. |
922 |
self.repository = _repository |
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
923 |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
924 |
def __str__(self): |
|
1185.65.11
by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition. |
925 |
return '%s(%r)' % (self.__class__.__name__, self.base) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
926 |
|
927 |
__repr__ = __str__ |
|
928 |
||
|
578
by Martin Pool
- start to move toward Branch.lock and unlock methods, |
929 |
def __del__(self): |
|
907.1.23
by John Arbash Meinel
Branch objects now automatically create Cached stores if the protocol is_remote. |
930 |
# TODO: It might be best to do this somewhere else,
|
931 |
# but it is nice for a Branch object to automatically
|
|
932 |
# cache it's information.
|
|
933 |
# Alternatively, we could have the Transport objects cache requests
|
|
934 |
# See the earlier discussion about how major objects (like Branch)
|
|
935 |
# should never expect their __del__ function to run.
|
|
|
1185.70.6
by Martin Pool
review fixups from John |
936 |
# XXX: cache_root seems to be unused, 2006-01-13 mbp
|
|
1185.11.9
by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv |
937 |
if hasattr(self, 'cache_root') and self.cache_root is not None: |
|
907.1.23
by John Arbash Meinel
Branch objects now automatically create Cached stores if the protocol is_remote. |
938 |
try: |
|
1692.7.6
by Martin Pool
[patch] force deletion of trees containing readonly files (alexander) |
939 |
rmtree(self.cache_root) |
|
907.1.23
by John Arbash Meinel
Branch objects now automatically create Cached stores if the protocol is_remote. |
940 |
except: |
941 |
pass
|
|
942 |
self.cache_root = None |
|
943 |
||
|
907.1.17
by John Arbash Meinel
Adding a Branch.base property, removing pull_loc() |
944 |
def _get_base(self): |
|
1185.69.2
by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch |
945 |
return self._base |
|
907.1.17
by John Arbash Meinel
Adding a Branch.base property, removing pull_loc() |
946 |
|
|
1442.1.5
by Robert Collins
Give branch.base a docstring. |
947 |
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, |
948 |
|
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
949 |
def _finish_transaction(self): |
950 |
"""Exit the current transaction.""" |
|
|
1185.65.13
by Robert Collins
Merge from integration |
951 |
return self.control_files._finish_transaction() |
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
952 |
|
953 |
def get_transaction(self): |
|
|
1185.65.13
by Robert Collins
Merge from integration |
954 |
"""Return the current active transaction. |
955 |
||
956 |
If no transaction is active, this returns a passthrough object
|
|
957 |
for which all data is immediately flushed and no caching happens.
|
|
958 |
"""
|
|
959 |
# this is an explicit function so that we can do tricky stuff
|
|
960 |
# when the storage in rev_storage is elsewhere.
|
|
961 |
# we probably need to hook the two 'lock a location' and
|
|
962 |
# 'have a transaction' together more delicately, so that
|
|
963 |
# we can have two locks (branch and storage) and one transaction
|
|
964 |
# ... and finishing the transaction unlocks both, but unlocking
|
|
965 |
# does not. - RBC 20051121
|
|
966 |
return self.control_files.get_transaction() |
|
967 |
||
968 |
def _set_transaction(self, transaction): |
|
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
969 |
"""Set a new active transaction.""" |
|
1185.65.13
by Robert Collins
Merge from integration |
970 |
return self.control_files._set_transaction(transaction) |
|
353
by Martin Pool
- Per-branch locks in read and write modes. |
971 |
|
|
67
by mbp at sourcefrog
use abspath() for the function that makes an absolute |
972 |
def abspath(self, name): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
973 |
"""See Branch.abspath.""" |
|
1185.65.11
by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition. |
974 |
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. |
975 |
|
|
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. |
976 |
def _check_format(self, format): |
|
1534.4.8
by Robert Collins
Unfuck upgrade. |
977 |
"""Identify the branch format if needed. |
|
1
by mbp at sourcefrog
import from baz patch-364 |
978 |
|
|
1534.4.8
by Robert Collins
Unfuck upgrade. |
979 |
The format is stored as a reference to the format object in
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
980 |
self._format for code that needs to check it later.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
981 |
|
|
1534.4.5
by Robert Collins
Turn branch format.open into a factory. |
982 |
The format parameter is either None or the branch format class
|
983 |
used to open this branch.
|
|
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
984 |
|
985 |
FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
|
|
|
163
by mbp at sourcefrog
merge win32 portability fixes |
986 |
"""
|
|
1534.4.5
by Robert Collins
Turn branch format.open into a factory. |
987 |
if format is None: |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
988 |
format = BranchFormat.find_format(self.bzrdir) |
|
1534.4.44
by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory. |
989 |
self._format = format |
990 |
mutter("got branch format %s", self._format) |
|
|
907.1.2
by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport. |
991 |
|
|
1508.1.15
by Robert Collins
Merge from mpool. |
992 |
@needs_read_lock
|
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
993 |
def get_root_id(self): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
994 |
"""See Branch.get_root_id.""" |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
995 |
tree = self.repository.revision_tree(self.last_revision()) |
996 |
return tree.inventory.root.file_id |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
997 |
|
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
998 |
def is_locked(self): |
999 |
return self.control_files.is_locked() |
|
1000 |
||
|
1185.65.3
by Aaron Bentley
Fixed locking-- all tests pass |
1001 |
def lock_write(self): |
|
1185.65.11
by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition. |
1002 |
# TODO: test for failed two phase locks. This is known broken.
|
1003 |
self.control_files.lock_write() |
|
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
1004 |
self.repository.lock_write() |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
1005 |
|
|
1185.65.3
by Aaron Bentley
Fixed locking-- all tests pass |
1006 |
def lock_read(self): |
|
1185.65.11
by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition. |
1007 |
# TODO: test for failed two phase locks. This is known broken.
|
1008 |
self.control_files.lock_read() |
|
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
1009 |
self.repository.lock_read() |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
1010 |
|
1011 |
def unlock(self): |
|
|
1185.65.11
by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition. |
1012 |
# TODO: test for failed two phase locks. This is known broken.
|
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
1013 |
try: |
1014 |
self.repository.unlock() |
|
1015 |
finally: |
|
1016 |
self.control_files.unlock() |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1017 |
|
|
1185.70.3
by Martin Pool
Various updates to make storage branch mergeable: |
1018 |
def peek_lock_mode(self): |
1019 |
if self.control_files._lock_count == 0: |
|
1020 |
return None |
|
1021 |
else: |
|
1022 |
return self.control_files._lock_mode |
|
1023 |
||
|
1694.2.6
by Martin Pool
[merge] bzr.dev |
1024 |
def get_physical_lock_status(self): |
1025 |
return self.control_files.get_physical_lock_status() |
|
1026 |
||
|
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
1027 |
@needs_read_lock
|
|
1185.50.9
by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision |
1028 |
def print_file(self, file, revision_id): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1029 |
"""See Branch.print_file.""" |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
1030 |
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. |
1031 |
|
1032 |
@needs_write_lock
|
|
|
905
by Martin Pool
- merge aaron's append_multiple.patch |
1033 |
def append_revision(self, *revision_ids): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1034 |
"""See Branch.append_revision.""" |
|
905
by Martin Pool
- merge aaron's append_multiple.patch |
1035 |
for revision_id in revision_ids: |
1036 |
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. |
1037 |
rev_history = self.revision_history() |
1038 |
rev_history.extend(revision_ids) |
|
|
1442.1.68
by Robert Collins
'bzr pull' now accepts '--clobber'. |
1039 |
self.set_revision_history(rev_history) |
1040 |
||
1041 |
@needs_write_lock
|
|
1042 |
def set_revision_history(self, rev_history): |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1043 |
"""See Branch.set_revision_history.""" |
|
1185.65.12
by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8. |
1044 |
self.control_files.put_utf8( |
|
1185.65.11
by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition. |
1045 |
'revision-history', '\n'.join(rev_history)) |
|
1563.2.34
by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction |
1046 |
transaction = self.get_transaction() |
1047 |
history = transaction.map.find_revision_history() |
|
1048 |
if history is not None: |
|
1049 |
# update the revision history in the identity map.
|
|
1050 |
history[:] = list(rev_history) |
|
1051 |
# this call is disabled because revision_history is
|
|
1052 |
# not really an object yet, and the transaction is for objects.
|
|
1053 |
# transaction.register_dirty(history)
|
|
1054 |
else: |
|
1055 |
transaction.map.add_revision_history(rev_history) |
|
1056 |
# this call is disabled because revision_history is
|
|
1057 |
# not really an object yet, and the transaction is for objects.
|
|
1058 |
# transaction.register_clean(history)
|
|
|
233
by mbp at sourcefrog
- more output from test.sh |
1059 |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1060 |
def get_revision_delta(self, revno): |
1061 |
"""Return the delta for one revision. |
|
1062 |
||
1063 |
The delta is relative to its mainline predecessor, or the
|
|
1064 |
empty tree for revision 1.
|
|
1065 |
"""
|
|
1066 |
assert isinstance(revno, int) |
|
1067 |
rh = self.revision_history() |
|
1068 |
if not (1 <= revno <= len(rh)): |
|
1069 |
raise InvalidRevisionNumber(revno) |
|
1070 |
||
1071 |
# revno is 1-based; list is 0-based
|
|
1072 |
||
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
1073 |
new_tree = self.repository.revision_tree(rh[revno-1]) |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1074 |
if revno == 1: |
1075 |
old_tree = EmptyTree() |
|
1076 |
else: |
|
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
1077 |
old_tree = self.repository.revision_tree(rh[revno-2]) |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
1078 |
return compare_trees(old_tree, new_tree) |
1079 |
||
|
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
1080 |
@needs_read_lock
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
1081 |
def revision_history(self): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1082 |
"""See Branch.revision_history.""" |
|
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
1083 |
transaction = self.get_transaction() |
1084 |
history = transaction.map.find_revision_history() |
|
1085 |
if history is not None: |
|
1086 |
mutter("cache hit for revision-history in %s", self) |
|
|
1417.1.12
by Robert Collins
cache revision history during read transactions |
1087 |
return list(history) |
|
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
1088 |
history = [l.rstrip('\r\n') for l in |
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
1089 |
self.control_files.get_utf8('revision-history').readlines()] |
|
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
1090 |
transaction.map.add_revision_history(history) |
1091 |
# this call is disabled because revision_history is
|
|
1092 |
# not really an object yet, and the transaction is for objects.
|
|
1093 |
# transaction.register_clean(history, precious=True)
|
|
1094 |
return list(history) |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
1095 |
|
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
1096 |
@needs_write_lock
|
|
1505.1.21
by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history. |
1097 |
def update_revisions(self, other, stop_revision=None): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1098 |
"""See Branch.update_revisions.""" |
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
1099 |
other.lock_read() |
1100 |
try: |
|
1101 |
if stop_revision is None: |
|
1102 |
stop_revision = other.last_revision() |
|
1103 |
if stop_revision is None: |
|
1104 |
# if there are no commits, we're done.
|
|
1105 |
return
|
|
1106 |
# whats the current last revision, before we fetch [and change it
|
|
1107 |
# possibly]
|
|
1108 |
last_rev = self.last_revision() |
|
1109 |
# we fetch here regardless of whether we need to so that we pickup
|
|
1110 |
# filled in ghosts.
|
|
1111 |
self.fetch(other, stop_revision) |
|
1112 |
my_ancestry = self.repository.get_ancestry(last_rev) |
|
1113 |
if stop_revision in my_ancestry: |
|
1114 |
# last_revision is a descendant of stop_revision
|
|
1115 |
return
|
|
1116 |
# stop_revision must be a descendant of last_revision
|
|
1117 |
stop_graph = self.repository.get_revision_graph(stop_revision) |
|
1118 |
if last_rev is not None and last_rev not in stop_graph: |
|
1119 |
# our previous tip is not merged into stop_revision
|
|
1120 |
raise errors.DivergedBranches(self, other) |
|
1121 |
# make a new revision history from the graph
|
|
1122 |
current_rev_id = stop_revision |
|
1123 |
new_history = [] |
|
1124 |
while current_rev_id not in (None, NULL_REVISION): |
|
1125 |
new_history.append(current_rev_id) |
|
1126 |
current_rev_id_parents = stop_graph[current_rev_id] |
|
1127 |
try: |
|
1128 |
current_rev_id = current_rev_id_parents[0] |
|
1129 |
except IndexError: |
|
1130 |
current_rev_id = None |
|
1131 |
new_history.reverse() |
|
1132 |
self.set_revision_history(new_history) |
|
1133 |
finally: |
|
1134 |
other.unlock() |
|
|
1185.12.44
by abentley
Restored branch convergence to bzr pull |
1135 |
|
|
1185.33.59
by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg) |
1136 |
def basis_tree(self): |
1137 |
"""See Branch.basis_tree.""" |
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1138 |
return self.repository.revision_tree(self.last_revision()) |
|
1185.33.59
by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg) |
1139 |
|
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1140 |
@deprecated_method(zero_eight) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1141 |
def working_tree(self): |
|
1534.4.35
by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree() |
1142 |
"""Create a Working tree object for this branch.""" |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
1143 |
from bzrlib.transport.local import LocalTransport |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
1144 |
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. |
1145 |
not isinstance(self._transport, LocalTransport)): |
|
1497
by Robert Collins
Move Branch.read_working_inventory to WorkingTree. |
1146 |
raise NoWorkingTree(self.base) |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
1147 |
return self.bzrdir.open_workingtree() |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1148 |
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1149 |
@needs_write_lock
|
|
1185.76.1
by Erik BÃ¥gfors
Support for --revision in pull |
1150 |
def pull(self, source, overwrite=False, stop_revision=None): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1151 |
"""See Branch.pull.""" |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1152 |
source.lock_read() |
1153 |
try: |
|
|
1185.33.44
by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer) |
1154 |
old_count = len(self.revision_history()) |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1155 |
try: |
|
1185.76.1
by Erik BÃ¥gfors
Support for --revision in pull |
1156 |
self.update_revisions(source,stop_revision) |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1157 |
except DivergedBranches: |
1158 |
if not overwrite: |
|
1159 |
raise
|
|
|
1185.50.5
by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer) |
1160 |
if overwrite: |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1161 |
self.set_revision_history(source.revision_history()) |
|
1185.33.44
by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer) |
1162 |
new_count = len(self.revision_history()) |
1163 |
return new_count - old_count |
|
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1164 |
finally: |
1165 |
source.unlock() |
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
1166 |
|
|
1149
by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it |
1167 |
def get_parent(self): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1168 |
"""See Branch.get_parent.""" |
|
1149
by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it |
1169 |
_locs = ['parent', 'pull', 'x-pull'] |
|
1685.1.70
by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken |
1170 |
assert self.base[-1] == '/' |
|
1149
by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it |
1171 |
for l in _locs: |
1172 |
try: |
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
1173 |
return urlutils.join(self.base[:-1], |
|
1685.1.70
by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken |
1174 |
self.control_files.get(l).read().strip('\n')) |
|
1185.31.45
by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught. |
1175 |
except NoSuchFile: |
1176 |
pass
|
|
|
1149
by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it |
1177 |
return None |
1178 |
||
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1179 |
def get_push_location(self): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1180 |
"""See Branch.get_push_location.""" |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1181 |
config = bzrlib.config.BranchConfig(self) |
1182 |
push_loc = config.get_user_option('push_location') |
|
1183 |
return push_loc |
|
1184 |
||
1185 |
def set_push_location(self, location): |
|
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1186 |
"""See Branch.set_push_location.""" |
|
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
1187 |
config = bzrlib.config.LocationConfig(self.base) |
1188 |
config.set_user_option('push_location', location) |
|
1189 |
||
|
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
1190 |
@needs_write_lock
|
|
1150
by Martin Pool
- add new Branch.set_parent and tests |
1191 |
def set_parent(self, url): |
|
1495.1.2
by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch. |
1192 |
"""See Branch.set_parent.""" |
|
1150
by Martin Pool
- add new Branch.set_parent and tests |
1193 |
# TODO: Maybe delete old location files?
|
|
1185.65.29
by Robert Collins
Implement final review suggestions. |
1194 |
# URLs should never be unicode, even on the local fs,
|
1195 |
# FIXUP this and get_parent in a future branch format bump:
|
|
1196 |
# read and rewrite the file, and have the new format code read
|
|
1197 |
# using .get not .get_utf8. RBC 20060125
|
|
|
1614.2.5
by Olaf Conradi
Added testcase for bzr merge --remember. |
1198 |
if url is None: |
1199 |
self.control_files._transport.delete('parent') |
|
1200 |
else: |
|
|
1685.1.71
by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls |
1201 |
if isinstance(url, unicode): |
1202 |
try: |
|
1203 |
url = url.encode('ascii') |
|
1204 |
except UnicodeEncodeError: |
|
1205 |
raise bzrlib.errors.InvalidURL(url, |
|
1206 |
"Urls must be 7-bit ascii, "
|
|
1207 |
"use bzrlib.urlutils.escape") |
|
1208 |
||
|
1685.1.70
by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken |
1209 |
url = urlutils.relative_url(self.base, url) |
1210 |
self.control_files.put('parent', url + '\n') |
|
|
1150
by Martin Pool
- add new Branch.set_parent and tests |
1211 |
|
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
1212 |
def tree_config(self): |
1213 |
return TreeConfig(self) |
|
1214 |
||
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1215 |
|
1216 |
class BzrBranch5(BzrBranch): |
|
1217 |
"""A format 5 branch. This supports new features over plan branches. |
|
1218 |
||
1219 |
It has support for a master_branch which is the data for bound branches.
|
|
1220 |
"""
|
|
1221 |
||
1222 |
def __init__(self, |
|
1223 |
_format, |
|
1224 |
_control_files, |
|
1225 |
a_bzrdir, |
|
1226 |
_repository): |
|
1227 |
super(BzrBranch5, self).__init__(_format=_format, |
|
1228 |
_control_files=_control_files, |
|
1229 |
a_bzrdir=a_bzrdir, |
|
1230 |
_repository=_repository) |
|
1231 |
||
|
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
1232 |
@needs_write_lock
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1233 |
def pull(self, source, overwrite=False, stop_revision=None): |
1234 |
"""Updates branch.pull to be bound branch aware.""" |
|
1235 |
bound_location = self.get_bound_location() |
|
1236 |
if source.base != bound_location: |
|
1237 |
# not pulling from master, so we need to update master.
|
|
1238 |
master_branch = self.get_master_branch() |
|
1239 |
if master_branch: |
|
1240 |
master_branch.pull(source) |
|
1241 |
source = master_branch |
|
1242 |
return super(BzrBranch5, self).pull(source, overwrite, stop_revision) |
|
|
1185.11.5
by John Arbash Meinel
Merged up-to-date against mainline, still broken. |
1243 |
|
|
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
1244 |
def get_bound_location(self): |
|
1185.66.8
by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation |
1245 |
try: |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1246 |
return self.control_files.get_utf8('bound').read()[:-1] |
1247 |
except errors.NoSuchFile: |
|
|
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
1248 |
return None |
|
1185.66.8
by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation |
1249 |
|
1250 |
@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. |
1251 |
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 |
1252 |
"""Return the branch we are bound to. |
1253 |
|
|
1254 |
:return: Either a Branch, or None
|
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1255 |
|
|
1759.2.2
by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron. |
1256 |
This could memoise the branch, but if thats done
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1257 |
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. |
1258 |
So for now we just don't memoise it.
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1259 |
# 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 |
1260 |
"""
|
1261 |
bound_loc = self.get_bound_location() |
|
1262 |
if not bound_loc: |
|
1263 |
return None |
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1264 |
try: |
1265 |
return Branch.open(bound_loc) |
|
1266 |
except (errors.NotBranchError, errors.ConnectionError), e: |
|
1267 |
raise errors.BoundBranchConnectionFailure( |
|
1268 |
self, bound_loc, e) |
|
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1269 |
|
|
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
1270 |
@needs_write_lock
|
1271 |
def set_bound_location(self, location): |
|
|
1505.1.27
by John Arbash Meinel
Adding tests against an sftp branch. |
1272 |
"""Set the target where this branch is bound to. |
1273 |
||
1274 |
:param location: URL to the target branch
|
|
1275 |
"""
|
|
|
1505.1.25
by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass. |
1276 |
if location: |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1277 |
self.control_files.put_utf8('bound', location+'\n') |
|
1185.64.2
by Goffredo Baroncelli
- implemented some suggestion by Robert Collins |
1278 |
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. |
1279 |
try: |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1280 |
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. |
1281 |
except NoSuchFile: |
1282 |
return False |
|
1283 |
return True |
|
|
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
1284 |
|
1285 |
@needs_write_lock
|
|
1286 |
def bind(self, other): |
|
1287 |
"""Bind the local branch the other branch. |
|
1288 |
||
1289 |
:param other: The branch to bind to
|
|
1290 |
:type other: Branch
|
|
|
1185.64.2
by Goffredo Baroncelli
- implemented some suggestion by Robert Collins |
1291 |
"""
|
|
1505.1.24
by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge |
1292 |
# TODO: jam 20051230 Consider checking if the target is bound
|
1293 |
# It is debatable whether you should be able to bind to
|
|
1294 |
# a branch which is itself bound.
|
|
1295 |
# Committing is obviously forbidden,
|
|
1296 |
# but binding itself may not be.
|
|
1297 |
# Since we *have* to check at commit time, we don't
|
|
1298 |
# *need* to check here
|
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1299 |
self.pull(other) |
1300 |
||
1301 |
# we are now equal to or a suffix of other.
|
|
|
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
1302 |
|
1303 |
# Since we have 'pulled' from the remote location,
|
|
1304 |
# now we should try to pull in the opposite direction
|
|
1305 |
# in case the local tree has more revisions than the
|
|
1306 |
# remote one.
|
|
1307 |
# There may be a different check you could do here
|
|
1308 |
# rather than actually trying to install revisions remotely.
|
|
1309 |
# TODO: capture an exception which indicates the remote branch
|
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
1310 |
# is not writable.
|
|
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
1311 |
# If it is up-to-date, this probably should not be a failure
|
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
1312 |
|
1313 |
# lock other for write so the revision-history syncing cannot race
|
|
1314 |
other.lock_write() |
|
1315 |
try: |
|
1316 |
other.pull(self) |
|
1317 |
# if this does not error, other now has the same last rev we do
|
|
1318 |
# it can only error if the pull from other was concurrent with
|
|
1319 |
# a commit to other from someone else.
|
|
1320 |
||
1321 |
# until we ditch revision-history, we need to sync them up:
|
|
1322 |
self.set_revision_history(other.revision_history()) |
|
1323 |
# now other and self are up to date with each other and have the
|
|
1324 |
# same revision-history.
|
|
1325 |
finally: |
|
1326 |
other.unlock() |
|
1327 |
||
|
1505.1.3
by John Arbash Meinel
(broken) Adding more tests, and some functionality |
1328 |
self.set_bound_location(other.base) |
|
1505.1.2
by John Arbash Meinel
(broken) working on implementing bound branches. |
1329 |
|
|
1505.1.5
by John Arbash Meinel
Added a test for the unbind command. |
1330 |
@needs_write_lock
|
1331 |
def unbind(self): |
|
1332 |
"""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. |
1333 |
return self.set_bound_location(None) |
|
1185.66.8
by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation |
1334 |
|
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
1335 |
@needs_write_lock
|
1336 |
def update(self): |
|
1337 |
"""Synchronise this branch with the master branch if any. |
|
1338 |
||
1339 |
:return: None or the last_revision that was pivoted out during the
|
|
1340 |
update.
|
|
1341 |
"""
|
|
1342 |
master = self.get_master_branch() |
|
1343 |
if master is not None: |
|
1344 |
old_tip = self.last_revision() |
|
1345 |
self.pull(master, overwrite=True) |
|
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
1346 |
if old_tip in self.repository.get_ancestry(self.last_revision()): |
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
1347 |
return None |
1348 |
return old_tip |
|
1349 |
return None |
|
1350 |
||
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
1351 |
|
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1352 |
class BranchTestProviderAdapter(object): |
1353 |
"""A tool to generate a suite testing multiple branch formats at once. |
|
1354 |
||
1355 |
This is done by copying the test once for each transport and injecting
|
|
1356 |
the transport_server, transport_readonly_server, and branch_format
|
|
1357 |
classes into each copy. Each copy is also given a new id() to make it
|
|
1358 |
easy to identify.
|
|
1359 |
"""
|
|
1360 |
||
1361 |
def __init__(self, transport_server, transport_readonly_server, formats): |
|
1362 |
self._transport_server = transport_server |
|
1363 |
self._transport_readonly_server = transport_readonly_server |
|
1364 |
self._formats = formats |
|
1365 |
||
1366 |
def adapt(self, test): |
|
1367 |
result = TestSuite() |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1368 |
for branch_format, bzrdir_format in self._formats: |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1369 |
new_test = deepcopy(test) |
1370 |
new_test.transport_server = self._transport_server |
|
1371 |
new_test.transport_readonly_server = self._transport_readonly_server |
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1372 |
new_test.bzrdir_format = bzrdir_format |
1373 |
new_test.branch_format = branch_format |
|
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1374 |
def make_new_test_id(): |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1375 |
new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__) |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1376 |
return lambda: new_id |
1377 |
new_test.id = make_new_test_id() |
|
1378 |
result.addTest(new_test) |
|
1379 |
return result |
|
1380 |
||
1381 |
||
|
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
1382 |
class BranchCheckResult(object): |
1383 |
"""Results of checking branch consistency. |
|
1384 |
||
1385 |
:see: Branch.check
|
|
1386 |
"""
|
|
1387 |
||
1388 |
def __init__(self, branch): |
|
1389 |
self.branch = branch |
|
1390 |
||
1391 |
def report_results(self, verbose): |
|
1392 |
"""Report the check results via trace.note. |
|
1393 |
|
|
1394 |
:param verbose: Requests more detailed display of what was checked,
|
|
1395 |
if any.
|
|
1396 |
"""
|
|
1397 |
note('checked branch %s format %s', |
|
1398 |
self.branch.base, |
|
1399 |
self.branch._format) |
|
1400 |
||
1401 |
||
|
1
by mbp at sourcefrog
import from baz patch-364 |
1402 |
######################################################################
|
1403 |
# predicates
|
|
1404 |
||
1405 |
||
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
1406 |
@deprecated_function(zero_eight) |
1407 |
def is_control_file(*args, **kwargs): |
|
1408 |
"""See bzrlib.workingtree.is_control_file.""" |
|
1409 |
return bzrlib.workingtree.is_control_file(*args, **kwargs) |