70
by mbp at sourcefrog
Prepare for smart recursive add. |
1 |
# Copyright (C) 2005 Canonical Ltd
|
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.
|
|
7 |
||
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.
|
|
12 |
||
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 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
18 |
import sys |
19 |
import os |
|
1
by mbp at sourcefrog
import from baz patch-364 |
20 |
|
21 |
import bzrlib |
|
800
by Martin Pool
Merge John's import-speedup branch: |
22 |
from bzrlib.trace import mutter, note |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
23 |
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \ |
24 |
splitpath, \ |
|
800
by Martin Pool
Merge John's import-speedup branch: |
25 |
sha_file, appendpath, file_kind |
1094
by Martin Pool
- merge aaron's merge improvements 999..1008 |
26 |
|
1185.2.1
by Lalo Martins
moving DivergedBranches from bzrlib.branch to bzrlib.errors, obeying: |
27 |
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId, \ |
1185.2.2
by Lalo Martins
cleaning up and refactoring the branch module. |
28 |
DivergedBranches, NotBranchError |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
29 |
from bzrlib.textui import show_status |
30 |
from bzrlib.revision import Revision |
|
31 |
from bzrlib.delta import compare_trees |
|
32 |
from bzrlib.tree import EmptyTree, RevisionTree |
|
1182
by Martin Pool
- more disentangling of xml storage format from objects |
33 |
import bzrlib.xml |
1104
by Martin Pool
- Add a simple UIFactory |
34 |
import bzrlib.ui |
35 |
||
1094
by Martin Pool
- merge aaron's merge improvements 999..1008 |
36 |
|
1110
by Martin Pool
- merge aaron's merge improvements: |
37 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
38 |
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n" |
39 |
## TODO: Maybe include checks for common corruption of newlines, etc?
|
|
40 |
||
41 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
42 |
# TODO: Some operations like log might retrieve the same revisions
|
43 |
# repeatedly to calculate deltas. We could perhaps have a weakref
|
|
44 |
# cache in memory to make this faster.
|
|
45 |
||
1185.2.12
by Lalo Martins
killed find_cached_root() |
46 |
def find_branch(*ignored, **ignored_too): |
47 |
# XXX: leave this here for about one release, then remove it
|
|
48 |
raise NotImplementedError('find_branch() is not supported anymore, ' |
|
49 |
'please use one of the new branch constructors') |
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
50 |
|
600
by Martin Pool
- Better Branch.relpath that doesn't match on |
51 |
def _relpath(base, path): |
52 |
"""Return path relative to base, or raise exception.
|
|
53 |
||
54 |
The path may be either an absolute path or a path relative to the
|
|
55 |
current working directory.
|
|
56 |
||
57 |
Lifted out of Branch.relpath for ease of testing.
|
|
58 |
||
59 |
os.path.commonprefix (python2.4) has a bad bug that it works just
|
|
60 |
on string prefixes, assuming that '/u' is a prefix of '/u2'. This
|
|
61 |
avoids that problem."""
|
|
62 |
rp = os.path.abspath(path) |
|
63 |
||
64 |
s = [] |
|
65 |
head = rp |
|
66 |
while len(head) >= len(base): |
|
67 |
if head == base: |
|
68 |
break
|
|
69 |
head, tail = os.path.split(head) |
|
70 |
if tail: |
|
71 |
s.insert(0, tail) |
|
72 |
else: |
|
73 |
raise NotBranchError("path %r is not within branch %r" % (rp, base)) |
|
74 |
||
75 |
return os.sep.join(s) |
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
76 |
|
77 |
||
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
78 |
def find_branch_root(f=None): |
79 |
"""Find the branch root enclosing f, or pwd.
|
|
80 |
||
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
81 |
f may be a filename or a URL.
|
82 |
||
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
83 |
It is not necessary that f exists.
|
84 |
||
85 |
Basically we keep looking up until we find the control directory or
|
|
1074
by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can |
86 |
run into the root. If there isn't one, raises NotBranchError.
|
87 |
"""
|
|
184
by mbp at sourcefrog
pychecker fixups |
88 |
if f == None: |
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
89 |
f = os.getcwd() |
90 |
elif hasattr(os.path, 'realpath'): |
|
91 |
f = os.path.realpath(f) |
|
92 |
else: |
|
93 |
f = os.path.abspath(f) |
|
425
by Martin Pool
- check from aaron for existence of a branch |
94 |
if not os.path.exists(f): |
95 |
raise BzrError('%r does not exist' % f) |
|
96 |
||
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
97 |
|
98 |
orig_f = f |
|
99 |
||
100 |
while True: |
|
101 |
if os.path.exists(os.path.join(f, bzrlib.BZRDIR)): |
|
102 |
return f |
|
103 |
head, tail = os.path.split(f) |
|
104 |
if head == f: |
|
105 |
# reached the root, whatever that may be
|
|
1185.2.2
by Lalo Martins
cleaning up and refactoring the branch module. |
106 |
raise NotBranchError('%s is not in a branch' % orig_f) |
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
107 |
f = head |
1074
by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can |
108 |
|
109 |
||
110 |
||
685
by Martin Pool
- add -r option to the branch command |
111 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
112 |
######################################################################
|
113 |
# branch objects
|
|
114 |
||
558
by Martin Pool
- All top-level classes inherit from object |
115 |
class Branch(object): |
1
by mbp at sourcefrog
import from baz patch-364 |
116 |
"""Branch holding a history of revisions.
|
117 |
||
343
by Martin Pool
doc |
118 |
base
|
1185.2.4
by Lalo Martins
splitting a "LocalBranch" class off from Branch |
119 |
Base directory/url of the branch.
|
120 |
"""
|
|
121 |
base = None |
|
122 |
||
1185.2.12
by Lalo Martins
killed find_cached_root() |
123 |
def __init__(self, *ignored, **ignored_too): |
1185.2.10
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
124 |
raise NotImplementedError('The Branch class is abstract') |
1185.2.4
by Lalo Martins
splitting a "LocalBranch" class off from Branch |
125 |
|
1185.2.8
by Lalo Martins
creating the new branch constructors |
126 |
@staticmethod
|
127 |
def open(base): |
|
128 |
"""Open an existing branch, rooted at 'base' (url)"""
|
|
129 |
if base and (base.startswith('http://') or base.startswith('https://')): |
|
130 |
from bzrlib.remotebranch import RemoteBranch |
|
131 |
return RemoteBranch(base, find_root=False) |
|
132 |
else: |
|
133 |
return LocalBranch(base, find_root=False) |
|
134 |
||
135 |
@staticmethod
|
|
136 |
def open_containing(url): |
|
137 |
"""Open an existing branch, containing url (search upwards for the root)
|
|
138 |
"""
|
|
139 |
if url and (url.startswith('http://') or url.startswith('https://')): |
|
140 |
from bzrlib.remotebranch import RemoteBranch |
|
141 |
return RemoteBranch(url) |
|
142 |
else: |
|
143 |
return LocalBranch(url) |
|
144 |
||
145 |
@staticmethod
|
|
146 |
def initialize(base): |
|
147 |
"""Create a new branch, rooted at 'base' (url)"""
|
|
148 |
if base and (base.startswith('http://') or base.startswith('https://')): |
|
149 |
from bzrlib.remotebranch import RemoteBranch |
|
150 |
return RemoteBranch(base, init=True) |
|
151 |
else: |
|
152 |
return LocalBranch(base, init=True) |
|
153 |
||
1185.2.12
by Lalo Martins
killed find_cached_root() |
154 |
def setup_caching(self, cache_root): |
155 |
"""Subclasses that care about caching should override this, and set
|
|
156 |
up cached stores located under cache_root.
|
|
157 |
"""
|
|
158 |
||
1185.2.4
by Lalo Martins
splitting a "LocalBranch" class off from Branch |
159 |
|
160 |
class LocalBranch(Branch): |
|
161 |
"""A branch stored in the actual filesystem.
|
|
162 |
||
163 |
Note that it's "local" in the context of the filesystem; it doesn't
|
|
164 |
really matter if it's on an nfs/smb/afs/coda/... share, as long as
|
|
165 |
it's writable, and can be accessed via the normal filesystem API.
|
|
578
by Martin Pool
- start to move toward Branch.lock and unlock methods, |
166 |
|
167 |
_lock_mode
|
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
168 |
None, or 'r' or 'w'
|
169 |
||
170 |
_lock_count
|
|
171 |
If _lock_mode is true, a positive count of the number of times the
|
|
172 |
lock has been taken.
|
|
578
by Martin Pool
- start to move toward Branch.lock and unlock methods, |
173 |
|
614
by Martin Pool
- unify two defintions of LockError |
174 |
_lock
|
175 |
Lock object from bzrlib.lock.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
176 |
"""
|
1185.2.4
by Lalo Martins
splitting a "LocalBranch" class off from Branch |
177 |
# We actually expect this class to be somewhat short-lived; part of its
|
178 |
# purpose is to try to isolate what bits of the branch logic are tied to
|
|
179 |
# filesystem access, so that in a later step, we can extricate them to
|
|
180 |
# a separarte ("storage") class.
|
|
578
by Martin Pool
- start to move toward Branch.lock and unlock methods, |
181 |
_lock_mode = None |
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
182 |
_lock_count = None |
615
by Martin Pool
Major rework of locking code: |
183 |
_lock = None |
897
by Martin Pool
- merge john's revision-naming code |
184 |
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
185 |
def __init__(self, base, init=False, find_root=True): |
1
by mbp at sourcefrog
import from baz patch-364 |
186 |
"""Create new branch object at a particular location.
|
187 |
||
1092.1.45
by Robert Collins
add support for file:// urls to Branch() |
188 |
base -- Base directory for the branch. May be a file:// url.
|
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
189 |
|
254
by Martin Pool
- Doc cleanups from Magnus Therning |
190 |
init -- If True, create new control files in a previously
|
1
by mbp at sourcefrog
import from baz patch-364 |
191 |
unversioned directory. If False, the branch must already
|
192 |
be versioned.
|
|
193 |
||
254
by Martin Pool
- Doc cleanups from Magnus Therning |
194 |
find_root -- If true and init is false, find the root of the
|
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
195 |
existing branch containing base.
|
196 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
197 |
In the test suite, creation of new trees is tested using the
|
198 |
`ScratchBranch` class.
|
|
199 |
"""
|
|
800
by Martin Pool
Merge John's import-speedup branch: |
200 |
from bzrlib.store import ImmutableStore |
1
by mbp at sourcefrog
import from baz patch-364 |
201 |
if init: |
64
by mbp at sourcefrog
- fix up init command for new find-branch-root function |
202 |
self.base = os.path.realpath(base) |
1
by mbp at sourcefrog
import from baz patch-364 |
203 |
self._make_control() |
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
204 |
elif find_root: |
205 |
self.base = find_branch_root(base) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
206 |
else: |
1092.1.45
by Robert Collins
add support for file:// urls to Branch() |
207 |
if base.startswith("file://"): |
208 |
base = base[7:] |
|
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
209 |
self.base = os.path.realpath(base) |
1
by mbp at sourcefrog
import from baz patch-364 |
210 |
if not isdir(self.controlfilename('.')): |
576
by Martin Pool
- raise exceptions rather than using bailout() |
211 |
raise NotBranchError("not a bzr branch: %s" % quotefn(base), |
212 |
['use "bzr init" to initialize a new working tree', |
|
213 |
'current bzr can only operate from top-of-tree']) |
|
62
by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron |
214 |
self._check_format() |
1
by mbp at sourcefrog
import from baz patch-364 |
215 |
|
216 |
self.text_store = ImmutableStore(self.controlfilename('text-store')) |
|
217 |
self.revision_store = ImmutableStore(self.controlfilename('revision-store')) |
|
218 |
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store')) |
|
219 |
||
220 |
||
221 |
def __str__(self): |
|
222 |
return '%s(%r)' % (self.__class__.__name__, self.base) |
|
223 |
||
224 |
||
225 |
__repr__ = __str__ |
|
226 |
||
227 |
||
578
by Martin Pool
- start to move toward Branch.lock and unlock methods, |
228 |
def __del__(self): |
615
by Martin Pool
Major rework of locking code: |
229 |
if self._lock_mode or self._lock: |
1185.2.2
by Lalo Martins
cleaning up and refactoring the branch module. |
230 |
from bzrlib.warnings import warn |
578
by Martin Pool
- start to move toward Branch.lock and unlock methods, |
231 |
warn("branch %r was not explicitly unlocked" % self) |
615
by Martin Pool
Major rework of locking code: |
232 |
self._lock.unlock() |
578
by Martin Pool
- start to move toward Branch.lock and unlock methods, |
233 |
|
610
by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write |
234 |
def lock_write(self): |
235 |
if self._lock_mode: |
|
236 |
if self._lock_mode != 'w': |
|
1185.2.2
by Lalo Martins
cleaning up and refactoring the branch module. |
237 |
from bzrlib.errors import LockError |
610
by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write |
238 |
raise LockError("can't upgrade to a write lock from %r" % |
239 |
self._lock_mode) |
|
240 |
self._lock_count += 1 |
|
241 |
else: |
|
615
by Martin Pool
Major rework of locking code: |
242 |
from bzrlib.lock import WriteLock |
610
by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write |
243 |
|
615
by Martin Pool
Major rework of locking code: |
244 |
self._lock = WriteLock(self.controlfilename('branch-lock')) |
610
by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write |
245 |
self._lock_mode = 'w' |
246 |
self._lock_count = 1 |
|
247 |
||
248 |
||
249 |
def lock_read(self): |
|
250 |
if self._lock_mode: |
|
251 |
assert self._lock_mode in ('r', 'w'), \ |
|
252 |
"invalid lock mode %r" % self._lock_mode |
|
253 |
self._lock_count += 1 |
|
254 |
else: |
|
615
by Martin Pool
Major rework of locking code: |
255 |
from bzrlib.lock import ReadLock |
610
by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write |
256 |
|
615
by Martin Pool
Major rework of locking code: |
257 |
self._lock = ReadLock(self.controlfilename('branch-lock')) |
610
by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write |
258 |
self._lock_mode = 'r' |
259 |
self._lock_count = 1 |
|
260 |
||
578
by Martin Pool
- start to move toward Branch.lock and unlock methods, |
261 |
def unlock(self): |
262 |
if not self._lock_mode: |
|
1185.2.2
by Lalo Martins
cleaning up and refactoring the branch module. |
263 |
from bzrlib.errors import LockError |
610
by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write |
264 |
raise LockError('branch %r is not locked' % (self)) |
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
265 |
|
266 |
if self._lock_count > 1: |
|
267 |
self._lock_count -= 1 |
|
268 |
else: |
|
615
by Martin Pool
Major rework of locking code: |
269 |
self._lock.unlock() |
270 |
self._lock = None |
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
271 |
self._lock_mode = self._lock_count = None |
353
by Martin Pool
- Per-branch locks in read and write modes. |
272 |
|
67
by mbp at sourcefrog
use abspath() for the function that makes an absolute |
273 |
def abspath(self, name): |
274 |
"""Return absolute filename for something in the branch"""
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
275 |
return os.path.join(self.base, name) |
67
by mbp at sourcefrog
use abspath() for the function that makes an absolute |
276 |
|
68
by mbp at sourcefrog
- new relpath command and function |
277 |
def relpath(self, path): |
278 |
"""Return path relative to this branch of something inside it.
|
|
279 |
||
280 |
Raises an error if path is not in this branch."""
|
|
600
by Martin Pool
- Better Branch.relpath that doesn't match on |
281 |
return _relpath(self.base, path) |
68
by mbp at sourcefrog
- new relpath command and function |
282 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
283 |
def controlfilename(self, file_or_path): |
284 |
"""Return location relative to branch."""
|
|
800
by Martin Pool
Merge John's import-speedup branch: |
285 |
if isinstance(file_or_path, basestring): |
1
by mbp at sourcefrog
import from baz patch-364 |
286 |
file_or_path = [file_or_path] |
287 |
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path) |
|
288 |
||
289 |
||
290 |
def controlfile(self, file_or_path, mode='r'): |
|
245
by mbp at sourcefrog
- control files always in utf-8-unix format |
291 |
"""Open a control file for this branch.
|
292 |
||
293 |
There are two classes of file in the control directory: text
|
|
294 |
and binary. binary files are untranslated byte streams. Text
|
|
295 |
control files are stored with Unix newlines and in UTF-8, even
|
|
296 |
if the platform or locale defaults are different.
|
|
430
by Martin Pool
doc |
297 |
|
298 |
Controlfiles should almost never be opened in write mode but
|
|
299 |
rather should be atomically copied and replaced using atomicfile.
|
|
245
by mbp at sourcefrog
- control files always in utf-8-unix format |
300 |
"""
|
301 |
||
302 |
fn = self.controlfilename(file_or_path) |
|
303 |
||
304 |
if mode == 'rb' or mode == 'wb': |
|
305 |
return file(fn, mode) |
|
306 |
elif mode == 'r' or mode == 'w': |
|
259
by Martin Pool
- use larger file buffers when opening branch control file |
307 |
# open in binary mode anyhow so there's no newline translation;
|
308 |
# codecs uses line buffering by default; don't want that.
|
|
245
by mbp at sourcefrog
- control files always in utf-8-unix format |
309 |
import codecs |
259
by Martin Pool
- use larger file buffers when opening branch control file |
310 |
return codecs.open(fn, mode + 'b', 'utf-8', |
311 |
buffering=60000) |
|
245
by mbp at sourcefrog
- control files always in utf-8-unix format |
312 |
else: |
313 |
raise BzrError("invalid controlfile mode %r" % mode) |
|
314 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
315 |
def _make_control(self): |
800
by Martin Pool
Merge John's import-speedup branch: |
316 |
from bzrlib.inventory import Inventory |
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
317 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
318 |
os.mkdir(self.controlfilename([])) |
319 |
self.controlfile('README', 'w').write( |
|
320 |
"This is a Bazaar-NG control directory.\n" |
|
679
by Martin Pool
- put trailing newline on newly-created .bzr/README |
321 |
"Do not change any files in this directory.\n") |
245
by mbp at sourcefrog
- control files always in utf-8-unix format |
322 |
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT) |
1
by mbp at sourcefrog
import from baz patch-364 |
323 |
for d in ('text-store', 'inventory-store', 'revision-store'): |
324 |
os.mkdir(self.controlfilename(d)) |
|
325 |
for f in ('revision-history', 'merged-patches', |
|
353
by Martin Pool
- Per-branch locks in read and write modes. |
326 |
'pending-merged-patches', 'branch-name', |
815
by Martin Pool
- track pending-merges |
327 |
'branch-lock', |
328 |
'pending-merges'): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
329 |
self.controlfile(f, 'w').write('') |
330 |
mutter('created control directory in ' + self.base) |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
331 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
332 |
# if we want per-tree root ids then this is the place to set
|
333 |
# them; they're not needed for now and so ommitted for
|
|
334 |
# simplicity.
|
|
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
335 |
f = self.controlfile('inventory','w') |
1182
by Martin Pool
- more disentangling of xml storage format from objects |
336 |
bzrlib.xml.serializer_v4.write_inventory(Inventory(), f) |
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
337 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
338 |
|
339 |
def _check_format(self): |
|
340 |
"""Check this branch format is supported.
|
|
341 |
||
342 |
The current tool only supports the current unstable format.
|
|
343 |
||
344 |
In the future, we might need different in-memory Branch
|
|
345 |
classes to support downlevel branches. But not yet.
|
|
163
by mbp at sourcefrog
merge win32 portability fixes |
346 |
"""
|
347 |
# This ignores newlines so that we can open branches created
|
|
348 |
# on Windows from Linux and so on. I think it might be better
|
|
349 |
# to always make all internal files in unix format.
|
|
245
by mbp at sourcefrog
- control files always in utf-8-unix format |
350 |
fmt = self.controlfile('branch-format', 'r').read() |
1185.1.2
by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd |
351 |
fmt = fmt.replace('\r\n', '\n') |
1
by mbp at sourcefrog
import from baz patch-364 |
352 |
if fmt != BZR_BRANCH_FORMAT: |
576
by Martin Pool
- raise exceptions rather than using bailout() |
353 |
raise BzrError('sorry, branch format %r not supported' % fmt, |
354 |
['use a different bzr version', |
|
355 |
'or remove the .bzr directory and "bzr init" again']) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
356 |
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
357 |
def get_root_id(self): |
358 |
"""Return the id of this branches root"""
|
|
359 |
inv = self.read_working_inventory() |
|
360 |
return inv.root.file_id |
|
1
by mbp at sourcefrog
import from baz patch-364 |
361 |
|
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
362 |
def set_root_id(self, file_id): |
363 |
inv = self.read_working_inventory() |
|
364 |
orig_root_id = inv.root.file_id |
|
365 |
del inv._byid[inv.root.file_id] |
|
366 |
inv.root.file_id = file_id |
|
367 |
inv._byid[inv.root.file_id] = inv.root |
|
368 |
for fid in inv: |
|
369 |
entry = inv[fid] |
|
370 |
if entry.parent_id in (None, orig_root_id): |
|
371 |
entry.parent_id = inv.root.file_id |
|
372 |
self._write_inventory(inv) |
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
373 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
374 |
def read_working_inventory(self): |
375 |
"""Read the working inventory."""
|
|
800
by Martin Pool
Merge John's import-speedup branch: |
376 |
from bzrlib.inventory import Inventory |
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
377 |
self.lock_read() |
378 |
try: |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
379 |
# ElementTree does its own conversion from UTF-8, so open in
|
380 |
# binary.
|
|
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
381 |
f = self.controlfile('inventory', 'rb') |
1182
by Martin Pool
- more disentangling of xml storage format from objects |
382 |
return bzrlib.xml.serializer_v4.read_inventory(f) |
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
383 |
finally: |
384 |
self.unlock() |
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
385 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
386 |
|
387 |
def _write_inventory(self, inv): |
|
388 |
"""Update the working inventory.
|
|
389 |
||
390 |
That is to say, the inventory describing changes underway, that
|
|
391 |
will be committed to the next revision.
|
|
392 |
"""
|
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
393 |
from bzrlib.atomicfile import AtomicFile |
394 |
||
770
by Martin Pool
- write new working inventory using AtomicFile |
395 |
self.lock_write() |
396 |
try: |
|
397 |
f = AtomicFile(self.controlfilename('inventory'), 'wb') |
|
398 |
try: |
|
1182
by Martin Pool
- more disentangling of xml storage format from objects |
399 |
bzrlib.xml.serializer_v4.write_inventory(inv, f) |
770
by Martin Pool
- write new working inventory using AtomicFile |
400 |
f.commit() |
401 |
finally: |
|
402 |
f.close() |
|
403 |
finally: |
|
404 |
self.unlock() |
|
405 |
||
14
by mbp at sourcefrog
write inventory to temporary file and atomically replace |
406 |
mutter('wrote working inventory') |
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
407 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
408 |
|
409 |
inventory = property(read_working_inventory, _write_inventory, None, |
|
410 |
"""Inventory for the working copy.""") |
|
411 |
||
412 |
||
1129
by Martin Pool
- Branch.add shouldn't write to stdout either |
413 |
def add(self, files, ids=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
414 |
"""Make files versioned.
|
415 |
||
1129
by Martin Pool
- Branch.add shouldn't write to stdout either |
416 |
Note that the command line normally calls smart_add instead,
|
417 |
which can automatically recurse.
|
|
247
by mbp at sourcefrog
doc |
418 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
419 |
This puts the files in the Added state, so that they will be
|
420 |
recorded by the next commit.
|
|
421 |
||
596
by Martin Pool
doc |
422 |
files
|
423 |
List of paths to add, relative to the base of the tree.
|
|
424 |
||
425 |
ids
|
|
426 |
If set, use these instead of automatically generated ids.
|
|
427 |
Must be the same length as the list of files, but may
|
|
428 |
contain None for ids that are to be autogenerated.
|
|
429 |
||
254
by Martin Pool
- Doc cleanups from Magnus Therning |
430 |
TODO: Perhaps have an option to add the ids even if the files do
|
596
by Martin Pool
doc |
431 |
not (yet) exist.
|
1
by mbp at sourcefrog
import from baz patch-364 |
432 |
|
1129
by Martin Pool
- Branch.add shouldn't write to stdout either |
433 |
TODO: Perhaps yield the ids and paths as they're added.
|
1
by mbp at sourcefrog
import from baz patch-364 |
434 |
"""
|
435 |
# TODO: Re-adding a file that is removed in the working copy
|
|
436 |
# should probably put it back with the previous ID.
|
|
800
by Martin Pool
Merge John's import-speedup branch: |
437 |
if isinstance(files, basestring): |
438 |
assert(ids is None or isinstance(ids, basestring)) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
439 |
files = [files] |
493
by Martin Pool
- Merge aaron's merge command |
440 |
if ids is not None: |
441 |
ids = [ids] |
|
442 |
||
443 |
if ids is None: |
|
444 |
ids = [None] * len(files) |
|
445 |
else: |
|
446 |
assert(len(ids) == len(files)) |
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
447 |
|
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
448 |
self.lock_write() |
449 |
try: |
|
450 |
inv = self.read_working_inventory() |
|
451 |
for f,file_id in zip(files, ids): |
|
452 |
if is_control_file(f): |
|
453 |
raise BzrError("cannot add control file %s" % quotefn(f)) |
|
454 |
||
455 |
fp = splitpath(f) |
|
456 |
||
457 |
if len(fp) == 0: |
|
458 |
raise BzrError("cannot add top-level %r" % f) |
|
459 |
||
460 |
fullpath = os.path.normpath(self.abspath(f)) |
|
461 |
||
462 |
try: |
|
463 |
kind = file_kind(fullpath) |
|
464 |
except OSError: |
|
465 |
# maybe something better?
|
|
466 |
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f)) |
|
467 |
||
468 |
if kind != 'file' and kind != 'directory': |
|
469 |
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f)) |
|
470 |
||
471 |
if file_id is None: |
|
472 |
file_id = gen_file_id(f) |
|
473 |
inv.add_path(f, kind=kind, file_id=file_id) |
|
474 |
||
475 |
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind)) |
|
476 |
||
477 |
self._write_inventory(inv) |
|
478 |
finally: |
|
479 |
self.unlock() |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
480 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
481 |
|
176
by mbp at sourcefrog
New cat command contributed by janmar. |
482 |
def print_file(self, file, revno): |
483 |
"""Print `file` to stdout."""
|
|
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
484 |
self.lock_read() |
485 |
try: |
|
1185.2.6
by Lalo Martins
turned get_revision_info into a RevisionSpec class |
486 |
tree = self.revision_tree(self.get_rev_id(revno)) |
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
487 |
# use inventory as it was in that revision
|
488 |
file_id = tree.inventory.path2id(file) |
|
489 |
if not file_id: |
|
897
by Martin Pool
- merge john's revision-naming code |
490 |
raise BzrError("%r is not present in revision %s" % (file, revno)) |
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
491 |
tree.print_file(file_id) |
492 |
finally: |
|
493 |
self.unlock() |
|
494 |
||
495 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
496 |
def remove(self, files, verbose=False): |
497 |
"""Mark nominated files for removal from the inventory.
|
|
498 |
||
499 |
This does not remove their text. This does not run on
|
|
500 |
||
254
by Martin Pool
- Doc cleanups from Magnus Therning |
501 |
TODO: Refuse to remove modified files unless --force is given?
|
1
by mbp at sourcefrog
import from baz patch-364 |
502 |
|
254
by Martin Pool
- Doc cleanups from Magnus Therning |
503 |
TODO: Do something useful with directories.
|
1
by mbp at sourcefrog
import from baz patch-364 |
504 |
|
254
by Martin Pool
- Doc cleanups from Magnus Therning |
505 |
TODO: Should this remove the text or not? Tough call; not
|
1
by mbp at sourcefrog
import from baz patch-364 |
506 |
removing may be useful and the user can just use use rm, and
|
507 |
is the opposite of add. Removing it is consistent with most
|
|
508 |
other tools. Maybe an option.
|
|
509 |
"""
|
|
510 |
## TODO: Normalize names
|
|
511 |
## TODO: Remove nested loops; better scalability
|
|
800
by Martin Pool
Merge John's import-speedup branch: |
512 |
if isinstance(files, basestring): |
1
by mbp at sourcefrog
import from baz patch-364 |
513 |
files = [files] |
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
514 |
|
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
515 |
self.lock_write() |
516 |
||
517 |
try: |
|
518 |
tree = self.working_tree() |
|
519 |
inv = tree.inventory |
|
520 |
||
521 |
# do this before any modifications
|
|
522 |
for f in files: |
|
523 |
fid = inv.path2id(f) |
|
524 |
if not fid: |
|
525 |
raise BzrError("cannot remove unversioned file %s" % quotefn(f)) |
|
526 |
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid)) |
|
527 |
if verbose: |
|
528 |
# having remove it, it must be either ignored or unknown
|
|
529 |
if tree.is_ignored(f): |
|
530 |
new_status = 'I' |
|
531 |
else: |
|
532 |
new_status = '?' |
|
533 |
show_status(new_status, inv[fid].kind, quotefn(f)) |
|
534 |
del inv[fid] |
|
535 |
||
536 |
self._write_inventory(inv) |
|
537 |
finally: |
|
538 |
self.unlock() |
|
539 |
||
540 |
||
612
by Martin Pool
doc |
541 |
# FIXME: this doesn't need to be a branch method
|
493
by Martin Pool
- Merge aaron's merge command |
542 |
def set_inventory(self, new_inventory_list): |
800
by Martin Pool
Merge John's import-speedup branch: |
543 |
from bzrlib.inventory import Inventory, InventoryEntry |
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
544 |
inv = Inventory(self.get_root_id()) |
493
by Martin Pool
- Merge aaron's merge command |
545 |
for path, file_id, parent, kind in new_inventory_list: |
546 |
name = os.path.basename(path) |
|
547 |
if name == "": |
|
548 |
continue
|
|
549 |
inv.add(InventoryEntry(file_id, name, kind, parent)) |
|
550 |
self._write_inventory(inv) |
|
551 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
552 |
|
553 |
def unknowns(self): |
|
554 |
"""Return all unknown files.
|
|
555 |
||
556 |
These are files in the working directory that are not versioned or
|
|
557 |
control files or ignored.
|
|
558 |
|
|
559 |
>>> b = ScratchBranch(files=['foo', 'foo~'])
|
|
560 |
>>> list(b.unknowns())
|
|
561 |
['foo']
|
|
562 |
>>> b.add('foo')
|
|
563 |
>>> list(b.unknowns())
|
|
564 |
[]
|
|
565 |
>>> b.remove('foo')
|
|
566 |
>>> list(b.unknowns())
|
|
567 |
['foo']
|
|
568 |
"""
|
|
569 |
return self.working_tree().unknowns() |
|
570 |
||
571 |
||
905
by Martin Pool
- merge aaron's append_multiple.patch |
572 |
def append_revision(self, *revision_ids): |
769
by Martin Pool
- append to branch revision history using AtomicFile |
573 |
from bzrlib.atomicfile import AtomicFile |
574 |
||
905
by Martin Pool
- merge aaron's append_multiple.patch |
575 |
for revision_id in revision_ids: |
576 |
mutter("add {%s} to revision-history" % revision_id) |
|
577 |
||
578 |
rev_history = self.revision_history() |
|
579 |
rev_history.extend(revision_ids) |
|
769
by Martin Pool
- append to branch revision history using AtomicFile |
580 |
|
581 |
f = AtomicFile(self.controlfilename('revision-history')) |
|
582 |
try: |
|
583 |
for rev_id in rev_history: |
|
584 |
print >>f, rev_id |
|
585 |
f.commit() |
|
586 |
finally: |
|
587 |
f.close() |
|
233
by mbp at sourcefrog
- more output from test.sh |
588 |
|
589 |
||
1182
by Martin Pool
- more disentangling of xml storage format from objects |
590 |
def get_revision_xml_file(self, revision_id): |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
591 |
"""Return XML file object for revision object."""
|
592 |
if not revision_id or not isinstance(revision_id, basestring): |
|
593 |
raise InvalidRevisionId(revision_id) |
|
594 |
||
595 |
self.lock_read() |
|
596 |
try: |
|
597 |
try: |
|
598 |
return self.revision_store[revision_id] |
|
1185.1.18
by Robert Collins
Lalo Martins remotebranch patch |
599 |
except (IndexError, KeyError): |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
600 |
raise bzrlib.errors.NoSuchRevision(self, revision_id) |
601 |
finally: |
|
602 |
self.unlock() |
|
603 |
||
604 |
||
1182
by Martin Pool
- more disentangling of xml storage format from objects |
605 |
#deprecated
|
606 |
get_revision_xml = get_revision_xml_file |
|
607 |
||
608 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
609 |
def get_revision(self, revision_id): |
610 |
"""Return the Revision object for a named revision"""
|
|
1182
by Martin Pool
- more disentangling of xml storage format from objects |
611 |
xml_file = self.get_revision_xml_file(revision_id) |
1027
by Martin Pool
- better error message when failing to get revision from store |
612 |
|
613 |
try: |
|
1182
by Martin Pool
- more disentangling of xml storage format from objects |
614 |
r = bzrlib.xml.serializer_v4.read_revision(xml_file) |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
615 |
except SyntaxError, e: |
616 |
raise bzrlib.errors.BzrError('failed to unpack revision_xml', |
|
617 |
[revision_id, |
|
618 |
str(e)]) |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
619 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
620 |
assert r.revision_id == revision_id |
621 |
return r |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
622 |
|
623 |
||
624 |
def get_revision_delta(self, revno): |
|
625 |
"""Return the delta for one revision.
|
|
626 |
||
627 |
The delta is relative to its mainline predecessor, or the
|
|
628 |
empty tree for revision 1.
|
|
629 |
"""
|
|
630 |
assert isinstance(revno, int) |
|
631 |
rh = self.revision_history() |
|
632 |
if not (1 <= revno <= len(rh)): |
|
633 |
raise InvalidRevisionNumber(revno) |
|
634 |
||
635 |
# revno is 1-based; list is 0-based
|
|
636 |
||
637 |
new_tree = self.revision_tree(rh[revno-1]) |
|
638 |
if revno == 1: |
|
639 |
old_tree = EmptyTree() |
|
640 |
else: |
|
641 |
old_tree = self.revision_tree(rh[revno-2]) |
|
642 |
||
643 |
return compare_trees(old_tree, new_tree) |
|
644 |
||
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
645 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
646 |
|
672
by Martin Pool
- revision records include the hash of their inventory and |
647 |
def get_revision_sha1(self, revision_id): |
648 |
"""Hash the stored value of a revision, and return it."""
|
|
649 |
# In the future, revision entries will be signed. At that
|
|
650 |
# point, it is probably best *not* to include the signature
|
|
651 |
# in the revision hash. Because that lets you re-sign
|
|
652 |
# the revision, (add signatures/remove signatures) and still
|
|
653 |
# have all hash pointers stay consistent.
|
|
654 |
# But for now, just hash the contents.
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
655 |
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id)) |
672
by Martin Pool
- revision records include the hash of their inventory and |
656 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
657 |
|
658 |
def get_inventory(self, inventory_id): |
|
659 |
"""Get Inventory object by hash.
|
|
660 |
||
254
by Martin Pool
- Doc cleanups from Magnus Therning |
661 |
TODO: Perhaps for this and similar methods, take a revision
|
1
by mbp at sourcefrog
import from baz patch-364 |
662 |
parameter which can be either an integer revno or a
|
663 |
string hash."""
|
|
800
by Martin Pool
Merge John's import-speedup branch: |
664 |
from bzrlib.inventory import Inventory |
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
665 |
|
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
666 |
f = self.get_inventory_xml_file(inventory_id) |
1182
by Martin Pool
- more disentangling of xml storage format from objects |
667 |
return bzrlib.xml.serializer_v4.read_inventory(f) |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
668 |
|
669 |
||
670 |
def get_inventory_xml(self, inventory_id): |
|
671 |
"""Get inventory XML as a file object."""
|
|
672 |
return self.inventory_store[inventory_id] |
|
1180
by Martin Pool
- start splitting code for xml (de)serialization away from objects |
673 |
|
674 |
get_inventory_xml_file = get_inventory_xml |
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
675 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
676 |
|
672
by Martin Pool
- revision records include the hash of their inventory and |
677 |
def get_inventory_sha1(self, inventory_id): |
678 |
"""Return the sha1 hash of the inventory entry
|
|
679 |
"""
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
680 |
return sha_file(self.get_inventory_xml(inventory_id)) |
672
by Martin Pool
- revision records include the hash of their inventory and |
681 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
682 |
|
683 |
def get_revision_inventory(self, revision_id): |
|
684 |
"""Return inventory of a past revision."""
|
|
820
by Martin Pool
- faster Branch.get_revision_inventory now we know the ids are the same |
685 |
# bzr 0.0.6 imposes the constraint that the inventory_id
|
686 |
# must be the same as its revision, so this is trivial.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
687 |
if revision_id == None: |
800
by Martin Pool
Merge John's import-speedup branch: |
688 |
from bzrlib.inventory import Inventory |
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
689 |
return Inventory(self.get_root_id()) |
1
by mbp at sourcefrog
import from baz patch-364 |
690 |
else: |
820
by Martin Pool
- faster Branch.get_revision_inventory now we know the ids are the same |
691 |
return self.get_inventory(revision_id) |
1
by mbp at sourcefrog
import from baz patch-364 |
692 |
|
693 |
||
694 |
def revision_history(self): |
|
695 |
"""Return sequence of revision hashes on to this branch.
|
|
696 |
||
697 |
>>> ScratchBranch().revision_history()
|
|
698 |
[]
|
|
699 |
"""
|
|
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
700 |
self.lock_read() |
701 |
try: |
|
702 |
return [l.rstrip('\r\n') for l in |
|
703 |
self.controlfile('revision-history', 'r').readlines()] |
|
704 |
finally: |
|
705 |
self.unlock() |
|
1
by mbp at sourcefrog
import from baz patch-364 |
706 |
|
707 |
||
622
by Martin Pool
Updated merge patch from Aaron |
708 |
def common_ancestor(self, other, self_revno=None, other_revno=None): |
709 |
"""
|
|
1185.2.2
by Lalo Martins
cleaning up and refactoring the branch module. |
710 |
>>> from bzrlib.commit import commit
|
622
by Martin Pool
Updated merge patch from Aaron |
711 |
>>> sb = ScratchBranch(files=['foo', 'foo~'])
|
712 |
>>> sb.common_ancestor(sb) == (None, None)
|
|
713 |
True
|
|
1185.2.2
by Lalo Martins
cleaning up and refactoring the branch module. |
714 |
>>> commit(sb, "Committing first revision", verbose=False)
|
622
by Martin Pool
Updated merge patch from Aaron |
715 |
>>> sb.common_ancestor(sb)[0]
|
716 |
1
|
|
717 |
>>> clone = sb.clone()
|
|
1185.2.2
by Lalo Martins
cleaning up and refactoring the branch module. |
718 |
>>> commit(sb, "Committing second revision", verbose=False)
|
622
by Martin Pool
Updated merge patch from Aaron |
719 |
>>> sb.common_ancestor(sb)[0]
|
720 |
2
|
|
721 |
>>> sb.common_ancestor(clone)[0]
|
|
722 |
1
|
|
1185.2.2
by Lalo Martins
cleaning up and refactoring the branch module. |
723 |
>>> commit(clone, "Committing divergent second revision",
|
622
by Martin Pool
Updated merge patch from Aaron |
724 |
... verbose=False)
|
725 |
>>> sb.common_ancestor(clone)[0]
|
|
726 |
1
|
|
727 |
>>> sb.common_ancestor(clone) == clone.common_ancestor(sb)
|
|
728 |
True
|
|
729 |
>>> sb.common_ancestor(sb) != clone.common_ancestor(clone)
|
|
730 |
True
|
|
731 |
>>> clone2 = sb.clone()
|
|
732 |
>>> sb.common_ancestor(clone2)[0]
|
|
733 |
2
|
|
734 |
>>> sb.common_ancestor(clone2, self_revno=1)[0]
|
|
735 |
1
|
|
736 |
>>> sb.common_ancestor(clone2, other_revno=1)[0]
|
|
737 |
1
|
|
738 |
"""
|
|
739 |
my_history = self.revision_history() |
|
740 |
other_history = other.revision_history() |
|
741 |
if self_revno is None: |
|
742 |
self_revno = len(my_history) |
|
743 |
if other_revno is None: |
|
744 |
other_revno = len(other_history) |
|
745 |
indices = range(min((self_revno, other_revno))) |
|
746 |
indices.reverse() |
|
747 |
for r in indices: |
|
748 |
if my_history[r] == other_history[r]: |
|
749 |
return r+1, my_history[r] |
|
750 |
return None, None |
|
751 |
||
385
by Martin Pool
- New Branch.enum_history method |
752 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
753 |
def revno(self): |
754 |
"""Return current revision number for this branch.
|
|
755 |
||
756 |
That is equivalent to the number of revisions committed to
|
|
757 |
this branch.
|
|
758 |
"""
|
|
759 |
return len(self.revision_history()) |
|
760 |
||
761 |
||
762 |
def last_patch(self): |
|
763 |
"""Return last patch hash, or None if no history.
|
|
764 |
"""
|
|
765 |
ph = self.revision_history() |
|
766 |
if ph: |
|
767 |
return ph[-1] |
|
184
by mbp at sourcefrog
pychecker fixups |
768 |
else: |
769 |
return None |
|
485
by Martin Pool
- move commit code into its own module |
770 |
|
771 |
||
974.1.27
by aaron.bentley at utoronto
Initial greedy fetch work |
772 |
def missing_revisions(self, other, stop_revision=None, diverged_ok=False): |
628
by Martin Pool
- merge aaron's updated merge/pull code |
773 |
"""
|
774 |
If self and other have not diverged, return a list of the revisions
|
|
775 |
present in other, but missing from self.
|
|
776 |
||
777 |
>>> from bzrlib.commit import commit
|
|
778 |
>>> bzrlib.trace.silent = True
|
|
779 |
>>> br1 = ScratchBranch()
|
|
780 |
>>> br2 = ScratchBranch()
|
|
781 |
>>> br1.missing_revisions(br2)
|
|
782 |
[]
|
|
783 |
>>> commit(br2, "lala!", rev_id="REVISION-ID-1")
|
|
784 |
>>> br1.missing_revisions(br2)
|
|
785 |
[u'REVISION-ID-1']
|
|
786 |
>>> br2.missing_revisions(br1)
|
|
787 |
[]
|
|
788 |
>>> commit(br1, "lala!", rev_id="REVISION-ID-1")
|
|
789 |
>>> br1.missing_revisions(br2)
|
|
790 |
[]
|
|
791 |
>>> commit(br2, "lala!", rev_id="REVISION-ID-2A")
|
|
792 |
>>> br1.missing_revisions(br2)
|
|
793 |
[u'REVISION-ID-2A']
|
|
794 |
>>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
|
|
795 |
>>> br1.missing_revisions(br2)
|
|
796 |
Traceback (most recent call last):
|
|
797 |
DivergedBranches: These branches have diverged.
|
|
798 |
"""
|
|
799 |
self_history = self.revision_history() |
|
800 |
self_len = len(self_history) |
|
801 |
other_history = other.revision_history() |
|
802 |
other_len = len(other_history) |
|
803 |
common_index = min(self_len, other_len) -1 |
|
804 |
if common_index >= 0 and \ |
|
805 |
self_history[common_index] != other_history[common_index]: |
|
806 |
raise DivergedBranches(self, other) |
|
685
by Martin Pool
- add -r option to the branch command |
807 |
|
808 |
if stop_revision is None: |
|
809 |
stop_revision = other_len |
|
810 |
elif stop_revision > other_len: |
|
1103
by Martin Pool
- some pychecker cleanups |
811 |
raise bzrlib.errors.NoSuchRevision(self, stop_revision) |
685
by Martin Pool
- add -r option to the branch command |
812 |
|
813 |
return other_history[self_len:stop_revision] |
|
814 |
||
815 |
||
974.1.28
by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch |
816 |
def update_revisions(self, other, stop_revision=None): |
663
by Martin Pool
doc |
817 |
"""Pull in all new revisions from other branch.
|
628
by Martin Pool
- merge aaron's updated merge/pull code |
818 |
"""
|
974.1.33
by aaron.bentley at utoronto
Added greedy_fetch to update_revisions |
819 |
from bzrlib.fetch import greedy_fetch |
974.1.74
by Aaron Bentley
Made pull work after remote branch has merged latest revision |
820 |
from bzrlib.revision import get_intervening_revisions |
1110
by Martin Pool
- merge aaron's merge improvements: |
821 |
|
822 |
pb = bzrlib.ui.ui_factory.progress_bar() |
|
1092.1.35
by Robert Collins
merge from mpool up to rev 1110 |
823 |
pb.update('comparing histories') |
974.1.75
by Aaron Bentley
Sped up pull by copying locally first |
824 |
if stop_revision is None: |
825 |
other_revision = other.last_patch() |
|
826 |
else: |
|
1185.2.18
by Lalo Martins
merging from integration again. |
827 |
other_revision = other.get_rev_id(stop_revision) |
974.1.75
by Aaron Bentley
Sped up pull by copying locally first |
828 |
count = greedy_fetch(self, other, other_revision, pb)[0] |
974.1.74
by Aaron Bentley
Made pull work after remote branch has merged latest revision |
829 |
try: |
830 |
revision_ids = self.missing_revisions(other, stop_revision) |
|
831 |
except DivergedBranches, e: |
|
832 |
try: |
|
833 |
revision_ids = get_intervening_revisions(self.last_patch(), |
|
974.1.75
by Aaron Bentley
Sped up pull by copying locally first |
834 |
other_revision, self) |
974.1.74
by Aaron Bentley
Made pull work after remote branch has merged latest revision |
835 |
assert self.last_patch() not in revision_ids |
836 |
except bzrlib.errors.NotAncestor: |
|
837 |
raise e |
|
1110
by Martin Pool
- merge aaron's merge improvements: |
838 |
|
974.1.28
by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch |
839 |
self.append_revision(*revision_ids) |
1116
by Martin Pool
- fix a few errors in new merge code |
840 |
pb.clear() |
1104
by Martin Pool
- Add a simple UIFactory |
841 |
|
1110
by Martin Pool
- merge aaron's merge improvements: |
842 |
def install_revisions(self, other, revision_ids, pb): |
790
by Martin Pool
Merge from aaron: |
843 |
if hasattr(other.revision_store, "prefetch"): |
844 |
other.revision_store.prefetch(revision_ids) |
|
845 |
if hasattr(other.inventory_store, "prefetch"): |
|
974.1.77
by Aaron Bentley
Fixed branch handling of missing revisions |
846 |
inventory_ids = [] |
847 |
for rev_id in revision_ids: |
|
848 |
try: |
|
849 |
revision = other.get_revision(rev_id).inventory_id |
|
850 |
inventory_ids.append(revision) |
|
851 |
except bzrlib.errors.NoSuchRevision: |
|
852 |
pass
|
|
790
by Martin Pool
Merge from aaron: |
853 |
other.inventory_store.prefetch(inventory_ids) |
1110
by Martin Pool
- merge aaron's merge improvements: |
854 |
|
855 |
if pb is None: |
|
856 |
pb = bzrlib.ui.ui_factory.progress_bar() |
|
790
by Martin Pool
Merge from aaron: |
857 |
|
670
by Martin Pool
- Show progress while branching |
858 |
revisions = [] |
800
by Martin Pool
Merge John's import-speedup branch: |
859 |
needed_texts = set() |
670
by Martin Pool
- Show progress while branching |
860 |
i = 0 |
1110
by Martin Pool
- merge aaron's merge improvements: |
861 |
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
862 |
failures = set() |
863 |
for i, rev_id in enumerate(revision_ids): |
|
864 |
pb.update('fetching revision', i+1, len(revision_ids)) |
|
865 |
try: |
|
866 |
rev = other.get_revision(rev_id) |
|
867 |
except bzrlib.errors.NoSuchRevision: |
|
868 |
failures.add(rev_id) |
|
869 |
continue
|
|
1110
by Martin Pool
- merge aaron's merge improvements: |
870 |
|
670
by Martin Pool
- Show progress while branching |
871 |
revisions.append(rev) |
628
by Martin Pool
- merge aaron's updated merge/pull code |
872 |
inv = other.get_inventory(str(rev.inventory_id)) |
873 |
for key, entry in inv.iter_entries(): |
|
874 |
if entry.text_id is None: |
|
875 |
continue
|
|
876 |
if entry.text_id not in self.text_store: |
|
877 |
needed_texts.add(entry.text_id) |
|
670
by Martin Pool
- Show progress while branching |
878 |
|
1092.1.35
by Robert Collins
merge from mpool up to rev 1110 |
879 |
pb.clear() |
670
by Martin Pool
- Show progress while branching |
880 |
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
881 |
count, cp_fail = self.text_store.copy_multi(other.text_store, |
882 |
needed_texts) |
|
1116
by Martin Pool
- fix a few errors in new merge code |
883 |
#print "Added %d texts." % count
|
628
by Martin Pool
- merge aaron's updated merge/pull code |
884 |
inventory_ids = [ f.inventory_id for f in revisions ] |
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
885 |
count, cp_fail = self.inventory_store.copy_multi(other.inventory_store, |
886 |
inventory_ids) |
|
1116
by Martin Pool
- fix a few errors in new merge code |
887 |
#print "Added %d inventories." % count
|
628
by Martin Pool
- merge aaron's updated merge/pull code |
888 |
revision_ids = [ f.revision_id for f in revisions] |
1110
by Martin Pool
- merge aaron's merge improvements: |
889 |
|
974.1.30
by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions |
890 |
count, cp_fail = self.revision_store.copy_multi(other.revision_store, |
891 |
revision_ids, |
|
892 |
permit_failure=True) |
|
893 |
assert len(cp_fail) == 0 |
|
894 |
return count, failures |
|
974.1.28
by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch |
895 |
|
1110
by Martin Pool
- merge aaron's merge improvements: |
896 |
|
485
by Martin Pool
- move commit code into its own module |
897 |
def commit(self, *args, **kw): |
898 |
from bzrlib.commit import commit |
|
899 |
commit(self, *args, **kw) |
|
184
by mbp at sourcefrog
pychecker fixups |
900 |
|
1105
by Martin Pool
- expose 'find-merge-base' as a new expert command, |
901 |
def revision_id_to_revno(self, revision_id): |
902 |
"""Given a revision id, return its revno"""
|
|
903 |
history = self.revision_history() |
|
904 |
try: |
|
905 |
return history.index(revision_id) + 1 |
|
906 |
except ValueError: |
|
907 |
raise bzrlib.errors.NoSuchRevision(self, revision_id) |
|
908 |
||
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
909 |
def get_rev_id(self, revno, history=None): |
910 |
"""Find the revision id of the specified revno."""
|
|
911 |
if revno == 0: |
|
912 |
return None |
|
913 |
if history is None: |
|
914 |
history = self.revision_history() |
|
915 |
elif revno <= 0 or revno > len(history): |
|
916 |
raise bzrlib.errors.NoSuchRevision(self, revno) |
|
917 |
return history[revno - 1] |
|
918 |
||
974.1.81
by Aaron Bentley
Added ancestor revision namepsace |
919 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
920 |
def revision_tree(self, revision_id): |
921 |
"""Return Tree for a revision on this branch.
|
|
922 |
||
923 |
`revision_id` may be None for the null revision, in which case
|
|
924 |
an `EmptyTree` is returned."""
|
|
529
by Martin Pool
todo |
925 |
# TODO: refactor this to use an existing revision object
|
926 |
# so we don't need to read it in twice.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
927 |
if revision_id == None: |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
928 |
return EmptyTree() |
1
by mbp at sourcefrog
import from baz patch-364 |
929 |
else: |
930 |
inv = self.get_revision_inventory(revision_id) |
|
931 |
return RevisionTree(self.text_store, inv) |
|
932 |
||
933 |
||
934 |
def working_tree(self): |
|
935 |
"""Return a `Tree` for the working copy."""
|
|
1185.2.2
by Lalo Martins
cleaning up and refactoring the branch module. |
936 |
from bzrlib.workingtree import WorkingTree |
1
by mbp at sourcefrog
import from baz patch-364 |
937 |
return WorkingTree(self.base, self.read_working_inventory()) |
938 |
||
939 |
||
940 |
def basis_tree(self): |
|
941 |
"""Return `Tree` object for last revision.
|
|
942 |
||
943 |
If there are no revisions yet, return an `EmptyTree`.
|
|
944 |
"""
|
|
945 |
r = self.last_patch() |
|
946 |
if r == None: |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
947 |
return EmptyTree() |
1
by mbp at sourcefrog
import from baz patch-364 |
948 |
else: |
949 |
return RevisionTree(self.text_store, self.get_revision_inventory(r)) |
|
950 |
||
951 |
||
952 |
||
168
by mbp at sourcefrog
new "rename" command |
953 |
def rename_one(self, from_rel, to_rel): |
309
by Martin Pool
doc |
954 |
"""Rename one file.
|
955 |
||
956 |
This can change the directory or the filename or both.
|
|
353
by Martin Pool
- Per-branch locks in read and write modes. |
957 |
"""
|
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
958 |
self.lock_write() |
171
by mbp at sourcefrog
better error message when working file rename fails |
959 |
try: |
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
960 |
tree = self.working_tree() |
961 |
inv = tree.inventory |
|
962 |
if not tree.has_filename(from_rel): |
|
963 |
raise BzrError("can't rename: old working file %r does not exist" % from_rel) |
|
964 |
if tree.has_filename(to_rel): |
|
965 |
raise BzrError("can't rename: new working file %r already exists" % to_rel) |
|
966 |
||
967 |
file_id = inv.path2id(from_rel) |
|
968 |
if file_id == None: |
|
969 |
raise BzrError("can't rename: old name %r is not versioned" % from_rel) |
|
970 |
||
971 |
if inv.path2id(to_rel): |
|
972 |
raise BzrError("can't rename: new name %r is already versioned" % to_rel) |
|
973 |
||
974 |
to_dir, to_tail = os.path.split(to_rel) |
|
975 |
to_dir_id = inv.path2id(to_dir) |
|
976 |
if to_dir_id == None and to_dir != '': |
|
977 |
raise BzrError("can't determine destination directory id for %r" % to_dir) |
|
978 |
||
979 |
mutter("rename_one:") |
|
980 |
mutter(" file_id {%s}" % file_id) |
|
981 |
mutter(" from_rel %r" % from_rel) |
|
982 |
mutter(" to_rel %r" % to_rel) |
|
983 |
mutter(" to_dir %r" % to_dir) |
|
984 |
mutter(" to_dir_id {%s}" % to_dir_id) |
|
985 |
||
986 |
inv.rename(file_id, to_dir_id, to_tail) |
|
987 |
||
988 |
from_abs = self.abspath(from_rel) |
|
989 |
to_abs = self.abspath(to_rel) |
|
990 |
try: |
|
991 |
os.rename(from_abs, to_abs) |
|
992 |
except OSError, e: |
|
993 |
raise BzrError("failed to rename %r to %r: %s" |
|
994 |
% (from_abs, to_abs, e[1]), |
|
995 |
["rename rolled back"]) |
|
996 |
||
997 |
self._write_inventory(inv) |
|
998 |
finally: |
|
999 |
self.unlock() |
|
1000 |
||
1001 |
||
174
by mbp at sourcefrog
- New 'move' command; now separated out from rename |
1002 |
def move(self, from_paths, to_name): |
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1003 |
"""Rename files.
|
1004 |
||
174
by mbp at sourcefrog
- New 'move' command; now separated out from rename |
1005 |
to_name must exist as a versioned directory.
|
1006 |
||
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1007 |
If to_name exists and is a directory, the files are moved into
|
1008 |
it, keeping their old names. If it is a directory,
|
|
1009 |
||
1010 |
Note that to_name is only the last component of the new name;
|
|
1011 |
this doesn't change the directory.
|
|
1131
by Martin Pool
- remove more extraneous print statements from Branch.move |
1012 |
|
1013 |
This returns a list of (from_path, to_path) pairs for each
|
|
1014 |
entry that is moved.
|
|
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1015 |
"""
|
1131
by Martin Pool
- remove more extraneous print statements from Branch.move |
1016 |
result = [] |
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
1017 |
self.lock_write() |
1018 |
try: |
|
1019 |
## TODO: Option to move IDs only
|
|
1020 |
assert not isinstance(from_paths, basestring) |
|
1021 |
tree = self.working_tree() |
|
1022 |
inv = tree.inventory |
|
1023 |
to_abs = self.abspath(to_name) |
|
1024 |
if not isdir(to_abs): |
|
1025 |
raise BzrError("destination %r is not a directory" % to_abs) |
|
1026 |
if not tree.has_filename(to_name): |
|
1027 |
raise BzrError("destination %r not in working directory" % to_abs) |
|
1028 |
to_dir_id = inv.path2id(to_name) |
|
1029 |
if to_dir_id == None and to_name != '': |
|
1030 |
raise BzrError("destination %r is not a versioned directory" % to_name) |
|
1031 |
to_dir_ie = inv[to_dir_id] |
|
1032 |
if to_dir_ie.kind not in ('directory', 'root_directory'): |
|
1033 |
raise BzrError("destination %r is not a directory" % to_abs) |
|
1034 |
||
1035 |
to_idpath = inv.get_idpath(to_dir_id) |
|
1036 |
||
1037 |
for f in from_paths: |
|
1038 |
if not tree.has_filename(f): |
|
1039 |
raise BzrError("%r does not exist in working tree" % f) |
|
1040 |
f_id = inv.path2id(f) |
|
1041 |
if f_id == None: |
|
1042 |
raise BzrError("%r is not versioned" % f) |
|
1043 |
name_tail = splitpath(f)[-1] |
|
1044 |
dest_path = appendpath(to_name, name_tail) |
|
1045 |
if tree.has_filename(dest_path): |
|
1046 |
raise BzrError("destination %r already exists" % dest_path) |
|
1047 |
if f_id in to_idpath: |
|
1048 |
raise BzrError("can't move %r to a subdirectory of itself" % f) |
|
1049 |
||
1050 |
# OK, so there's a race here, it's possible that someone will
|
|
1051 |
# create a file in this interval and then the rename might be
|
|
1052 |
# left half-done. But we should have caught most problems.
|
|
1053 |
||
1054 |
for f in from_paths: |
|
1055 |
name_tail = splitpath(f)[-1] |
|
1056 |
dest_path = appendpath(to_name, name_tail) |
|
1131
by Martin Pool
- remove more extraneous print statements from Branch.move |
1057 |
result.append((f, dest_path)) |
611
by Martin Pool
- remove @with_writelock, @with_readlock decorators |
1058 |
inv.rename(inv.path2id(f), to_dir_id, name_tail) |
1059 |
try: |
|
1060 |
os.rename(self.abspath(f), self.abspath(dest_path)) |
|
1061 |
except OSError, e: |
|
1062 |
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]), |
|
1063 |
["rename rolled back"]) |
|
1064 |
||
1065 |
self._write_inventory(inv) |
|
1066 |
finally: |
|
1067 |
self.unlock() |
|
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1068 |
|
1131
by Martin Pool
- remove more extraneous print statements from Branch.move |
1069 |
return result |
1070 |
||
160
by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think |
1071 |
|
782
by Martin Pool
- Branch.revert copies files to backups before reverting them |
1072 |
def revert(self, filenames, old_tree=None, backups=True): |
778
by Martin Pool
- simple revert of text files |
1073 |
"""Restore selected files to the versions from a previous tree.
|
782
by Martin Pool
- Branch.revert copies files to backups before reverting them |
1074 |
|
1075 |
backups
|
|
1076 |
If true (default) backups are made of files before
|
|
1077 |
they're renamed.
|
|
778
by Martin Pool
- simple revert of text files |
1078 |
"""
|
1079 |
from bzrlib.errors import NotVersionedError, BzrError |
|
1080 |
from bzrlib.atomicfile import AtomicFile |
|
782
by Martin Pool
- Branch.revert copies files to backups before reverting them |
1081 |
from bzrlib.osutils import backup_file |
778
by Martin Pool
- simple revert of text files |
1082 |
|
1083 |
inv = self.read_working_inventory() |
|
1084 |
if old_tree is None: |
|
1085 |
old_tree = self.basis_tree() |
|
1086 |
old_inv = old_tree.inventory |
|
1087 |
||
1088 |
nids = [] |
|
1089 |
for fn in filenames: |
|
1090 |
file_id = inv.path2id(fn) |
|
1091 |
if not file_id: |
|
1092 |
raise NotVersionedError("not a versioned file", fn) |
|
782
by Martin Pool
- Branch.revert copies files to backups before reverting them |
1093 |
if not old_inv.has_id(file_id): |
1094 |
raise BzrError("file not present in old tree", fn, file_id) |
|
778
by Martin Pool
- simple revert of text files |
1095 |
nids.append((fn, file_id)) |
1096 |
||
1097 |
# TODO: Rename back if it was previously at a different location
|
|
1098 |
||
1099 |
# TODO: If given a directory, restore the entire contents from
|
|
1100 |
# the previous version.
|
|
1101 |
||
1102 |
# TODO: Make a backup to a temporary file.
|
|
1103 |
||
1104 |
# TODO: If the file previously didn't exist, delete it?
|
|
1105 |
for fn, file_id in nids: |
|
782
by Martin Pool
- Branch.revert copies files to backups before reverting them |
1106 |
backup_file(fn) |
1107 |
||
778
by Martin Pool
- simple revert of text files |
1108 |
f = AtomicFile(fn, 'wb') |
1109 |
try: |
|
1110 |
f.write(old_tree.get_file(file_id).read()) |
|
1111 |
f.commit() |
|
1112 |
finally: |
|
1113 |
f.close() |
|
1114 |
||
1115 |
||
815
by Martin Pool
- track pending-merges |
1116 |
def pending_merges(self): |
1117 |
"""Return a list of pending merges.
|
|
1118 |
||
1119 |
These are revisions that have been merged into the working
|
|
1120 |
directory but not yet committed.
|
|
1121 |
"""
|
|
1122 |
cfn = self.controlfilename('pending-merges') |
|
1123 |
if not os.path.exists(cfn): |
|
1124 |
return [] |
|
1125 |
p = [] |
|
1126 |
for l in self.controlfile('pending-merges', 'r').readlines(): |
|
1127 |
p.append(l.rstrip('\n')) |
|
1128 |
return p |
|
1129 |
||
1130 |
||
1131 |
def add_pending_merge(self, revision_id): |
|
1132 |
from bzrlib.revision import validate_revision_id |
|
1133 |
||
1134 |
validate_revision_id(revision_id) |
|
1135 |
||
1136 |
p = self.pending_merges() |
|
1137 |
if revision_id in p: |
|
1138 |
return
|
|
1139 |
p.append(revision_id) |
|
1140 |
self.set_pending_merges(p) |
|
1141 |
||
1142 |
||
1143 |
def set_pending_merges(self, rev_list): |
|
1144 |
from bzrlib.atomicfile import AtomicFile |
|
1145 |
self.lock_write() |
|
1146 |
try: |
|
1147 |
f = AtomicFile(self.controlfilename('pending-merges')) |
|
1148 |
try: |
|
1149 |
for l in rev_list: |
|
1150 |
print >>f, l |
|
1151 |
f.commit() |
|
1152 |
finally: |
|
1153 |
f.close() |
|
1154 |
finally: |
|
1155 |
self.unlock() |
|
1156 |
||
1157 |
||
1149
by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it |
1158 |
def get_parent(self): |
1159 |
"""Return the parent location of the branch.
|
|
1160 |
||
1161 |
This is the default location for push/pull/missing. The usual
|
|
1162 |
pattern is that the user can override it by specifying a
|
|
1163 |
location.
|
|
1164 |
"""
|
|
1165 |
import errno |
|
1166 |
_locs = ['parent', 'pull', 'x-pull'] |
|
1167 |
for l in _locs: |
|
1168 |
try: |
|
1169 |
return self.controlfile(l, 'r').read().strip('\n') |
|
1170 |
except IOError, e: |
|
1171 |
if e.errno != errno.ENOENT: |
|
1172 |
raise
|
|
1173 |
return None |
|
1174 |
||
1150
by Martin Pool
- add new Branch.set_parent and tests |
1175 |
|
1176 |
def set_parent(self, url): |
|
1177 |
# TODO: Maybe delete old location files?
|
|
1178 |
from bzrlib.atomicfile import AtomicFile |
|
1179 |
self.lock_write() |
|
1180 |
try: |
|
1181 |
f = AtomicFile(self.controlfilename('parent')) |
|
1182 |
try: |
|
1183 |
f.write(url + '\n') |
|
1184 |
f.commit() |
|
1185 |
finally: |
|
1186 |
f.close() |
|
1187 |
finally: |
|
1188 |
self.unlock() |
|
1189 |
||
974.1.54
by aaron.bentley at utoronto
Fixed the revno bug in log |
1190 |
def check_revno(self, revno): |
1191 |
"""\
|
|
1192 |
Check whether a revno corresponds to any revision.
|
|
1193 |
Zero (the NULL revision) is considered valid.
|
|
1194 |
"""
|
|
1195 |
if revno != 0: |
|
1196 |
self.check_real_revno(revno) |
|
1197 |
||
1198 |
def check_real_revno(self, revno): |
|
1199 |
"""\
|
|
1200 |
Check whether a revno corresponds to a real revision.
|
|
1201 |
Zero (the NULL revision) is considered invalid
|
|
1202 |
"""
|
|
1203 |
if revno < 1 or revno > self.revno(): |
|
1204 |
raise InvalidRevisionNumber(revno) |
|
1205 |
||
1149
by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it |
1206 |
|
1185.2.15
by Lalo Martins
merging from Robert's integration branch |
1207 |
|
1149
by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it |
1208 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1209 |
|
1185.2.4
by Lalo Martins
splitting a "LocalBranch" class off from Branch |
1210 |
class ScratchBranch(LocalBranch): |
1
by mbp at sourcefrog
import from baz patch-364 |
1211 |
"""Special test class: a branch that cleans up after itself.
|
1212 |
||
1213 |
>>> b = ScratchBranch()
|
|
1214 |
>>> isdir(b.base)
|
|
1215 |
True
|
|
1216 |
>>> bd = b.base
|
|
396
by Martin Pool
- Using the destructor on a ScratchBranch is not reliable; |
1217 |
>>> b.destroy()
|
1
by mbp at sourcefrog
import from baz patch-364 |
1218 |
>>> isdir(bd)
|
1219 |
False
|
|
1220 |
"""
|
|
622
by Martin Pool
Updated merge patch from Aaron |
1221 |
def __init__(self, files=[], dirs=[], base=None): |
1
by mbp at sourcefrog
import from baz patch-364 |
1222 |
"""Make a test branch.
|
1223 |
||
1224 |
This creates a temporary directory and runs init-tree in it.
|
|
1225 |
||
1226 |
If any files are listed, they are created in the working copy.
|
|
1227 |
"""
|
|
800
by Martin Pool
Merge John's import-speedup branch: |
1228 |
from tempfile import mkdtemp |
622
by Martin Pool
Updated merge patch from Aaron |
1229 |
init = False |
1230 |
if base is None: |
|
800
by Martin Pool
Merge John's import-speedup branch: |
1231 |
base = mkdtemp() |
622
by Martin Pool
Updated merge patch from Aaron |
1232 |
init = True |
1185.2.4
by Lalo Martins
splitting a "LocalBranch" class off from Branch |
1233 |
LocalBranch.__init__(self, base, init=init) |
100
by mbp at sourcefrog
- add test case for ignore files |
1234 |
for d in dirs: |
1235 |
os.mkdir(self.abspath(d)) |
|
1236 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
1237 |
for f in files: |
1238 |
file(os.path.join(self.base, f), 'w').write('content of %s' % f) |
|
1239 |
||
1240 |
||
622
by Martin Pool
Updated merge patch from Aaron |
1241 |
def clone(self): |
1242 |
"""
|
|
1243 |
>>> orig = ScratchBranch(files=["file1", "file2"])
|
|
1244 |
>>> clone = orig.clone()
|
|
1245 |
>>> os.path.samefile(orig.base, clone.base)
|
|
1246 |
False
|
|
1247 |
>>> os.path.isfile(os.path.join(clone.base, "file1"))
|
|
1248 |
True
|
|
1249 |
"""
|
|
800
by Martin Pool
Merge John's import-speedup branch: |
1250 |
from shutil import copytree |
1251 |
from tempfile import mkdtemp |
|
1252 |
base = mkdtemp() |
|
622
by Martin Pool
Updated merge patch from Aaron |
1253 |
os.rmdir(base) |
800
by Martin Pool
Merge John's import-speedup branch: |
1254 |
copytree(self.base, base, symlinks=True) |
622
by Martin Pool
Updated merge patch from Aaron |
1255 |
return ScratchBranch(base=base) |
1149
by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it |
1256 |
|
1257 |
||
622
by Martin Pool
Updated merge patch from Aaron |
1258 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1259 |
def __del__(self): |
396
by Martin Pool
- Using the destructor on a ScratchBranch is not reliable; |
1260 |
self.destroy() |
1261 |
||
1262 |
def destroy(self): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1263 |
"""Destroy the test branch, removing the scratch directory."""
|
800
by Martin Pool
Merge John's import-speedup branch: |
1264 |
from shutil import rmtree |
163
by mbp at sourcefrog
merge win32 portability fixes |
1265 |
try: |
610
by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write |
1266 |
if self.base: |
1267 |
mutter("delete ScratchBranch %s" % self.base) |
|
800
by Martin Pool
Merge John's import-speedup branch: |
1268 |
rmtree(self.base) |
396
by Martin Pool
- Using the destructor on a ScratchBranch is not reliable; |
1269 |
except OSError, e: |
163
by mbp at sourcefrog
merge win32 portability fixes |
1270 |
# Work around for shutil.rmtree failing on Windows when
|
1271 |
# readonly files are encountered
|
|
396
by Martin Pool
- Using the destructor on a ScratchBranch is not reliable; |
1272 |
mutter("hit exception in destroying ScratchBranch: %s" % e) |
163
by mbp at sourcefrog
merge win32 portability fixes |
1273 |
for root, dirs, files in os.walk(self.base, topdown=False): |
1274 |
for name in files: |
|
1275 |
os.chmod(os.path.join(root, name), 0700) |
|
800
by Martin Pool
Merge John's import-speedup branch: |
1276 |
rmtree(self.base) |
396
by Martin Pool
- Using the destructor on a ScratchBranch is not reliable; |
1277 |
self.base = None |
1
by mbp at sourcefrog
import from baz patch-364 |
1278 |
|
1279 |
||
1280 |
||
1281 |
######################################################################
|
|
1282 |
# predicates
|
|
1283 |
||
1284 |
||
1285 |
def is_control_file(filename): |
|
1286 |
## FIXME: better check
|
|
1287 |
filename = os.path.normpath(filename) |
|
1288 |
while filename != '': |
|
1289 |
head, tail = os.path.split(filename) |
|
1290 |
## mutter('check %r for control file' % ((head, tail), ))
|
|
1291 |
if tail == bzrlib.BZRDIR: |
|
1292 |
return True |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1293 |
if filename == head: |
1294 |
break
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
1295 |
filename = head |
1296 |
return False |
|
1297 |
||
1298 |
||
1299 |
||
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1300 |
def gen_file_id(name): |
1
by mbp at sourcefrog
import from baz patch-364 |
1301 |
"""Return new file id.
|
1302 |
||
1303 |
This should probably generate proper UUIDs, but for the moment we
|
|
1304 |
cope with just randomness because running uuidgen every time is
|
|
1305 |
slow."""
|
|
535
by Martin Pool
- try to eliminate wierd characters from file names when they're |
1306 |
import re |
800
by Martin Pool
Merge John's import-speedup branch: |
1307 |
from binascii import hexlify |
1308 |
from time import time |
|
535
by Martin Pool
- try to eliminate wierd characters from file names when they're |
1309 |
|
1310 |
# get last component
|
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1311 |
idx = name.rfind('/') |
1312 |
if idx != -1: |
|
1313 |
name = name[idx+1 : ] |
|
262
by Martin Pool
- gen_file_id: break the file on either / or \ when looking |
1314 |
idx = name.rfind('\\') |
1315 |
if idx != -1: |
|
1316 |
name = name[idx+1 : ] |
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1317 |
|
535
by Martin Pool
- try to eliminate wierd characters from file names when they're |
1318 |
# make it not a hidden file
|
70
by mbp at sourcefrog
Prepare for smart recursive add. |
1319 |
name = name.lstrip('.') |
1320 |
||
535
by Martin Pool
- try to eliminate wierd characters from file names when they're |
1321 |
# remove any wierd characters; we don't escape them but rather
|
1322 |
# just pull them out
|
|
1323 |
name = re.sub(r'[^\w.]', '', name) |
|
1324 |
||
190
by mbp at sourcefrog
64 bits of randomness in file/revision ids |
1325 |
s = hexlify(rand_bytes(8)) |
800
by Martin Pool
Merge John's import-speedup branch: |
1326 |
return '-'.join((name, compact_date(time()), s)) |
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
1327 |
|
1328 |
||
1329 |
def gen_root_id(): |
|
1330 |
"""Return a new tree-root file id."""
|
|
1331 |
return gen_file_id('TREE_ROOT') |
|
1332 |
||
1092.1.34
by Robert Collins
unbreak cmd_branch now that something tests the core of it.. |
1333 |
|
1334 |
def copy_branch(branch_from, to_location, revision=None): |
|
1092.1.33
by Robert Collins
pull the important stuff out of cmd_branch.run to branch.copy_branch |
1335 |
"""Copy branch_from into the existing directory to_location.
|
1336 |
||
1151
by Martin Pool
- assertions and documentation for copy_branch |
1337 |
revision
|
1338 |
If not None, only revisions up to this point will be copied.
|
|
1339 |
The head of the new branch will be that revision.
|
|
1340 |
||
1341 |
to_location
|
|
1342 |
The name of a local directory that exists but is empty.
|
|
1092.1.33
by Robert Collins
pull the important stuff out of cmd_branch.run to branch.copy_branch |
1343 |
"""
|
1344 |
from bzrlib.merge import merge |
|
1185.2.6
by Lalo Martins
turned get_revision_info into a RevisionSpec class |
1345 |
from bzrlib.revisionspec import RevisionSpec |
1151
by Martin Pool
- assertions and documentation for copy_branch |
1346 |
|
1347 |
assert isinstance(branch_from, Branch) |
|
1348 |
assert isinstance(to_location, basestring) |
|
1349 |
||
1185.2.9
by Lalo Martins
getting rid of everything that calls the Branch constructor directly |
1350 |
br_to = Branch.initialize(to_location) |
1092.1.33
by Robert Collins
pull the important stuff out of cmd_branch.run to branch.copy_branch |
1351 |
br_to.set_root_id(branch_from.get_root_id()) |
1352 |
if revision is None: |
|
1353 |
revno = branch_from.revno() |
|
1354 |
else: |
|
1185.2.13
by Lalo Martins
polishing up the RevisionSpec api, as per suggestions from Robert |
1355 |
revno, rev_id = RevisionSpec(revision).in_history(branch_from) |
1092.1.33
by Robert Collins
pull the important stuff out of cmd_branch.run to branch.copy_branch |
1356 |
br_to.update_revisions(branch_from, stop_revision=revno) |
1357 |
merge((to_location, -1), (to_location, 0), this_dir=to_location, |
|
1358 |
check_clean=False, ignore_zero=True) |
|
1185.2.3
by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes; |
1359 |
br_to.set_parent(branch_from.base) |
974.1.81
by Aaron Bentley
Added ancestor revision namepsace |
1360 |
return br_to |