14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
# TODO: Don't allow WorkingTrees to be constructed for remote branches.
17
"""WorkingTree object and friends.
19
A WorkingTree represents the editable working copy of a branch.
20
Operations which represent the WorkingTree are also done here,
21
such as renaming or adding files. The WorkingTree has an inventory
22
which is updated by these operations. A commit produces a
23
new revision based on the workingtree and its inventory.
25
At the moment every WorkingTree has its own branch. Remote
26
WorkingTrees aren't supported.
28
To get a WorkingTree, call Branch.working_tree():
32
# TODO: Don't allow WorkingTrees to be constructed for remote branches if
19
35
# FIXME: I don't know if writing out the cache from the destructor is really a
20
# good idea, because destructors are considered poor taste in Python, and
21
# it's not predictable when it will be written out.
36
# good idea, because destructors are considered poor taste in Python, and it's
37
# not predictable when it will be written out.
39
# TODO: Give the workingtree sole responsibility for the working inventory;
40
# remove the variable and references to it from the branch. This may require
41
# updating the commit code so as to update the inventory within the working
42
# copy, and making sure there's only one WorkingTree for any directory on disk.
43
# At the momenthey may alias the inventory and have old copies of it in memory.
49
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock, quotefn
28
from bzrlib.osutils import appendpath, file_kind, isdir, splitpath
29
from bzrlib.errors import BzrCheckError
51
from bzrlib.osutils import (appendpath,
57
from bzrlib.errors import BzrCheckError, DivergedBranches, NotVersionedError
30
58
from bzrlib.trace import mutter
32
62
class TreeEntry(object):
33
63
"""An entry that implements the minium interface used by commands.
93
123
It is possible for a `WorkingTree` to have a filename which is
94
124
not listed in the Inventory and vice versa.
96
def __init__(self, basedir, inv):
127
def __init__(self, basedir, branch=None):
128
"""Construct a WorkingTree for basedir.
130
If the branch is not supplied, it is opened automatically.
131
If the branch is supplied, it must be the branch for this basedir.
132
(branch.base is not cross checked, because for remote branches that
133
would be meaningless).
97
135
from bzrlib.hashcache import HashCache
98
136
from bzrlib.trace import note, mutter
100
self._inventory = inv
137
assert isinstance(basedir, basestring), \
138
"base directory %r is not a string" % basedir
140
branch = Branch.open(basedir)
141
assert isinstance(branch, Branch), \
142
"branch %r is not a Branch" % branch
101
144
self.basedir = basedir
102
self.path2id = inv.path2id
145
self._inventory = self.read_working_inventory()
146
self.path2id = self._inventory.path2id
104
148
# update the whole cache up front and write to disk if anything changed;
105
149
# in the future we might want to do this more selectively
150
# two possible ways offer themselves : in self._unlock, write the cache
151
# if needed, or, when the cache sees a change, append it to the hash
152
# cache file, and have the parser take the most recent entry for a
106
154
hc = self._hashcache = HashCache(basedir)
147
193
def get_file_byname(self, filename):
148
194
return file(self.abspath(filename), 'rb')
196
def get_root_id(self):
197
"""Return the id of this trees root"""
198
inv = self.read_working_inventory()
199
return inv.root.file_id
150
201
def _get_store_filename(self, file_id):
151
202
## XXX: badly named; this isn't in the store at all
152
203
return self.abspath(self.id2path(file_id))
206
def commit(self, *args, **kw):
207
from bzrlib.commit import Commit
208
Commit().commit(self.branch, *args, **kw)
209
self._inventory = self.read_working_inventory()
155
211
def id2abspath(self, file_id):
156
212
return self.abspath(self.id2path(file_id))
184
244
mode = os.lstat(self.abspath(path)).st_mode
185
245
return bool(stat.S_ISREG(mode) and stat.S_IEXEC&mode)
248
def add_pending_merge(self, *revision_ids):
249
# TODO: Perhaps should check at this point that the
250
# history of the revision is actually present?
251
p = self.pending_merges()
253
for rev_id in revision_ids:
259
self.set_pending_merges(p)
261
def pending_merges(self):
262
"""Return a list of pending merges.
264
These are revisions that have been merged into the working
265
directory but not yet committed.
267
cfn = self.branch._rel_controlfilename('pending-merges')
268
if not self.branch._transport.has(cfn):
271
for l in self.branch.controlfile('pending-merges', 'r').readlines():
272
p.append(l.rstrip('\n'))
276
def set_pending_merges(self, rev_list):
277
self.branch.put_controlfile('pending-merges', '\n'.join(rev_list))
187
279
def get_symlink_target(self, file_id):
188
return os.readlink(self.id2path(file_id))
280
return os.readlink(self.id2abspath(file_id))
190
282
def file_class(self, filename):
191
283
if self.path2id(filename):
275
367
if not self.is_ignored(subp):
370
def iter_conflicts(self):
372
for path in (s[0] for s in self.list_files()):
373
stem = get_conflicted_stem(path)
376
if stem not in conflicted:
381
def pull(self, source, overwrite=False):
382
from bzrlib.merge import merge_inner
385
old_revision_history = self.branch.revision_history()
386
self.branch.pull(source, overwrite)
387
new_revision_history = self.branch.revision_history()
388
if new_revision_history != old_revision_history:
389
if len(old_revision_history):
390
other_revision = old_revision_history[-1]
392
other_revision = None
393
merge_inner(self.branch,
394
self.branch.basis_tree(),
395
self.branch.revision_tree(other_revision))
279
399
def extras(self):
280
400
"""Yield all unknown files in this WorkingTree.
490
def kind(self, file_id):
491
return file_kind(self.id2abspath(file_id))
494
"""See Branch.lock_read, and WorkingTree.unlock."""
495
return self.branch.lock_read()
497
def lock_write(self):
498
"""See Branch.lock_write, and WorkingTree.unlock."""
499
return self.branch.lock_write()
502
def read_working_inventory(self):
503
"""Read the working inventory."""
504
# ElementTree does its own conversion from UTF-8, so open in
506
f = self.branch.controlfile('inventory', 'rb')
507
return bzrlib.xml5.serializer_v5.read_inventory(f)
510
def remove(self, files, verbose=False):
511
"""Remove nominated files from the working inventory..
513
This does not remove their text. This does not run on XXX on what? RBC
515
TODO: Refuse to remove modified files unless --force is given?
517
TODO: Do something useful with directories.
519
TODO: Should this remove the text or not? Tough call; not
520
removing may be useful and the user can just use use rm, and
521
is the opposite of add. Removing it is consistent with most
522
other tools. Maybe an option.
524
## TODO: Normalize names
525
## TODO: Remove nested loops; better scalability
526
if isinstance(files, basestring):
531
# do this before any modifications
535
# TODO: Perhaps make this just a warning, and continue?
536
# This tends to happen when
537
raise NotVersionedError(path=f)
538
mutter("remove inventory entry %s {%s}", quotefn(f), fid)
540
# having remove it, it must be either ignored or unknown
541
if self.is_ignored(f):
545
show_status(new_status, inv[fid].kind, quotefn(f))
548
self._write_inventory(inv)
551
def revert(self, filenames, old_tree=None, backups=True):
552
from bzrlib.merge import merge_inner
554
old_tree = self.branch.basis_tree()
555
merge_inner(self.branch, old_tree,
556
self, ignore_zero=True,
557
backup_files=backups,
558
interesting_files=filenames)
559
if not len(filenames):
560
self.set_pending_merges([])
563
def set_inventory(self, new_inventory_list):
564
from bzrlib.inventory import (Inventory,
569
inv = Inventory(self.get_root_id())
570
for path, file_id, parent, kind in new_inventory_list:
571
name = os.path.basename(path)
574
# fixme, there should be a factory function inv,add_??
575
if kind == 'directory':
576
inv.add(InventoryDirectory(file_id, name, parent))
578
inv.add(InventoryFile(file_id, name, parent))
579
elif kind == 'symlink':
580
inv.add(InventoryLink(file_id, name, parent))
582
raise BzrError("unknown kind %r" % kind)
583
self._write_inventory(inv)
586
def set_root_id(self, file_id):
587
"""Set the root id for this tree."""
588
inv = self.read_working_inventory()
589
orig_root_id = inv.root.file_id
590
del inv._byid[inv.root.file_id]
591
inv.root.file_id = file_id
592
inv._byid[inv.root.file_id] = inv.root
595
if entry.parent_id in (None, orig_root_id):
596
entry.parent_id = inv.root.file_id
597
self._write_inventory(inv)
600
"""See Branch.unlock.
602
WorkingTree locking just uses the Branch locking facilities.
603
This is current because all working trees have an embedded branch
604
within them. IF in the future, we were to make branch data shareable
605
between multiple working trees, i.e. via shared storage, then we
606
would probably want to lock both the local tree, and the branch.
608
return self.branch.unlock()
611
def _write_inventory(self, inv):
612
"""Write inventory as the current inventory."""
613
from cStringIO import StringIO
614
from bzrlib.atomicfile import AtomicFile
616
bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
618
f = AtomicFile(self.branch.controlfilename('inventory'))
624
mutter('wrote working inventory')
627
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
628
def get_conflicted_stem(path):
629
for suffix in CONFLICT_SUFFIXES:
630
if path.endswith(suffix):
631
return path[:-len(suffix)]
added
removed
bzrlib/workingtree.py
