« back to all changes in this revision
Viewing changes to bzrlib/branch.py
- browse files at revision 131
- compare with another revision
- download diff
- download tarball
- view history from revision 131
- Committer: mbp at sourcefrog
- Date: 2005-03-29 02:31:34 UTC
- Revision ID: mbp@sourcefrog.net-20050329023134-2d1eb96c55831937
check size and sha1 of files retrieved from the tree
- files added:
- NEWS
- elementtree
- files modified:
- .bzrignore
added
removed
bzrlib/branch.py
1
#! /usr/bin/env python
2
# -*- coding: UTF-8 -*-
1
# Copyright (C) 2005 Canonical Ltd
3
2
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
41
40
42
41
43
42
43
def find_branch_root(f=None):
44
"""Find the branch root enclosing f, or pwd.
45
46
It is not necessary that f exists.
47
48
Basically we keep looking up until we find the control directory or
49
run into the root."""
50
if f is None:
51
f = os.getcwd()
52
elif hasattr(os.path, 'realpath'):
53
f = os.path.realpath(f)
54
else:
55
f = os.path.abspath(f)
56
57
orig_f = f
58
59
last_f = f
60
while True:
61
if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):
62
return f
63
head, tail = os.path.split(f)
64
if head == f:
65
# reached the root, whatever that may be
66
bailout('%r is not in a branch' % orig_f)
67
f = head
68
44
69
45
70
46
71
######################################################################
62
87
63
88
:todo: mkdir() method.
64
89
"""
65
def __init__(self, base, init=False):
90
def __init__(self, base, init=False, find_root=True):
66
91
"""Create new branch object at a particular location.
67
92
68
93
:param base: Base directory for the branch.
69
94
70
95
:param init: If True, create new control files in a previously
71
96
unversioned directory. If False, the branch must already
72
97
be versioned.
73
98
99
:param find_root: If true and init is false, find the root of the
100
existing branch containing base.
101
74
102
In the test suite, creation of new trees is tested using the
75
103
`ScratchBranch` class.
76
104
"""
77
self.base = os.path.realpath(base)
78
105
if init:
106
self.base = os.path.realpath(base)
79
107
self._make_control()
108
elif find_root:
109
self.base = find_branch_root(base)
80
110
else:
111
self.base = os.path.realpath(base)
81
112
if not isdir(self.controlfilename('.')):
82
113
bailout("not a bzr branch: %s" % quotefn(base),
83
114
['use "bzr init" to initialize a new working tree',
84
115
'current bzr can only operate from top-of-tree'])
85
self._check_format()
116
self._check_format()
86
117
87
118
self.text_store = ImmutableStore(self.controlfilename('text-store'))
88
119
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
96
127
__repr__ = __str__
97
128
98
129
99
def _rel(self, name):
100
"""Return filename relative to branch top"""
130
def abspath(self, name):
131
"""Return absolute filename for something in the branch"""
101
132
return os.path.join(self.base, name)
102
133
134
135
def relpath(self, path):
136
"""Return path relative to this branch of something inside it.
137
138
Raises an error if path is not in this branch."""
139
rp = os.path.realpath(path)
140
# FIXME: windows
141
if not rp.startswith(self.base):
142
bailout("path %r is not within branch %r" % (rp, self.base))
143
rp = rp[len(self.base):]
144
rp = rp.lstrip(os.sep)
145
return rp
146
103
147
104
148
def controlfilename(self, file_or_path):
105
149
"""Return location relative to branch."""
160
204
will be committed to the next revision.
161
205
"""
162
206
## TODO: factor out to atomicfile? is rename safe on windows?
207
## TODO: Maybe some kind of clean/dirty marker on inventory?
163
208
tmpfname = self.controlfilename('inventory.tmp')
164
209
tmpf = file(tmpfname, 'w')
165
210
inv.write_xml(tmpf)
228
273
if len(fp) == 0:
229
274
bailout("cannot add top-level %r" % f)
230
275
231
fullpath = os.path.normpath(self._rel(f))
232
233
if isfile(fullpath):
234
kind = 'file'
235
elif isdir(fullpath):
236
kind = 'directory'
237
else:
238
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
239
240
if len(fp) > 1:
241
parent_name = joinpath(fp[:-1])
242
mutter("lookup parent %r" % parent_name)
243
parent_id = inv.path2id(parent_name)
244
if parent_id == None:
245
bailout("cannot add: parent %r is not versioned"
246
% joinpath(fp[:-1]))
247
else:
248
parent_id = None
249
250
file_id = _gen_file_id(fp[-1])
251
inv.add(InventoryEntry(file_id, fp[-1], kind=kind, parent_id=parent_id))
276
fullpath = os.path.normpath(self.abspath(f))
277
278
try:
279
kind = file_kind(fullpath)
280
except OSError:
281
# maybe something better?
282
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
283
284
if kind != 'file' and kind != 'directory':
285
bailout('cannot add: not a regular file or directory: %s' % quotefn(f))
286
287
file_id = gen_file_id(f)
288
inv.add_path(f, kind=kind, file_id=file_id)
289
252
290
if verbose:
253
291
show_status('A', kind, quotefn(f))
254
292
255
mutter("add file %s file_id:{%s} kind=%r parent_id={%s}"
256
% (f, file_id, kind, parent_id))
293
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
294
257
295
self._write_inventory(inv)
258
296
259
297
388
426
389
427
entry = entry.copy()
390
428
391
p = self._rel(path)
429
p = self.abspath(path)
392
430
file_id = entry.file_id
393
431
mutter('commit prep file %s, id %r ' % (p, file_id))
394
432
434
472
entry.text_id)
435
473
436
474
else:
437
entry.text_id = _gen_file_id(entry.name)
475
entry.text_id = gen_file_id(entry.name)
438
476
self.text_store.add(content, entry.text_id)
439
477
mutter(' stored with text_id {%s}' % entry.text_id)
440
478
if verbose:
442
480
state = 'A'
443
481
elif (old_ie.name == entry.name
444
482
and old_ie.parent_id == entry.parent_id):
483
state = 'M'
484
else:
445
485
state = 'R'
446
else:
447
state = 'M'
448
486
449
487
show_status(state, entry.kind, quotefn(path))
450
488
504
542
mutter("committing patch r%d" % (self.revno() + 1))
505
543
506
544
mutter("append to revision-history")
507
self.controlfile('revision-history', 'at').write(rev_id + '\n')
545
f = self.controlfile('revision-history', 'at')
546
f.write(rev_id + '\n')
547
f.close()
508
548
509
mutter("done!")
549
if verbose:
550
note("commited r%d" % self.revno())
510
551
511
552
512
553
def get_revision(self, revision_id):
669
710
A foo
670
711
>>> b.commit("add foo")
671
712
>>> b.show_status()
672
>>> os.unlink(b._rel('foo'))
713
>>> os.unlink(b.abspath('foo'))
673
714
>>> b.show_status()
674
715
D foo
675
716
726
767
>>> isdir(bd)
727
768
False
728
769
"""
729
def __init__(self, files = []):
770
def __init__(self, files=[], dirs=[]):
730
771
"""Make a test branch.
731
772
732
773
This creates a temporary directory and runs init-tree in it.
734
775
If any files are listed, they are created in the working copy.
735
776
"""
736
777
Branch.__init__(self, tempfile.mkdtemp(), init=True)
778
for d in dirs:
779
os.mkdir(self.abspath(d))
780
737
781
for f in files:
738
782
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
739
783
756
800
## mutter('check %r for control file' % ((head, tail), ))
757
801
if tail == bzrlib.BZRDIR:
758
802
return True
803
if filename == head:
804
break
759
805
filename = head
760
806
return False
761
807
768
814
return s
769
815
770
816
771
def _gen_file_id(name):
817
def gen_file_id(name):
772
818
"""Return new file id.
773
819
774
820
This should probably generate proper UUIDs, but for the moment we
775
821
cope with just randomness because running uuidgen every time is
776
822
slow."""
777
assert '/' not in name
778
while name[0] == '.':
779
name = name[1:]
823
idx = name.rfind('/')
824
if idx != -1:
825
name = name[idx+1 : ]
826
827
name = name.lstrip('.')
828
780
829
s = hexlify(rand_bytes(8))
781
830
return '-'.join((name, compact_date(time.time()), s))
782
831
Loggerhead is a web-based interface for Breezy
Version: 2.0.1