/brz/remove-bazaar

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/workingtree.py

merge robert, debugging

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
620
620
            mode = os.lstat(self.abspath(path)).st_mode
621
621
            return bool(stat.S_ISREG(mode) and stat.S_IEXEC & mode)
622
622
 
623
 
    @needs_write_lock
 
623
    @needs_tree_write_lock
624
624
    def _add(self, files, ids, kinds):
625
625
        """See MutableTree._add."""
626
626
        # TODO: Re-adding a file that is removed in the working copy
2706
2706
# formats which have no format string are not discoverable
2707
2707
# and not independently creatable, so are not registered.
2708
2708
__default_format = WorkingTreeFormat3()
 
2709
## __default_format = WorkingTreeFormat4()
2709
2710
WorkingTreeFormat.register_format(__default_format)
2710
2711
WorkingTreeFormat.register_format(WorkingTreeFormat4())
2711
2712
WorkingTreeFormat.register_format(WorkingTreeFormatAB1())
 
2713
## WorkingTreeFormat.register_format(WorkingTreeFormat3())
2712
2714
WorkingTreeFormat.set_default_format(__default_format)
2713
2715
# formats which have no format string are not discoverable
2714
2716
# and not independently creatable, so are not registered.