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