To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 1185.14.6
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.14.6
- Committer: Aaron Bentley
- Date: 2005-10-01 06:48:01 UTC
- mto: (1185.12.13)
- mto: This revision was merged to the branch mainline in revision 1419.
- Revision ID: aaron.bentley@utoronto.ca-20051001064801-7400c2ed0fe26080
Made iter_conflicts a WorkingTree method
- files added:
- HACKING
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- files removed:
- bzrlib/remotebranch.py
- plugins/changeset
- files renamed:
- plugins/ => bzrlib/plugins/
- tools/testweave.py => bzrlib/selftest/test_weave.py
- bzrlib/store.py => bzrlib/store/__init__.py
- effbot/ => bzrlib/util/effbot/
- elementtree/ => bzrlib/util/elementtree/
- urlgrabber/ => bzrlib/util/urlgrabber/
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
added
removed
bzrlib/branch.py
17
17
18
18
import sys
19
19
import os
20
import errno
21
from warnings import warn
22
from cStringIO import StringIO
23
20
24
21
25
import bzrlib
22
26
from bzrlib.trace import mutter, note
23
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \
24
splitpath, \
25
sha_file, appendpath, file_kind
26
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId
27
import bzrlib.errors
27
from bzrlib.osutils import (isdir, quotefn, compact_date, rand_bytes,
28
rename, splitpath, sha_file, appendpath,
29
file_kind)
30
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
31
NoSuchRevision, HistoryMissing, NotBranchError,
32
DivergedBranches, LockError, UnlistableStore,
33
UnlistableBranch, NoSuchFile)
28
34
from bzrlib.textui import show_status
29
from bzrlib.revision import Revision
30
from bzrlib.xml import unpack_xml
35
from bzrlib.revision import Revision, validate_revision_id, is_ancestor
31
36
from bzrlib.delta import compare_trees
32
37
from bzrlib.tree import EmptyTree, RevisionTree
33
34
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
38
from bzrlib.inventory import Inventory
39
from bzrlib.store import copy_all
40
from bzrlib.store.compressed_text import CompressedTextStore
41
from bzrlib.store.text import TextStore
42
from bzrlib.store.weave import WeaveStore
43
from bzrlib.transport import Transport, get_transport
44
import bzrlib.xml5
45
import bzrlib.ui
46
47
48
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
49
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
35
50
## TODO: Maybe include checks for common corruption of newlines, etc?
36
51
37
52
38
53
# TODO: Some operations like log might retrieve the same revisions
39
54
# repeatedly to calculate deltas. We could perhaps have a weakref
40
# cache in memory to make this faster.
41
42
43
def find_branch(f, **args):
44
if f and (f.startswith('http://') or f.startswith('https://')):
45
import remotebranch
46
return remotebranch.RemoteBranch(f, **args)
47
else:
48
return Branch(f, **args)
49
50
51
def find_cached_branch(f, cache_root, **args):
52
from remotebranch import RemoteBranch
53
br = find_branch(f, **args)
54
def cacheify(br, store_name):
55
from meta_store import CachedStore
56
cache_path = os.path.join(cache_root, store_name)
57
os.mkdir(cache_path)
58
new_store = CachedStore(getattr(br, store_name), cache_path)
59
setattr(br, store_name, new_store)
60
61
if isinstance(br, RemoteBranch):
62
cacheify(br, 'inventory_store')
63
cacheify(br, 'text_store')
64
cacheify(br, 'revision_store')
65
return br
66
67
55
# cache in memory to make this faster. In general anything can be
56
# cached in memory between lock and unlock operations.
57
58
def find_branch(*ignored, **ignored_too):
59
# XXX: leave this here for about one release, then remove it
60
raise NotImplementedError('find_branch() is not supported anymore, '
61
'please use one of the new branch constructors')
68
62
def _relpath(base, path):
69
63
"""Return path relative to base, or raise exception.
70
64
87
81
if tail:
88
82
s.insert(0, tail)
89
83
else:
90
from errors import NotBranchError
91
84
raise NotBranchError("path %r is not within branch %r" % (rp, base))
92
85
93
86
return os.sep.join(s)
94
87
95
88
96
def find_branch_root(f=None):
97
"""Find the branch root enclosing f, or pwd.
98
99
f may be a filename or a URL.
100
101
It is not necessary that f exists.
89
def find_branch_root(t):
90
"""Find the branch root enclosing the transport's base.
91
92
t is a Transport object.
93
94
It is not necessary that the base of t exists.
102
95
103
96
Basically we keep looking up until we find the control directory or
104
run into the root."""
105
if f == None:
106
f = os.getcwd()
107
elif hasattr(os.path, 'realpath'):
108
f = os.path.realpath(f)
109
else:
110
f = os.path.abspath(f)
111
if not os.path.exists(f):
112
raise BzrError('%r does not exist' % f)
113
114
115
orig_f = f
116
97
run into the root. If there isn't one, raises NotBranchError.
98
"""
99
orig_base = t.base
117
100
while True:
118
if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):
119
return f
120
head, tail = os.path.split(f)
121
if head == f:
101
if t.has(bzrlib.BZRDIR):
102
return t
103
new_t = t.clone('..')
104
if new_t.base == t.base:
122
105
# reached the root, whatever that may be
123
raise BzrError('%r is not in a branch' % orig_f)
124
f = head
125
126
class DivergedBranches(Exception):
127
def __init__(self, branch1, branch2):
128
self.branch1 = branch1
129
self.branch2 = branch2
130
Exception.__init__(self, "These branches have diverged.")
106
raise NotBranchError('%s is not in a branch' % orig_base)
107
t = new_t
131
108
132
109
133
110
######################################################################
137
114
"""Branch holding a history of revisions.
138
115
139
116
base
140
Base directory of the branch.
117
Base directory/url of the branch.
118
"""
119
base = None
120
121
def __init__(self, *ignored, **ignored_too):
122
raise NotImplementedError('The Branch class is abstract')
123
124
@staticmethod
125
def open_downlevel(base):
126
"""Open a branch which may be of an old format.
127
128
Only local branches are supported."""
129
return _Branch(get_transport(base), relax_version_check=True)
130
131
@staticmethod
132
def open(base):
133
"""Open an existing branch, rooted at 'base' (url)"""
134
t = get_transport(base)
135
return _Branch(t)
136
137
@staticmethod
138
def open_containing(url):
139
"""Open an existing branch which contains url.
140
141
This probes for a branch at url, and searches upwards from there.
142
"""
143
t = get_transport(url)
144
t = find_branch_root(t)
145
return _Branch(t)
146
147
@staticmethod
148
def initialize(base):
149
"""Create a new branch, rooted at 'base' (url)"""
150
t = get_transport(base)
151
return _Branch(t, init=True)
152
153
def setup_caching(self, cache_root):
154
"""Subclasses that care about caching should override this, and set
155
up cached stores located under cache_root.
156
"""
157
158
159
class _Branch(Branch):
160
"""A branch stored in the actual filesystem.
161
162
Note that it's "local" in the context of the filesystem; it doesn't
163
really matter if it's on an nfs/smb/afs/coda/... share, as long as
164
it's writable, and can be accessed via the normal filesystem API.
141
165
142
166
_lock_mode
143
167
None, or 'r' or 'w'
149
173
_lock
150
174
Lock object from bzrlib.lock.
151
175
"""
152
base = None
176
# We actually expect this class to be somewhat short-lived; part of its
177
# purpose is to try to isolate what bits of the branch logic are tied to
178
# filesystem access, so that in a later step, we can extricate them to
179
# a separarte ("storage") class.
153
180
_lock_mode = None
154
181
_lock_count = None
155
182
_lock = None
183
_inventory_weave = None
156
184
157
185
# Map some sort of prefix into a namespace
158
186
# stuff like "revno:10", "revid:", etc.
159
187
# This should match a prefix with a function which accepts
160
188
REVISION_NAMESPACES = {}
161
189
162
def __init__(self, base, init=False, find_root=True):
190
def push_stores(self, branch_to):
191
"""Copy the content of this branches store to branch_to."""
192
if (self._branch_format != branch_to._branch_format
193
or self._branch_format != 4):
194
from bzrlib.fetch import greedy_fetch
195
mutter("falling back to fetch logic to push between %s(%s) and %s(%s)",
196
self, self._branch_format, branch_to, branch_to._branch_format)
197
greedy_fetch(to_branch=branch_to, from_branch=self,
198
revision=self.last_revision())
199
return
200
201
store_pairs = ((self.text_store, branch_to.text_store),
202
(self.inventory_store, branch_to.inventory_store),
203
(self.revision_store, branch_to.revision_store))
204
try:
205
for from_store, to_store in store_pairs:
206
copy_all(from_store, to_store)
207
except UnlistableStore:
208
raise UnlistableBranch(from_store)
209
210
def __init__(self, transport, init=False,
211
relax_version_check=False):
163
212
"""Create new branch object at a particular location.
164
213
165
base -- Base directory for the branch.
214
transport -- A Transport object, defining how to access files.
215
(If a string, transport.transport() will be used to
216
create a Transport object)
166
217
167
218
init -- If True, create new control files in a previously
168
219
unversioned directory. If False, the branch must already
169
220
be versioned.
170
221
171
find_root -- If true and init is false, find the root of the
172
existing branch containing base.
222
relax_version_check -- If true, the usual check for the branch
223
version is not applied. This is intended only for
224
upgrade/recovery type use; it's not guaranteed that
225
all operations will work on old format branches.
173
226
174
227
In the test suite, creation of new trees is tested using the
175
228
`ScratchBranch` class.
176
229
"""
177
from bzrlib.store import ImmutableStore
230
assert isinstance(transport, Transport), \
231
"%r is not a Transport" % transport
232
self._transport = transport
178
233
if init:
179
self.base = os.path.realpath(base)
180
234
self._make_control()
181
elif find_root:
182
self.base = find_branch_root(base)
183
else:
184
self.base = os.path.realpath(base)
185
if not isdir(self.controlfilename('.')):
186
from errors import NotBranchError
187
raise NotBranchError("not a bzr branch: %s" % quotefn(base),
188
['use "bzr init" to initialize a new working tree',
189
'current bzr can only operate from top-of-tree'])
190
self._check_format()
191
192
self.text_store = ImmutableStore(self.controlfilename('text-store'))
193
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
194
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
195
235
self._check_format(relax_version_check)
236
237
def get_store(name, compressed=True):
238
relpath = self._rel_controlfilename(name)
239
if compressed:
240
store = CompressedTextStore(self._transport.clone(relpath))
241
else:
242
store = TextStore(self._transport.clone(relpath))
243
if self._transport.should_cache():
244
from meta_store import CachedStore
245
cache_path = os.path.join(self.cache_root, name)
246
os.mkdir(cache_path)
247
store = CachedStore(store, cache_path)
248
return store
249
def get_weave(name):
250
relpath = self._rel_controlfilename(name)
251
ws = WeaveStore(self._transport.clone(relpath))
252
if self._transport.should_cache():
253
ws.enable_cache = True
254
return ws
255
256
if self._branch_format == 4:
257
self.inventory_store = get_store('inventory-store')
258
self.text_store = get_store('text-store')
259
self.revision_store = get_store('revision-store')
260
elif self._branch_format == 5:
261
self.control_weaves = get_weave([])
262
self.weave_store = get_weave('weaves')
263
self.revision_store = get_store('revision-store', compressed=False)
196
264
197
265
def __str__(self):
198
return '%s(%r)' % (self.__class__.__name__, self.base)
266
return '%s(%r)' % (self.__class__.__name__, self._transport.base)
199
267
200
268
201
269
__repr__ = __str__
203
271
204
272
def __del__(self):
205
273
if self._lock_mode or self._lock:
206
from warnings import warn
274
# XXX: This should show something every time, and be suitable for
275
# headless operation and embedding
207
276
warn("branch %r was not explicitly unlocked" % self)
208
277
self._lock.unlock()
209
278
279
# TODO: It might be best to do this somewhere else,
280
# but it is nice for a Branch object to automatically
281
# cache it's information.
282
# Alternatively, we could have the Transport objects cache requests
283
# See the earlier discussion about how major objects (like Branch)
284
# should never expect their __del__ function to run.
285
if hasattr(self, 'cache_root') and self.cache_root is not None:
286
try:
287
import shutil
288
shutil.rmtree(self.cache_root)
289
except:
290
pass
291
self.cache_root = None
292
293
def _get_base(self):
294
if self._transport:
295
return self._transport.base
296
return None
297
298
base = property(_get_base)
210
299
211
300
212
301
def lock_write(self):
302
# TODO: Upgrade locking to support using a Transport,
303
# and potentially a remote locking protocol
213
304
if self._lock_mode:
214
305
if self._lock_mode != 'w':
215
from errors import LockError
216
306
raise LockError("can't upgrade to a write lock from %r" %
217
307
self._lock_mode)
218
308
self._lock_count += 1
219
309
else:
220
from bzrlib.lock import WriteLock
221
222
self._lock = WriteLock(self.controlfilename('branch-lock'))
310
self._lock = self._transport.lock_write(
311
self._rel_controlfilename('branch-lock'))
223
312
self._lock_mode = 'w'
224
313
self._lock_count = 1
225
314
226
315
227
228
316
def lock_read(self):
229
317
if self._lock_mode:
230
318
assert self._lock_mode in ('r', 'w'), \
231
319
"invalid lock mode %r" % self._lock_mode
232
320
self._lock_count += 1
233
321
else:
234
from bzrlib.lock import ReadLock
235
236
self._lock = ReadLock(self.controlfilename('branch-lock'))
322
self._lock = self._transport.lock_read(
323
self._rel_controlfilename('branch-lock'))
237
324
self._lock_mode = 'r'
238
325
self._lock_count = 1
239
326
240
241
242
327
def unlock(self):
243
328
if not self._lock_mode:
244
from errors import LockError
245
329
raise LockError('branch %r is not locked' % (self))
246
330
247
331
if self._lock_count > 1:
251
335
self._lock = None
252
336
self._lock_mode = self._lock_count = None
253
337
254
255
338
def abspath(self, name):
256
339
"""Return absolute filename for something in the branch"""
257
return os.path.join(self.base, name)
258
340
return self._transport.abspath(name)
259
341
260
342
def relpath(self, path):
261
343
"""Return path relative to this branch of something inside it.
262
344
263
345
Raises an error if path is not in this branch."""
264
return _relpath(self.base, path)
265
346
return self._transport.relpath(path)
347
348
349
def _rel_controlfilename(self, file_or_path):
350
if isinstance(file_or_path, basestring):
351
file_or_path = [file_or_path]
352
return [bzrlib.BZRDIR] + file_or_path
266
353
267
354
def controlfilename(self, file_or_path):
268
355
"""Return location relative to branch."""
269
if isinstance(file_or_path, basestring):
270
file_or_path = [file_or_path]
271
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
356
return self._transport.abspath(self._rel_controlfilename(file_or_path))
272
357
273
358
274
359
def controlfile(self, file_or_path, mode='r'):
282
367
Controlfiles should almost never be opened in write mode but
283
368
rather should be atomically copied and replaced using atomicfile.
284
369
"""
285
286
fn = self.controlfilename(file_or_path)
287
288
if mode == 'rb' or mode == 'wb':
289
return file(fn, mode)
290
elif mode == 'r' or mode == 'w':
291
# open in binary mode anyhow so there's no newline translation;
292
# codecs uses line buffering by default; don't want that.
293
import codecs
294
return codecs.open(fn, mode + 'b', 'utf-8',
295
buffering=60000)
370
import codecs
371
372
relpath = self._rel_controlfilename(file_or_path)
373
#TODO: codecs.open() buffers linewise, so it was overloaded with
374
# a much larger buffer, do we need to do the same for getreader/getwriter?
375
if mode == 'rb':
376
return self._transport.get(relpath)
377
elif mode == 'wb':
378
raise BzrError("Branch.controlfile(mode='wb') is not supported, use put_controlfiles")
379
elif mode == 'r':
380
return codecs.getreader('utf-8')(self._transport.get(relpath), errors='replace')
381
elif mode == 'w':
382
raise BzrError("Branch.controlfile(mode='w') is not supported, use put_controlfiles")
296
383
else:
297
384
raise BzrError("invalid controlfile mode %r" % mode)
298
385
299
386
def put_controlfile(self, path, f, encode=True):
387
"""Write an entry as a controlfile.
388
389
:param path: The path to put the file, relative to the .bzr control
390
directory
391
:param f: A file-like or string object whose contents should be copied.
392
:param encode: If true, encode the contents as utf-8
393
"""
394
self.put_controlfiles([(path, f)], encode=encode)
395
396
def put_controlfiles(self, files, encode=True):
397
"""Write several entries as controlfiles.
398
399
:param files: A list of [(path, file)] pairs, where the path is the directory
400
underneath the bzr control directory
401
:param encode: If true, encode the contents as utf-8
402
"""
403
import codecs
404
ctrl_files = []
405
for path, f in files:
406
if encode:
407
if isinstance(f, basestring):
408
f = f.encode('utf-8', 'replace')
409
else:
410
f = codecs.getwriter('utf-8')(f, errors='replace')
411
path = self._rel_controlfilename(path)
412
ctrl_files.append((path, f))
413
self._transport.put_multi(ctrl_files)
300
414
301
415
def _make_control(self):
302
416
from bzrlib.inventory import Inventory
303
from bzrlib.xml import pack_xml
417
from bzrlib.weavefile import write_weave_v5
418
from bzrlib.weave import Weave
304
419
305
os.mkdir(self.controlfilename([]))
306
self.controlfile('README', 'w').write(
420
# Create an empty inventory
421
sio = StringIO()
422
# if we want per-tree root ids then this is the place to set
423
# them; they're not needed for now and so ommitted for
424
# simplicity.
425
bzrlib.xml5.serializer_v5.write_inventory(Inventory(), sio)
426
empty_inv = sio.getvalue()
427
sio = StringIO()
428
bzrlib.weavefile.write_weave_v5(Weave(), sio)
429
empty_weave = sio.getvalue()
430
431
dirs = [[], 'revision-store', 'weaves']
432
files = [('README',
307
433
"This is a Bazaar-NG control directory.\n"
308
"Do not change any files in this directory.\n")
309
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
310
for d in ('text-store', 'inventory-store', 'revision-store'):
311
os.mkdir(self.controlfilename(d))
312
for f in ('revision-history', 'merged-patches',
313
'pending-merged-patches', 'branch-name',
314
'branch-lock',
315
'pending-merges'):
316
self.controlfile(f, 'w').write('')
317
mutter('created control directory in ' + self.base)
318
319
pack_xml(Inventory(gen_root_id()), self.controlfile('inventory','w'))
320
321
322
def _check_format(self):
434
"Do not change any files in this directory.\n"),
435
('branch-format', BZR_BRANCH_FORMAT_5),
436
('revision-history', ''),
437
('branch-name', ''),
438
('branch-lock', ''),
439
('pending-merges', ''),
440
('inventory', empty_inv),
441
('inventory.weave', empty_weave),
442
('ancestry.weave', empty_weave)
443
]
444
cfn = self._rel_controlfilename
445
self._transport.mkdir_multi([cfn(d) for d in dirs])
446
self.put_controlfiles(files)
447
mutter('created control directory in ' + self._transport.base)
448
449
def _check_format(self, relax_version_check):
323
450
"""Check this branch format is supported.
324
451
325
The current tool only supports the current unstable format.
452
The format level is stored, as an integer, in
453
self._branch_format for code that needs to check it later.
326
454
327
455
In the future, we might need different in-memory Branch
328
456
classes to support downlevel branches. But not yet.
329
457
"""
330
# This ignores newlines so that we can open branches created
331
# on Windows from Linux and so on. I think it might be better
332
# to always make all internal files in unix format.
333
fmt = self.controlfile('branch-format', 'r').read()
334
fmt.replace('\r\n', '')
335
if fmt != BZR_BRANCH_FORMAT:
458
try:
459
fmt = self.controlfile('branch-format', 'r').read()
460
except NoSuchFile:
461
raise NotBranchError(self.base)
462
463
if fmt == BZR_BRANCH_FORMAT_5:
464
self._branch_format = 5
465
elif fmt == BZR_BRANCH_FORMAT_4:
466
self._branch_format = 4
467
468
if (not relax_version_check
469
and self._branch_format != 5):
336
470
raise BzrError('sorry, branch format %r not supported' % fmt,
337
471
['use a different bzr version',
338
'or remove the .bzr directory and "bzr init" again'])
472
'or remove the .bzr directory'
473
' and "bzr init" again'])
339
474
340
475
def get_root_id(self):
341
476
"""Return the id of this branches root"""
356
491
357
492
def read_working_inventory(self):
358
493
"""Read the working inventory."""
359
from bzrlib.inventory import Inventory
360
from bzrlib.xml import unpack_xml
361
from time import time
362
before = time()
363
494
self.lock_read()
364
495
try:
365
496
# ElementTree does its own conversion from UTF-8, so open in
366
497
# binary.
367
inv = unpack_xml(Inventory,
368
self.controlfile('inventory', 'rb'))
369
mutter("loaded inventory of %d items in %f"
370
% (len(inv), time() - before))
371
return inv
498
f = self.controlfile('inventory', 'rb')
499
return bzrlib.xml5.serializer_v5.read_inventory(f)
372
500
finally:
373
501
self.unlock()
374
502
379
507
That is to say, the inventory describing changes underway, that
380
508
will be committed to the next revision.
381
509
"""
382
from bzrlib.atomicfile import AtomicFile
383
from bzrlib.xml import pack_xml
384
510
from cStringIO import StringIO
385
511
self.lock_write()
386
512
try:
387
f = AtomicFile(self.controlfilename('inventory'), 'wb')
388
try:
389
pack_xml(inv, f)
390
f.commit()
391
finally:
392
f.close()
513
sio = StringIO()
514
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
515
sio.seek(0)
516
# Transport handles atomicity
517
self.put_controlfile('inventory', sio)
393
518
finally:
394
519
self.unlock()
395
520
400
525
"""Inventory for the working copy.""")
401
526
402
527
403
def add(self, files, verbose=False, ids=None):
528
def add(self, files, ids=None):
404
529
"""Make files versioned.
405
530
406
Note that the command line normally calls smart_add instead.
531
Note that the command line normally calls smart_add instead,
532
which can automatically recurse.
407
533
408
534
This puts the files in the Added state, so that they will be
409
535
recorded by the next commit.
419
545
TODO: Perhaps have an option to add the ids even if the files do
420
546
not (yet) exist.
421
547
422
TODO: Perhaps return the ids of the files? But then again it
423
is easy to retrieve them if they're needed.
424
425
TODO: Adding a directory should optionally recurse down and
426
add all non-ignored children. Perhaps do that in a
427
higher-level method.
548
TODO: Perhaps yield the ids and paths as they're added.
428
549
"""
429
550
# TODO: Re-adding a file that is removed in the working copy
430
551
# should probably put it back with the previous ID.
466
587
file_id = gen_file_id(f)
467
588
inv.add_path(f, kind=kind, file_id=file_id)
468
589
469
if verbose:
470
print 'added', quotefn(f)
471
472
590
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
473
591
474
592
self._write_inventory(inv)
480
598
"""Print `file` to stdout."""
481
599
self.lock_read()
482
600
try:
483
tree = self.revision_tree(self.lookup_revision(revno))
601
tree = self.revision_tree(self.get_rev_id(revno))
484
602
# use inventory as it was in that revision
485
603
file_id = tree.inventory.path2id(file)
486
604
if not file_id:
567
685
568
686
569
687
def append_revision(self, *revision_ids):
570
from bzrlib.atomicfile import AtomicFile
571
572
688
for revision_id in revision_ids:
573
689
mutter("add {%s} to revision-history" % revision_id)
574
575
rev_history = self.revision_history()
576
rev_history.extend(revision_ids)
577
578
f = AtomicFile(self.controlfilename('revision-history'))
690
self.lock_write()
579
691
try:
580
for rev_id in rev_history:
581
print >>f, rev_id
582
f.commit()
692
rev_history = self.revision_history()
693
rev_history.extend(revision_ids)
694
self.put_controlfile('revision-history', '\n'.join(rev_history))
583
695
finally:
584
f.close()
585
586
587
def get_revision_xml(self, revision_id):
696
self.unlock()
697
698
699
def has_revision(self, revision_id):
700
"""True if this branch has a copy of the revision.
701
702
This does not necessarily imply the revision is merge
703
or on the mainline."""
704
return (revision_id is None
705
or revision_id in self.revision_store)
706
707
708
def get_revision_xml_file(self, revision_id):
588
709
"""Return XML file object for revision object."""
589
710
if not revision_id or not isinstance(revision_id, basestring):
590
711
raise InvalidRevisionId(revision_id)
593
714
try:
594
715
try:
595
716
return self.revision_store[revision_id]
596
except IndexError:
597
raise bzrlib.errors.NoSuchRevision(revision_id)
717
except (IndexError, KeyError):
718
raise bzrlib.errors.NoSuchRevision(self, revision_id)
598
719
finally:
599
720
self.unlock()
600
721
601
722
723
def get_revision_xml(self, revision_id):
724
return self.get_revision_xml_file(revision_id).read()
725
726
602
727
def get_revision(self, revision_id):
603
728
"""Return the Revision object for a named revision"""
604
xml_file = self.get_revision_xml(revision_id)
729
xml_file = self.get_revision_xml_file(revision_id)
605
730
606
731
try:
607
r = unpack_xml(Revision, xml_file)
732
r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
608
733
except SyntaxError, e:
609
734
raise bzrlib.errors.BzrError('failed to unpack revision_xml',
610
735
[revision_id,
635
760
636
761
return compare_trees(old_tree, new_tree)
637
762
638
639
640
763
def get_revision_sha1(self, revision_id):
641
764
"""Hash the stored value of a revision, and return it."""
642
# In the future, revision entries will be signed. At that
643
# point, it is probably best *not* to include the signature
644
# in the revision hash. Because that lets you re-sign
645
# the revision, (add signatures/remove signatures) and still
646
# have all hash pointers stay consistent.
647
# But for now, just hash the contents.
648
return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
649
650
651
def get_inventory(self, inventory_id):
652
"""Get Inventory object by hash.
653
654
TODO: Perhaps for this and similar methods, take a revision
655
parameter which can be either an integer revno or a
656
string hash."""
657
from bzrlib.inventory import Inventory
658
from bzrlib.xml import unpack_xml
659
660
return unpack_xml(Inventory, self.inventory_store[inventory_id])
661
662
663
def get_inventory_sha1(self, inventory_id):
765
return bzrlib.osutils.sha_file(self.get_revision_xml_file(revision_id))
766
767
768
def _get_ancestry_weave(self):
769
return self.control_weaves.get_weave('ancestry')
770
771
772
def get_ancestry(self, revision_id):
773
"""Return a list of revision-ids integrated by a revision.
774
"""
775
# strip newlines
776
if revision_id is None:
777
return [None]
778
w = self._get_ancestry_weave()
779
return [None] + [l[:-1] for l in w.get_iter(w.lookup(revision_id))]
780
781
782
def get_inventory_weave(self):
783
return self.control_weaves.get_weave('inventory')
784
785
786
def get_inventory(self, revision_id):
787
"""Get Inventory object by hash."""
788
xml = self.get_inventory_xml(revision_id)
789
return bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
790
791
792
def get_inventory_xml(self, revision_id):
793
"""Get inventory XML as a file object."""
794
try:
795
assert isinstance(revision_id, basestring), type(revision_id)
796
iw = self.get_inventory_weave()
797
return iw.get_text(iw.lookup(revision_id))
798
except IndexError:
799
raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
800
801
802
def get_inventory_sha1(self, revision_id):
664
803
"""Return the sha1 hash of the inventory entry
665
804
"""
666
return sha_file(self.inventory_store[inventory_id])
805
return self.get_revision(revision_id).inventory_sha1
667
806
668
807
669
808
def get_revision_inventory(self, revision_id):
670
809
"""Return inventory of a past revision."""
671
# bzr 0.0.6 imposes the constraint that the inventory_id
810
# TODO: Unify this with get_inventory()
811
# bzr 0.0.6 and later imposes the constraint that the inventory_id
672
812
# must be the same as its revision, so this is trivial.
673
813
if revision_id == None:
674
from bzrlib.inventory import Inventory
675
814
return Inventory(self.get_root_id())
676
815
else:
677
816
return self.get_inventory(revision_id)
678
817
679
818
680
819
def revision_history(self):
681
"""Return sequence of revision hashes on to this branch.
682
683
>>> ScratchBranch().revision_history()
684
[]
685
"""
820
"""Return sequence of revision hashes on to this branch."""
686
821
self.lock_read()
687
822
try:
688
823
return [l.rstrip('\r\n') for l in
693
828
694
829
def common_ancestor(self, other, self_revno=None, other_revno=None):
695
830
"""
696
>>> import commit
831
>>> from bzrlib.commit import commit
697
832
>>> sb = ScratchBranch(files=['foo', 'foo~'])
698
833
>>> sb.common_ancestor(sb) == (None, None)
699
834
True
700
>>> commit.commit(sb, "Committing first revision", verbose=False)
835
>>> commit(sb, "Committing first revision", verbose=False)
701
836
>>> sb.common_ancestor(sb)[0]
702
837
1
703
838
>>> clone = sb.clone()
704
>>> commit.commit(sb, "Committing second revision", verbose=False)
839
>>> commit(sb, "Committing second revision", verbose=False)
705
840
>>> sb.common_ancestor(sb)[0]
706
841
2
707
842
>>> sb.common_ancestor(clone)[0]
708
843
1
709
>>> commit.commit(clone, "Committing divergent second revision",
844
>>> commit(clone, "Committing divergent second revision",
710
845
... verbose=False)
711
846
>>> sb.common_ancestor(clone)[0]
712
847
1
745
880
return len(self.revision_history())
746
881
747
882
748
def last_patch(self):
883
def last_revision(self):
749
884
"""Return last patch hash, or None if no history.
750
885
"""
751
886
ph = self.revision_history()
755
890
return None
756
891
757
892
758
def missing_revisions(self, other, stop_revision=None):
759
"""
893
def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
894
"""Return a list of new revisions that would perfectly fit.
895
760
896
If self and other have not diverged, return a list of the revisions
761
897
present in other, but missing from self.
762
898
782
918
Traceback (most recent call last):
783
919
DivergedBranches: These branches have diverged.
784
920
"""
921
# FIXME: If the branches have diverged, but the latest
922
# revision in this branch is completely merged into the other,
923
# then we should still be able to pull.
785
924
self_history = self.revision_history()
786
925
self_len = len(self_history)
787
926
other_history = other.revision_history()
793
932
794
933
if stop_revision is None:
795
934
stop_revision = other_len
796
elif stop_revision > other_len:
797
raise NoSuchRevision(self, stop_revision)
798
935
else:
936
assert isinstance(stop_revision, int)
937
if stop_revision > other_len:
938
raise bzrlib.errors.NoSuchRevision(self, stop_revision)
799
939
return other_history[self_len:stop_revision]
800
940
801
802
941
def update_revisions(self, other, stop_revision=None):
803
"""Pull in all new revisions from other branch.
804
805
>>> from bzrlib.commit import commit
806
>>> bzrlib.trace.silent = True
807
>>> br1 = ScratchBranch(files=['foo', 'bar'])
808
>>> br1.add('foo')
809
>>> br1.add('bar')
810
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
811
>>> br2 = ScratchBranch()
812
>>> br2.update_revisions(br1)
813
Added 2 texts.
814
Added 1 inventories.
815
Added 1 revisions.
816
>>> br2.revision_history()
817
[u'REVISION-ID-1']
818
>>> br2.update_revisions(br1)
819
Added 0 texts.
820
Added 0 inventories.
821
Added 0 revisions.
822
>>> br1.text_store.total_size() == br2.text_store.total_size()
823
True
824
"""
825
from bzrlib.progress import ProgressBar
826
827
pb = ProgressBar()
828
829
pb.update('comparing histories')
830
revision_ids = self.missing_revisions(other, stop_revision)
831
832
if hasattr(other.revision_store, "prefetch"):
833
other.revision_store.prefetch(revision_ids)
834
if hasattr(other.inventory_store, "prefetch"):
835
inventory_ids = [other.get_revision(r).inventory_id
836
for r in revision_ids]
837
other.inventory_store.prefetch(inventory_ids)
838
839
revisions = []
840
needed_texts = set()
841
i = 0
842
for rev_id in revision_ids:
843
i += 1
844
pb.update('fetching revision', i, len(revision_ids))
845
rev = other.get_revision(rev_id)
846
revisions.append(rev)
847
inv = other.get_inventory(str(rev.inventory_id))
848
for key, entry in inv.iter_entries():
849
if entry.text_id is None:
850
continue
851
if entry.text_id not in self.text_store:
852
needed_texts.add(entry.text_id)
853
854
pb.clear()
855
856
count = self.text_store.copy_multi(other.text_store, needed_texts)
857
print "Added %d texts." % count
858
inventory_ids = [ f.inventory_id for f in revisions ]
859
count = self.inventory_store.copy_multi(other.inventory_store,
860
inventory_ids)
861
print "Added %d inventories." % count
862
revision_ids = [ f.revision_id for f in revisions]
863
count = self.revision_store.copy_multi(other.revision_store,
864
revision_ids)
865
for revision_id in revision_ids:
866
self.append_revision(revision_id)
867
print "Added %d revisions." % count
868
869
942
"""Pull in new perfect-fit revisions."""
943
from bzrlib.fetch import greedy_fetch
944
from bzrlib.revision import get_intervening_revisions
945
if stop_revision is None:
946
stop_revision = other.last_revision()
947
greedy_fetch(to_branch=self, from_branch=other,
948
revision=stop_revision)
949
pullable_revs = self.missing_revisions(
950
other, other.revision_id_to_revno(stop_revision))
951
if pullable_revs:
952
greedy_fetch(to_branch=self,
953
from_branch=other,
954
revision=pullable_revs[-1])
955
self.append_revision(*pullable_revs)
956
957
870
958
def commit(self, *args, **kw):
871
from bzrlib.commit import commit
872
commit(self, *args, **kw)
873
874
875
def lookup_revision(self, revision):
876
"""Return the revision identifier for a given revision information."""
877
revno, info = self.get_revision_info(revision)
878
return info
879
880
def get_revision_info(self, revision):
881
"""Return (revno, revision id) for revision identifier.
882
883
revision can be an integer, in which case it is assumed to be revno (though
884
this will translate negative values into positive ones)
885
revision can also be a string, in which case it is parsed for something like
886
'date:' or 'revid:' etc.
887
"""
888
if revision is None:
889
return 0, None
890
revno = None
891
try:# Convert to int if possible
892
revision = int(revision)
893
except ValueError:
894
pass
895
revs = self.revision_history()
896
if isinstance(revision, int):
897
if revision == 0:
898
return 0, None
899
# Mabye we should do this first, but we don't need it if revision == 0
900
if revision < 0:
901
revno = len(revs) + revision + 1
902
else:
903
revno = revision
904
elif isinstance(revision, basestring):
905
for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
906
if revision.startswith(prefix):
907
revno = func(self, revs, revision)
908
break
909
else:
910
raise BzrError('No namespace registered for string: %r' % revision)
911
912
if revno is None or revno <= 0 or revno > len(revs):
913
raise BzrError("no such revision %s" % revision)
914
return revno, revs[revno-1]
915
916
def _namespace_revno(self, revs, revision):
917
"""Lookup a revision by revision number"""
918
assert revision.startswith('revno:')
919
try:
920
return int(revision[6:])
921
except ValueError:
922
return None
923
REVISION_NAMESPACES['revno:'] = _namespace_revno
924
925
def _namespace_revid(self, revs, revision):
926
assert revision.startswith('revid:')
927
try:
928
return revs.index(revision[6:]) + 1
929
except ValueError:
930
return None
931
REVISION_NAMESPACES['revid:'] = _namespace_revid
932
933
def _namespace_last(self, revs, revision):
934
assert revision.startswith('last:')
935
try:
936
offset = int(revision[5:])
937
except ValueError:
938
return None
939
else:
940
if offset <= 0:
941
raise BzrError('You must supply a positive value for --revision last:XXX')
942
return len(revs) - offset + 1
943
REVISION_NAMESPACES['last:'] = _namespace_last
944
945
def _namespace_tag(self, revs, revision):
946
assert revision.startswith('tag:')
947
raise BzrError('tag: namespace registered, but not implemented.')
948
REVISION_NAMESPACES['tag:'] = _namespace_tag
949
950
def _namespace_date(self, revs, revision):
951
assert revision.startswith('date:')
952
import datetime
953
# Spec for date revisions:
954
# date:value
955
# value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
956
# it can also start with a '+/-/='. '+' says match the first
957
# entry after the given date. '-' is match the first entry before the date
958
# '=' is match the first entry after, but still on the given date.
959
#
960
# +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
961
# -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
962
# =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
963
# May 13th, 2005 at 0:00
964
#
965
# So the proper way of saying 'give me all entries for today' is:
966
# -r {date:+today}:{date:-tomorrow}
967
# The default is '=' when not supplied
968
val = revision[5:]
969
match_style = '='
970
if val[:1] in ('+', '-', '='):
971
match_style = val[:1]
972
val = val[1:]
973
974
today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
975
if val.lower() == 'yesterday':
976
dt = today - datetime.timedelta(days=1)
977
elif val.lower() == 'today':
978
dt = today
979
elif val.lower() == 'tomorrow':
980
dt = today + datetime.timedelta(days=1)
981
else:
982
import re
983
# This should be done outside the function to avoid recompiling it.
984
_date_re = re.compile(
985
r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
986
r'(,|T)?\s*'
987
r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
988
)
989
m = _date_re.match(val)
990
if not m or (not m.group('date') and not m.group('time')):
991
raise BzrError('Invalid revision date %r' % revision)
992
993
if m.group('date'):
994
year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
995
else:
996
year, month, day = today.year, today.month, today.day
997
if m.group('time'):
998
hour = int(m.group('hour'))
999
minute = int(m.group('minute'))
1000
if m.group('second'):
1001
second = int(m.group('second'))
1002
else:
1003
second = 0
1004
else:
1005
hour, minute, second = 0,0,0
1006
1007
dt = datetime.datetime(year=year, month=month, day=day,
1008
hour=hour, minute=minute, second=second)
1009
first = dt
1010
last = None
1011
reversed = False
1012
if match_style == '-':
1013
reversed = True
1014
elif match_style == '=':
1015
last = dt + datetime.timedelta(days=1)
1016
1017
if reversed:
1018
for i in range(len(revs)-1, -1, -1):
1019
r = self.get_revision(revs[i])
1020
# TODO: Handle timezone.
1021
dt = datetime.datetime.fromtimestamp(r.timestamp)
1022
if first >= dt and (last is None or dt >= last):
1023
return i+1
1024
else:
1025
for i in range(len(revs)):
1026
r = self.get_revision(revs[i])
1027
# TODO: Handle timezone.
1028
dt = datetime.datetime.fromtimestamp(r.timestamp)
1029
if first <= dt and (last is None or dt <= last):
1030
return i+1
1031
REVISION_NAMESPACES['date:'] = _namespace_date
959
from bzrlib.commit import Commit
960
Commit().commit(self, *args, **kw)
961
962
def revision_id_to_revno(self, revision_id):
963
"""Given a revision id, return its revno"""
964
if revision_id is None:
965
return 0
966
history = self.revision_history()
967
try:
968
return history.index(revision_id) + 1
969
except ValueError:
970
raise bzrlib.errors.NoSuchRevision(self, revision_id)
971
972
def get_rev_id(self, revno, history=None):
973
"""Find the revision id of the specified revno."""
974
if revno == 0:
975
return None
976
if history is None:
977
history = self.revision_history()
978
elif revno <= 0 or revno > len(history):
979
raise bzrlib.errors.NoSuchRevision(self, revno)
980
return history[revno - 1]
1032
981
1033
982
def revision_tree(self, revision_id):
1034
983
"""Return Tree for a revision on this branch.
1041
990
return EmptyTree()
1042
991
else:
1043
992
inv = self.get_revision_inventory(revision_id)
1044
return RevisionTree(self.text_store, inv)
993
return RevisionTree(self.weave_store, inv, revision_id)
1045
994
1046
995
1047
996
def working_tree(self):
1048
997
"""Return a `Tree` for the working copy."""
1049
from workingtree import WorkingTree
1050
return WorkingTree(self.base, self.read_working_inventory())
998
from bzrlib.workingtree import WorkingTree
999
# TODO: In the future, WorkingTree should utilize Transport
1000
return WorkingTree(self._transport.base, self.read_working_inventory())
1051
1001
1052
1002
1053
1003
def basis_tree(self):
1055
1005
1056
1006
If there are no revisions yet, return an `EmptyTree`.
1057
1007
"""
1058
r = self.last_patch()
1059
if r == None:
1060
return EmptyTree()
1061
else:
1062
return RevisionTree(self.text_store, self.get_revision_inventory(r))
1063
1008
return self.revision_tree(self.last_revision())
1064
1009
1065
1010
1066
1011
def rename_one(self, from_rel, to_rel):
1098
1043
1099
1044
inv.rename(file_id, to_dir_id, to_tail)
1100
1045
1101
print "%s => %s" % (from_rel, to_rel)
1102
1103
1046
from_abs = self.abspath(from_rel)
1104
1047
to_abs = self.abspath(to_rel)
1105
1048
try:
1106
os.rename(from_abs, to_abs)
1049
rename(from_abs, to_abs)
1107
1050
except OSError, e:
1108
1051
raise BzrError("failed to rename %r to %r: %s"
1109
1052
% (from_abs, to_abs, e[1]),
1124
1067
1125
1068
Note that to_name is only the last component of the new name;
1126
1069
this doesn't change the directory.
1070
1071
This returns a list of (from_path, to_path) pairs for each
1072
entry that is moved.
1127
1073
"""
1074
result = []
1128
1075
self.lock_write()
1129
1076
try:
1130
1077
## TODO: Option to move IDs only
1165
1112
for f in from_paths:
1166
1113
name_tail = splitpath(f)[-1]
1167
1114
dest_path = appendpath(to_name, name_tail)
1168
print "%s => %s" % (f, dest_path)
1115
result.append((f, dest_path))
1169
1116
inv.rename(inv.path2id(f), to_dir_id, name_tail)
1170
1117
try:
1171
os.rename(self.abspath(f), self.abspath(dest_path))
1118
rename(self.abspath(f), self.abspath(dest_path))
1172
1119
except OSError, e:
1173
1120
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1174
1121
["rename rolled back"])
1177
1124
finally:
1178
1125
self.unlock()
1179
1126
1127
return result
1128
1180
1129
1181
1130
def revert(self, filenames, old_tree=None, backups=True):
1182
1131
"""Restore selected files to the versions from a previous tree.
1228
1177
These are revisions that have been merged into the working
1229
1178
directory but not yet committed.
1230
1179
"""
1231
cfn = self.controlfilename('pending-merges')
1232
if not os.path.exists(cfn):
1180
cfn = self._rel_controlfilename('pending-merges')
1181
if not self._transport.has(cfn):
1233
1182
return []
1234
1183
p = []
1235
1184
for l in self.controlfile('pending-merges', 'r').readlines():
1237
1186
return p
1238
1187
1239
1188
1240
def add_pending_merge(self, revision_id):
1241
from bzrlib.revision import validate_revision_id
1242
1243
validate_revision_id(revision_id)
1189
def add_pending_merge(self, *revision_ids):
1190
# TODO: Perhaps should check at this point that the
1191
# history of the revision is actually present?
1192
for rev_id in revision_ids:
1193
validate_revision_id(rev_id)
1244
1194
1245
1195
p = self.pending_merges()
1246
if revision_id in p:
1247
return
1248
p.append(revision_id)
1249
self.set_pending_merges(p)
1250
1196
updated = False
1197
for rev_id in revision_ids:
1198
if rev_id in p:
1199
continue
1200
p.append(rev_id)
1201
updated = True
1202
if updated:
1203
self.set_pending_merges(p)
1251
1204
1252
1205
def set_pending_merges(self, rev_list):
1206
self.lock_write()
1207
try:
1208
self.put_controlfile('pending-merges', '\n'.join(rev_list))
1209
finally:
1210
self.unlock()
1211
1212
1213
def get_parent(self):
1214
"""Return the parent location of the branch.
1215
1216
This is the default location for push/pull/missing. The usual
1217
pattern is that the user can override it by specifying a
1218
location.
1219
"""
1220
import errno
1221
_locs = ['parent', 'pull', 'x-pull']
1222
for l in _locs:
1223
try:
1224
return self.controlfile(l, 'r').read().strip('\n')
1225
except IOError, e:
1226
if e.errno != errno.ENOENT:
1227
raise
1228
return None
1229
1230
1231
def set_parent(self, url):
1232
# TODO: Maybe delete old location files?
1253
1233
from bzrlib.atomicfile import AtomicFile
1254
1234
self.lock_write()
1255
1235
try:
1256
f = AtomicFile(self.controlfilename('pending-merges'))
1236
f = AtomicFile(self.controlfilename('parent'))
1257
1237
try:
1258
for l in rev_list:
1259
print >>f, l
1238
f.write(url + '\n')
1260
1239
f.commit()
1261
1240
finally:
1262
1241
f.close()
1263
1242
finally:
1264
1243
self.unlock()
1265
1244
1266
1267
1268
class ScratchBranch(Branch):
1245
def check_revno(self, revno):
1246
"""\
1247
Check whether a revno corresponds to any revision.
1248
Zero (the NULL revision) is considered valid.
1249
"""
1250
if revno != 0:
1251
self.check_real_revno(revno)
1252
1253
def check_real_revno(self, revno):
1254
"""\
1255
Check whether a revno corresponds to a real revision.
1256
Zero (the NULL revision) is considered invalid
1257
"""
1258
if revno < 1 or revno > self.revno():
1259
raise InvalidRevisionNumber(revno)
1260
1261
1262
1263
1264
1265
class ScratchBranch(_Branch):
1269
1266
"""Special test class: a branch that cleans up after itself.
1270
1267
1271
1268
>>> b = ScratchBranch()
1288
1285
if base is None:
1289
1286
base = mkdtemp()
1290
1287
init = True
1291
Branch.__init__(self, base, init=init)
1288
if isinstance(base, basestring):
1289
base = get_transport(base)
1290
_Branch.__init__(self, base, init=init)
1292
1291
for d in dirs:
1293
os.mkdir(self.abspath(d))
1292
self._transport.mkdir(d)
1294
1293
1295
1294
for f in files:
1296
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1295
self._transport.put(f, 'content of %s' % f)
1297
1296
1298
1297
1299
1298
def clone(self):
1300
1299
"""
1301
1300
>>> orig = ScratchBranch(files=["file1", "file2"])
1302
1301
>>> clone = orig.clone()
1303
>>> os.path.samefile(orig.base, clone.base)
1302
>>> if os.name != 'nt':
1303
... os.path.samefile(orig.base, clone.base)
1304
... else:
1305
... orig.base == clone.base
1306
...
1304
1307
False
1305
1308
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1306
1309
True
1311
1314
os.rmdir(base)
1312
1315
copytree(self.base, base, symlinks=True)
1313
1316
return ScratchBranch(base=base)
1317
1318
1314
1319
1315
1320
def __del__(self):
1316
1321
self.destroy()
1330
1335
for name in files:
1331
1336
os.chmod(os.path.join(root, name), 0700)
1332
1337
rmtree(self.base)
1333
self.base = None
1338
self._transport = None
1334
1339
1335
1340
1336
1341
1386
1391
"""Return a new tree-root file id."""
1387
1392
return gen_file_id('TREE_ROOT')
1388
1393
1394
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0