1
# Copyright (C) 2005 Canonical Ltd
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.
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.
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
21
from bzrlib.trace import mutter, note
22
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, splitpath, \
23
sha_file, appendpath, file_kind
24
from bzrlib.errors import BzrError
26
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
27
## TODO: Maybe include checks for common corruption of newlines, etc?
31
def find_branch(f, **args):
32
if f and (f.startswith('http://') or f.startswith('https://')):
34
return remotebranch.RemoteBranch(f, **args)
36
return Branch(f, **args)
39
def find_cached_branch(f, cache_root, **args):
40
from remotebranch import RemoteBranch
41
br = find_branch(f, **args)
42
def cacheify(br, store_name):
43
from meta_store import CachedStore
44
cache_path = os.path.join(cache_root, store_name)
46
new_store = CachedStore(getattr(br, store_name), cache_path)
47
setattr(br, store_name, new_store)
49
if isinstance(br, RemoteBranch):
50
cacheify(br, 'inventory_store')
51
cacheify(br, 'text_store')
52
cacheify(br, 'revision_store')
56
def _relpath(base, path):
57
"""Return path relative to base, or raise exception.
59
The path may be either an absolute path or a path relative to the
60
current working directory.
62
Lifted out of Branch.relpath for ease of testing.
64
os.path.commonprefix (python2.4) has a bad bug that it works just
65
on string prefixes, assuming that '/u' is a prefix of '/u2'. This
66
avoids that problem."""
67
rp = os.path.abspath(path)
71
while len(head) >= len(base):
74
head, tail = os.path.split(head)
78
from errors import NotBranchError
79
raise NotBranchError("path %r is not within branch %r" % (rp, base))
84
def find_branch_root(f=None):
85
"""Find the branch root enclosing f, or pwd.
87
f may be a filename or a URL.
89
It is not necessary that f exists.
91
Basically we keep looking up until we find the control directory or
95
elif hasattr(os.path, 'realpath'):
96
f = os.path.realpath(f)
98
f = os.path.abspath(f)
99
if not os.path.exists(f):
100
raise BzrError('%r does not exist' % f)
106
if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):
108
head, tail = os.path.split(f)
110
# reached the root, whatever that may be
111
raise BzrError('%r is not in a branch' % orig_f)
114
class DivergedBranches(Exception):
115
def __init__(self, branch1, branch2):
116
self.branch1 = branch1
117
self.branch2 = branch2
118
Exception.__init__(self, "These branches have diverged.")
121
class NoSuchRevision(BzrError):
122
def __init__(self, branch, revision):
124
self.revision = revision
125
msg = "Branch %s has no revision %d" % (branch, revision)
126
BzrError.__init__(self, msg)
129
######################################################################
132
class Branch(object):
133
"""Branch holding a history of revisions.
136
Base directory of the branch.
142
If _lock_mode is true, a positive count of the number of times the
146
Lock object from bzrlib.lock.
153
def __init__(self, base, init=False, find_root=True):
154
"""Create new branch object at a particular location.
156
base -- Base directory for the branch.
158
init -- If True, create new control files in a previously
159
unversioned directory. If False, the branch must already
162
find_root -- If true and init is false, find the root of the
163
existing branch containing base.
165
In the test suite, creation of new trees is tested using the
166
`ScratchBranch` class.
168
from bzrlib.store import ImmutableStore
170
self.base = os.path.realpath(base)
173
self.base = find_branch_root(base)
175
self.base = os.path.realpath(base)
176
if not isdir(self.controlfilename('.')):
177
from errors import NotBranchError
178
raise NotBranchError("not a bzr branch: %s" % quotefn(base),
179
['use "bzr init" to initialize a new working tree',
180
'current bzr can only operate from top-of-tree'])
183
self.text_store = ImmutableStore(self.controlfilename('text-store'))
184
self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
185
self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
189
return '%s(%r)' % (self.__class__.__name__, self.base)
196
if self._lock_mode or self._lock:
197
from warnings import warn
198
warn("branch %r was not explicitly unlocked" % self)
203
def lock_write(self):
205
if self._lock_mode != 'w':
206
from errors import LockError
207
raise LockError("can't upgrade to a write lock from %r" %
209
self._lock_count += 1
211
from bzrlib.lock import WriteLock
213
self._lock = WriteLock(self.controlfilename('branch-lock'))
214
self._lock_mode = 'w'
221
assert self._lock_mode in ('r', 'w'), \
222
"invalid lock mode %r" % self._lock_mode
223
self._lock_count += 1
225
from bzrlib.lock import ReadLock
227
self._lock = ReadLock(self.controlfilename('branch-lock'))
228
self._lock_mode = 'r'
234
if not self._lock_mode:
235
from errors import LockError
236
raise LockError('branch %r is not locked' % (self))
238
if self._lock_count > 1:
239
self._lock_count -= 1
243
self._lock_mode = self._lock_count = None
246
def abspath(self, name):
247
"""Return absolute filename for something in the branch"""
248
return os.path.join(self.base, name)
251
def relpath(self, path):
252
"""Return path relative to this branch of something inside it.
254
Raises an error if path is not in this branch."""
255
return _relpath(self.base, path)
258
def controlfilename(self, file_or_path):
259
"""Return location relative to branch."""
260
if isinstance(file_or_path, basestring):
261
file_or_path = [file_or_path]
262
return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
265
def controlfile(self, file_or_path, mode='r'):
266
"""Open a control file for this branch.
268
There are two classes of file in the control directory: text
269
and binary. binary files are untranslated byte streams. Text
270
control files are stored with Unix newlines and in UTF-8, even
271
if the platform or locale defaults are different.
273
Controlfiles should almost never be opened in write mode but
274
rather should be atomically copied and replaced using atomicfile.
277
fn = self.controlfilename(file_or_path)
279
if mode == 'rb' or mode == 'wb':
280
return file(fn, mode)
281
elif mode == 'r' or mode == 'w':
282
# open in binary mode anyhow so there's no newline translation;
283
# codecs uses line buffering by default; don't want that.
285
return codecs.open(fn, mode + 'b', 'utf-8',
288
raise BzrError("invalid controlfile mode %r" % mode)
292
def _make_control(self):
293
from bzrlib.inventory import Inventory
294
from bzrlib.xml import pack_xml
296
os.mkdir(self.controlfilename([]))
297
self.controlfile('README', 'w').write(
298
"This is a Bazaar-NG control directory.\n"
299
"Do not change any files in this directory.\n")
300
self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
301
for d in ('text-store', 'inventory-store', 'revision-store'):
302
os.mkdir(self.controlfilename(d))
303
for f in ('revision-history', 'merged-patches',
304
'pending-merged-patches', 'branch-name',
307
self.controlfile(f, 'w').write('')
308
mutter('created control directory in ' + self.base)
310
pack_xml(Inventory(), self.controlfile('inventory','w'))
313
def _check_format(self):
314
"""Check this branch format is supported.
316
The current tool only supports the current unstable format.
318
In the future, we might need different in-memory Branch
319
classes to support downlevel branches. But not yet.
321
# This ignores newlines so that we can open branches created
322
# on Windows from Linux and so on. I think it might be better
323
# to always make all internal files in unix format.
324
fmt = self.controlfile('branch-format', 'r').read()
325
fmt.replace('\r\n', '')
326
if fmt != BZR_BRANCH_FORMAT:
327
raise BzrError('sorry, branch format %r not supported' % fmt,
328
['use a different bzr version',
329
'or remove the .bzr directory and "bzr init" again'])
333
def read_working_inventory(self):
334
"""Read the working inventory."""
335
from bzrlib.inventory import Inventory
336
from bzrlib.xml import unpack_xml
337
from time import time
341
# ElementTree does its own conversion from UTF-8, so open in
343
inv = unpack_xml(Inventory,
344
self.controlfile('inventory', 'rb'))
345
mutter("loaded inventory of %d items in %f"
346
% (len(inv), time() - before))
352
def _write_inventory(self, inv):
353
"""Update the working inventory.
355
That is to say, the inventory describing changes underway, that
356
will be committed to the next revision.
358
from bzrlib.atomicfile import AtomicFile
359
from bzrlib.xml import pack_xml
363
f = AtomicFile(self.controlfilename('inventory'), 'wb')
372
mutter('wrote working inventory')
375
inventory = property(read_working_inventory, _write_inventory, None,
376
"""Inventory for the working copy.""")
379
def add(self, files, verbose=False, ids=None):
380
"""Make files versioned.
382
Note that the command line normally calls smart_add instead.
384
This puts the files in the Added state, so that they will be
385
recorded by the next commit.
388
List of paths to add, relative to the base of the tree.
391
If set, use these instead of automatically generated ids.
392
Must be the same length as the list of files, but may
393
contain None for ids that are to be autogenerated.
395
TODO: Perhaps have an option to add the ids even if the files do
398
TODO: Perhaps return the ids of the files? But then again it
399
is easy to retrieve them if they're needed.
401
TODO: Adding a directory should optionally recurse down and
402
add all non-ignored children. Perhaps do that in a
405
from bzrlib.textui import show_status
406
# TODO: Re-adding a file that is removed in the working copy
407
# should probably put it back with the previous ID.
408
if isinstance(files, basestring):
409
assert(ids is None or isinstance(ids, basestring))
415
ids = [None] * len(files)
417
assert(len(ids) == len(files))
421
inv = self.read_working_inventory()
422
for f,file_id in zip(files, ids):
423
if is_control_file(f):
424
raise BzrError("cannot add control file %s" % quotefn(f))
429
raise BzrError("cannot add top-level %r" % f)
431
fullpath = os.path.normpath(self.abspath(f))
434
kind = file_kind(fullpath)
436
# maybe something better?
437
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
439
if kind != 'file' and kind != 'directory':
440
raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
443
file_id = gen_file_id(f)
444
inv.add_path(f, kind=kind, file_id=file_id)
447
print 'added', quotefn(f)
449
mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
451
self._write_inventory(inv)
456
def print_file(self, file, revno):
457
"""Print `file` to stdout."""
460
tree = self.revision_tree(self.lookup_revision(revno))
461
# use inventory as it was in that revision
462
file_id = tree.inventory.path2id(file)
464
raise BzrError("%r is not present in revision %d" % (file, revno))
465
tree.print_file(file_id)
470
def remove(self, files, verbose=False):
471
"""Mark nominated files for removal from the inventory.
473
This does not remove their text. This does not run on
475
TODO: Refuse to remove modified files unless --force is given?
477
TODO: Do something useful with directories.
479
TODO: Should this remove the text or not? Tough call; not
480
removing may be useful and the user can just use use rm, and
481
is the opposite of add. Removing it is consistent with most
482
other tools. Maybe an option.
484
from bzrlib.textui import show_status
485
## TODO: Normalize names
486
## TODO: Remove nested loops; better scalability
487
if isinstance(files, basestring):
493
tree = self.working_tree()
496
# do this before any modifications
500
raise BzrError("cannot remove unversioned file %s" % quotefn(f))
501
mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
503
# having remove it, it must be either ignored or unknown
504
if tree.is_ignored(f):
508
show_status(new_status, inv[fid].kind, quotefn(f))
511
self._write_inventory(inv)
516
# FIXME: this doesn't need to be a branch method
517
def set_inventory(self, new_inventory_list):
518
from bzrlib.inventory import Inventory, InventoryEntry
520
for path, file_id, parent, kind in new_inventory_list:
521
name = os.path.basename(path)
524
inv.add(InventoryEntry(file_id, name, kind, parent))
525
self._write_inventory(inv)
529
"""Return all unknown files.
531
These are files in the working directory that are not versioned or
532
control files or ignored.
534
>>> b = ScratchBranch(files=['foo', 'foo~'])
535
>>> list(b.unknowns())
538
>>> list(b.unknowns())
541
>>> list(b.unknowns())
544
return self.working_tree().unknowns()
547
def append_revision(self, revision_id):
548
from bzrlib.atomicfile import AtomicFile
550
mutter("add {%s} to revision-history" % revision_id)
551
rev_history = self.revision_history() + [revision_id]
553
f = AtomicFile(self.controlfilename('revision-history'))
555
for rev_id in rev_history:
562
def get_revision(self, revision_id):
563
"""Return the Revision object for a named revision"""
564
from bzrlib.revision import Revision
565
from bzrlib.xml import unpack_xml
569
if not revision_id or not isinstance(revision_id, basestring):
570
raise ValueError('invalid revision-id: %r' % revision_id)
571
r = unpack_xml(Revision, self.revision_store[revision_id])
575
assert r.revision_id == revision_id
579
def get_revision_sha1(self, revision_id):
580
"""Hash the stored value of a revision, and return it."""
581
# In the future, revision entries will be signed. At that
582
# point, it is probably best *not* to include the signature
583
# in the revision hash. Because that lets you re-sign
584
# the revision, (add signatures/remove signatures) and still
585
# have all hash pointers stay consistent.
586
# But for now, just hash the contents.
587
return sha_file(self.revision_store[revision_id])
590
def get_inventory(self, inventory_id):
591
"""Get Inventory object by hash.
593
TODO: Perhaps for this and similar methods, take a revision
594
parameter which can be either an integer revno or a
596
from bzrlib.inventory import Inventory
597
from bzrlib.xml import unpack_xml
599
return unpack_xml(Inventory, self.inventory_store[inventory_id])
602
def get_inventory_sha1(self, inventory_id):
603
"""Return the sha1 hash of the inventory entry
605
return sha_file(self.inventory_store[inventory_id])
608
def get_revision_inventory(self, revision_id):
609
"""Return inventory of a past revision."""
610
if revision_id == None:
611
from bzrlib.inventory import Inventory
614
return self.get_inventory(self.get_revision(revision_id).inventory_id)
617
def revision_history(self):
618
"""Return sequence of revision hashes on to this branch.
620
>>> ScratchBranch().revision_history()
625
return [l.rstrip('\r\n') for l in
626
self.controlfile('revision-history', 'r').readlines()]
631
def common_ancestor(self, other, self_revno=None, other_revno=None):
634
>>> sb = ScratchBranch(files=['foo', 'foo~'])
635
>>> sb.common_ancestor(sb) == (None, None)
637
>>> commit.commit(sb, "Committing first revision", verbose=False)
638
>>> sb.common_ancestor(sb)[0]
640
>>> clone = sb.clone()
641
>>> commit.commit(sb, "Committing second revision", verbose=False)
642
>>> sb.common_ancestor(sb)[0]
644
>>> sb.common_ancestor(clone)[0]
646
>>> commit.commit(clone, "Committing divergent second revision",
648
>>> sb.common_ancestor(clone)[0]
650
>>> sb.common_ancestor(clone) == clone.common_ancestor(sb)
652
>>> sb.common_ancestor(sb) != clone.common_ancestor(clone)
654
>>> clone2 = sb.clone()
655
>>> sb.common_ancestor(clone2)[0]
657
>>> sb.common_ancestor(clone2, self_revno=1)[0]
659
>>> sb.common_ancestor(clone2, other_revno=1)[0]
662
my_history = self.revision_history()
663
other_history = other.revision_history()
664
if self_revno is None:
665
self_revno = len(my_history)
666
if other_revno is None:
667
other_revno = len(other_history)
668
indices = range(min((self_revno, other_revno)))
671
if my_history[r] == other_history[r]:
672
return r+1, my_history[r]
675
def enum_history(self, direction):
676
"""Return (revno, revision_id) for history of branch.
679
'forward' is from earliest to latest
680
'reverse' is from latest to earliest
682
rh = self.revision_history()
683
if direction == 'forward':
688
elif direction == 'reverse':
694
raise ValueError('invalid history direction', direction)
698
"""Return current revision number for this branch.
700
That is equivalent to the number of revisions committed to
703
return len(self.revision_history())
706
def last_patch(self):
707
"""Return last patch hash, or None if no history.
709
ph = self.revision_history()
716
def missing_revisions(self, other, stop_revision=None):
718
If self and other have not diverged, return a list of the revisions
719
present in other, but missing from self.
721
>>> from bzrlib.commit import commit
722
>>> bzrlib.trace.silent = True
723
>>> br1 = ScratchBranch()
724
>>> br2 = ScratchBranch()
725
>>> br1.missing_revisions(br2)
727
>>> commit(br2, "lala!", rev_id="REVISION-ID-1")
728
>>> br1.missing_revisions(br2)
730
>>> br2.missing_revisions(br1)
732
>>> commit(br1, "lala!", rev_id="REVISION-ID-1")
733
>>> br1.missing_revisions(br2)
735
>>> commit(br2, "lala!", rev_id="REVISION-ID-2A")
736
>>> br1.missing_revisions(br2)
738
>>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
739
>>> br1.missing_revisions(br2)
740
Traceback (most recent call last):
741
DivergedBranches: These branches have diverged.
743
self_history = self.revision_history()
744
self_len = len(self_history)
745
other_history = other.revision_history()
746
other_len = len(other_history)
747
common_index = min(self_len, other_len) -1
748
if common_index >= 0 and \
749
self_history[common_index] != other_history[common_index]:
750
raise DivergedBranches(self, other)
752
if stop_revision is None:
753
stop_revision = other_len
754
elif stop_revision > other_len:
755
raise NoSuchRevision(self, stop_revision)
757
return other_history[self_len:stop_revision]
760
def update_revisions(self, other, stop_revision=None):
761
"""Pull in all new revisions from other branch.
763
>>> from bzrlib.commit import commit
764
>>> bzrlib.trace.silent = True
765
>>> br1 = ScratchBranch(files=['foo', 'bar'])
768
>>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
769
>>> br2 = ScratchBranch()
770
>>> br2.update_revisions(br1)
774
>>> br2.revision_history()
776
>>> br2.update_revisions(br1)
780
>>> br1.text_store.total_size() == br2.text_store.total_size()
783
from bzrlib.progress import ProgressBar
787
from sets import Set as set
791
pb.update('comparing histories')
792
revision_ids = self.missing_revisions(other, stop_revision)
794
if hasattr(other.revision_store, "prefetch"):
795
other.revision_store.prefetch(revision_ids)
796
if hasattr(other.inventory_store, "prefetch"):
797
inventory_ids = [other.get_revision(r).inventory_id
798
for r in revision_ids]
799
other.inventory_store.prefetch(inventory_ids)
804
for rev_id in revision_ids:
806
pb.update('fetching revision', i, len(revision_ids))
807
rev = other.get_revision(rev_id)
808
revisions.append(rev)
809
inv = other.get_inventory(str(rev.inventory_id))
810
for key, entry in inv.iter_entries():
811
if entry.text_id is None:
813
if entry.text_id not in self.text_store:
814
needed_texts.add(entry.text_id)
818
count = self.text_store.copy_multi(other.text_store, needed_texts)
819
print "Added %d texts." % count
820
inventory_ids = [ f.inventory_id for f in revisions ]
821
count = self.inventory_store.copy_multi(other.inventory_store,
823
print "Added %d inventories." % count
824
revision_ids = [ f.revision_id for f in revisions]
825
count = self.revision_store.copy_multi(other.revision_store,
827
for revision_id in revision_ids:
828
self.append_revision(revision_id)
829
print "Added %d revisions." % count
832
def commit(self, *args, **kw):
833
from bzrlib.commit import commit
834
commit(self, *args, **kw)
837
def lookup_revision(self, revno):
838
"""Return revision hash for revision number."""
843
# list is 0-based; revisions are 1-based
844
return self.revision_history()[revno-1]
846
raise BzrError("no such revision %s" % revno)
849
def revision_tree(self, revision_id):
850
"""Return Tree for a revision on this branch.
852
`revision_id` may be None for the null revision, in which case
853
an `EmptyTree` is returned."""
854
from bzrlib.tree import EmptyTree, RevisionTree
855
# TODO: refactor this to use an existing revision object
856
# so we don't need to read it in twice.
857
if revision_id == None:
860
inv = self.get_revision_inventory(revision_id)
861
return RevisionTree(self.text_store, inv)
864
def working_tree(self):
865
"""Return a `Tree` for the working copy."""
866
from workingtree import WorkingTree
867
return WorkingTree(self.base, self.read_working_inventory())
870
def basis_tree(self):
871
"""Return `Tree` object for last revision.
873
If there are no revisions yet, return an `EmptyTree`.
875
from bzrlib.tree import EmptyTree, RevisionTree
876
r = self.last_patch()
880
return RevisionTree(self.text_store, self.get_revision_inventory(r))
884
def rename_one(self, from_rel, to_rel):
887
This can change the directory or the filename or both.
891
tree = self.working_tree()
893
if not tree.has_filename(from_rel):
894
raise BzrError("can't rename: old working file %r does not exist" % from_rel)
895
if tree.has_filename(to_rel):
896
raise BzrError("can't rename: new working file %r already exists" % to_rel)
898
file_id = inv.path2id(from_rel)
900
raise BzrError("can't rename: old name %r is not versioned" % from_rel)
902
if inv.path2id(to_rel):
903
raise BzrError("can't rename: new name %r is already versioned" % to_rel)
905
to_dir, to_tail = os.path.split(to_rel)
906
to_dir_id = inv.path2id(to_dir)
907
if to_dir_id == None and to_dir != '':
908
raise BzrError("can't determine destination directory id for %r" % to_dir)
910
mutter("rename_one:")
911
mutter(" file_id {%s}" % file_id)
912
mutter(" from_rel %r" % from_rel)
913
mutter(" to_rel %r" % to_rel)
914
mutter(" to_dir %r" % to_dir)
915
mutter(" to_dir_id {%s}" % to_dir_id)
917
inv.rename(file_id, to_dir_id, to_tail)
919
print "%s => %s" % (from_rel, to_rel)
921
from_abs = self.abspath(from_rel)
922
to_abs = self.abspath(to_rel)
924
os.rename(from_abs, to_abs)
926
raise BzrError("failed to rename %r to %r: %s"
927
% (from_abs, to_abs, e[1]),
928
["rename rolled back"])
930
self._write_inventory(inv)
935
def move(self, from_paths, to_name):
938
to_name must exist as a versioned directory.
940
If to_name exists and is a directory, the files are moved into
941
it, keeping their old names. If it is a directory,
943
Note that to_name is only the last component of the new name;
944
this doesn't change the directory.
948
## TODO: Option to move IDs only
949
assert not isinstance(from_paths, basestring)
950
tree = self.working_tree()
952
to_abs = self.abspath(to_name)
953
if not isdir(to_abs):
954
raise BzrError("destination %r is not a directory" % to_abs)
955
if not tree.has_filename(to_name):
956
raise BzrError("destination %r not in working directory" % to_abs)
957
to_dir_id = inv.path2id(to_name)
958
if to_dir_id == None and to_name != '':
959
raise BzrError("destination %r is not a versioned directory" % to_name)
960
to_dir_ie = inv[to_dir_id]
961
if to_dir_ie.kind not in ('directory', 'root_directory'):
962
raise BzrError("destination %r is not a directory" % to_abs)
964
to_idpath = inv.get_idpath(to_dir_id)
967
if not tree.has_filename(f):
968
raise BzrError("%r does not exist in working tree" % f)
969
f_id = inv.path2id(f)
971
raise BzrError("%r is not versioned" % f)
972
name_tail = splitpath(f)[-1]
973
dest_path = appendpath(to_name, name_tail)
974
if tree.has_filename(dest_path):
975
raise BzrError("destination %r already exists" % dest_path)
976
if f_id in to_idpath:
977
raise BzrError("can't move %r to a subdirectory of itself" % f)
979
# OK, so there's a race here, it's possible that someone will
980
# create a file in this interval and then the rename might be
981
# left half-done. But we should have caught most problems.
984
name_tail = splitpath(f)[-1]
985
dest_path = appendpath(to_name, name_tail)
986
print "%s => %s" % (f, dest_path)
987
inv.rename(inv.path2id(f), to_dir_id, name_tail)
989
os.rename(self.abspath(f), self.abspath(dest_path))
991
raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
992
["rename rolled back"])
994
self._write_inventory(inv)
999
def revert(self, filenames, old_tree=None, backups=True):
1000
"""Restore selected files to the versions from a previous tree.
1003
If true (default) backups are made of files before
1006
from bzrlib.errors import NotVersionedError, BzrError
1007
from bzrlib.atomicfile import AtomicFile
1008
from bzrlib.osutils import backup_file
1010
inv = self.read_working_inventory()
1011
if old_tree is None:
1012
old_tree = self.basis_tree()
1013
old_inv = old_tree.inventory
1016
for fn in filenames:
1017
file_id = inv.path2id(fn)
1019
raise NotVersionedError("not a versioned file", fn)
1020
if not old_inv.has_id(file_id):
1021
raise BzrError("file not present in old tree", fn, file_id)
1022
nids.append((fn, file_id))
1024
# TODO: Rename back if it was previously at a different location
1026
# TODO: If given a directory, restore the entire contents from
1027
# the previous version.
1029
# TODO: Make a backup to a temporary file.
1031
# TODO: If the file previously didn't exist, delete it?
1032
for fn, file_id in nids:
1035
f = AtomicFile(fn, 'wb')
1037
f.write(old_tree.get_file(file_id).read())
1043
def pending_merges(self):
1044
"""Return a list of pending merges.
1046
These are revisions that have been merged into the working
1047
directory but not yet committed.
1049
cfn = self.controlfilename('pending-merges')
1050
if not os.path.exists(cfn):
1053
for l in self.controlfile('pending-merges', 'r').readlines():
1054
p.append(l.rstrip('\n'))
1058
def add_pending_merge(self, revision_id):
1059
from bzrlib.revision import validate_revision_id
1061
validate_revision_id(revision_id)
1063
p = self.pending_merges()
1064
if revision_id in p:
1066
p.append(revision_id)
1067
self.set_pending_merges(p)
1070
def set_pending_merges(self, rev_list):
1071
from bzrlib.atomicfile import AtomicFile
1074
f = AtomicFile(self.controlfilename('pending-merges'))
1086
class ScratchBranch(Branch):
1087
"""Special test class: a branch that cleans up after itself.
1089
>>> b = ScratchBranch()
1097
def __init__(self, files=[], dirs=[], base=None):
1098
"""Make a test branch.
1100
This creates a temporary directory and runs init-tree in it.
1102
If any files are listed, they are created in the working copy.
1104
from tempfile import mkdtemp
1109
Branch.__init__(self, base, init=init)
1111
os.mkdir(self.abspath(d))
1114
file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1119
>>> orig = ScratchBranch(files=["file1", "file2"])
1120
>>> clone = orig.clone()
1121
>>> os.path.samefile(orig.base, clone.base)
1123
>>> os.path.isfile(os.path.join(clone.base, "file1"))
1126
from shutil import copytree
1127
from tempfile import mkdtemp
1130
copytree(self.base, base, symlinks=True)
1131
return ScratchBranch(base=base)
1137
"""Destroy the test branch, removing the scratch directory."""
1138
from shutil import rmtree
1141
mutter("delete ScratchBranch %s" % self.base)
1144
# Work around for shutil.rmtree failing on Windows when
1145
# readonly files are encountered
1146
mutter("hit exception in destroying ScratchBranch: %s" % e)
1147
for root, dirs, files in os.walk(self.base, topdown=False):
1149
os.chmod(os.path.join(root, name), 0700)
1155
######################################################################
1159
def is_control_file(filename):
1160
## FIXME: better check
1161
filename = os.path.normpath(filename)
1162
while filename != '':
1163
head, tail = os.path.split(filename)
1164
## mutter('check %r for control file' % ((head, tail), ))
1165
if tail == bzrlib.BZRDIR:
1167
if filename == head:
1174
def gen_file_id(name):
1175
"""Return new file id.
1177
This should probably generate proper UUIDs, but for the moment we
1178
cope with just randomness because running uuidgen every time is
1181
from binascii import hexlify
1182
from time import time
1184
# get last component
1185
idx = name.rfind('/')
1187
name = name[idx+1 : ]
1188
idx = name.rfind('\\')
1190
name = name[idx+1 : ]
1192
# make it not a hidden file
1193
name = name.lstrip('.')
1195
# remove any wierd characters; we don't escape them but rather
1196
# just pull them out
1197
name = re.sub(r'[^\w.]', '', name)
1199
s = hexlify(rand_bytes(8))
1200
return '-'.join((name, compact_date(time()), s))
added
removed
bzrlib/branch.py
