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

  • Committer: Vincent Ladeuil
  • Date: 2008-05-08 21:22:06 UTC
  • mfrom: (3417 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3418.
  • Revision ID: v.ladeuil+lp@free.fr-20080508212206-kwlteu651izgs5we
merge bzr.dev to fix conflicts in NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
39
39
from bzrlib.progress import DummyProgress, ProgressPhase
40
40
from bzrlib.symbol_versioning import (
41
41
        deprecated_function,
42
 
        zero_fifteen,
43
 
        zero_ninety,
44
42
        )
45
43
from bzrlib.trace import mutter, warning
46
44
from bzrlib import tree
441
439
 
442
440
    def version_file(self, file_id, trans_id):
443
441
        """Schedule a file to become versioned."""
444
 
        assert file_id is not None
 
442
        if file_id is None:
 
443
            raise ValueError()
445
444
        unique_add(self._new_id, trans_id, file_id)
446
445
        unique_add(self._r_new_id, file_id, trans_id)
447
446
 
511
510
        applied.
512
511
        """
513
512
        try:
514
 
            # there is a new id for this file
515
 
            assert self._new_id[trans_id] is not None
516
513
            return self._new_id[trans_id]
517
514
        except KeyError:
518
515
            if trans_id in self._removed_id:
1243
1240
                        file_id = self._tree.get_root_id()
1244
1241
                    else:
1245
1242
                        file_id = self.tree_file_id(trans_id)
1246
 
                    assert file_id is not None
1247
1243
                    # File-id isn't really being deleted, just moved
1248
1244
                    if file_id in self._r_new_id:
1249
1245
                        continue
1770
1766
    new_conflicts = set()
1771
1767
    for c_type, conflict in ((c[0], c) for c in conflicts):
1772
1768
        # Anything but a 'duplicate' would indicate programmer error
1773
 
        assert c_type == 'duplicate', c_type
 
1769
        if c_type != 'duplicate':
 
1770
            raise AssertionError(c_type)
1774
1771
        # Now figure out which is new and which is old
1775
1772
        if tt.new_contents(conflict[1]):
1776
1773
            new_file = conflict[1]
1834
1831
        tt.set_executability(entry.executable, trans_id)
1835
1832
 
1836
1833
 
1837
 
@deprecated_function(zero_fifteen)
1838
 
def find_interesting(working_tree, target_tree, filenames):
1839
 
    """Find the ids corresponding to specified filenames.
1840
 
    
1841
 
    Deprecated: Please use tree1.paths2ids(filenames, [tree2]).
1842
 
    """
1843
 
    working_tree.lock_read()
1844
 
    try:
1845
 
        target_tree.lock_read()
1846
 
        try:
1847
 
            return working_tree.paths2ids(filenames, [target_tree])
1848
 
        finally:
1849
 
            target_tree.unlock()
1850
 
    finally:
1851
 
        working_tree.unlock()
1852
 
 
1853
 
 
1854
 
@deprecated_function(zero_ninety)
1855
 
def change_entry(tt, file_id, working_tree, target_tree, 
1856
 
                 trans_id_file_id, backups, trans_id, by_parent):
1857
 
    """Replace a file_id's contents with those from a target tree."""
1858
 
    if file_id is None and target_tree is None:
1859
 
        # skip the logic altogether in the deprecation test
1860
 
        return
1861
 
    e_trans_id = trans_id_file_id(file_id)
1862
 
    entry = target_tree.inventory[file_id]
1863
 
    has_contents, contents_mod, meta_mod, = _entry_changes(file_id, entry, 
1864
 
                                                           working_tree)
1865
 
    if contents_mod:
1866
 
        mode_id = e_trans_id
1867
 
        if has_contents:
1868
 
            if not backups:
1869
 
                tt.delete_contents(e_trans_id)
1870
 
            else:
1871
 
                parent_trans_id = trans_id_file_id(entry.parent_id)
1872
 
                backup_name = get_backup_name(entry, by_parent,
1873
 
                                              parent_trans_id, tt)
1874
 
                tt.adjust_path(backup_name, parent_trans_id, e_trans_id)
1875
 
                tt.unversion_file(e_trans_id)
1876
 
                e_trans_id = tt.create_path(entry.name, parent_trans_id)
1877
 
                tt.version_file(file_id, e_trans_id)
1878
 
                trans_id[file_id] = e_trans_id
1879
 
        create_by_entry(tt, entry, target_tree, e_trans_id, mode_id=mode_id)
1880
 
        create_entry_executability(tt, entry, e_trans_id)
1881
 
 
1882
 
    elif meta_mod:
1883
 
        tt.set_executability(entry.executable, e_trans_id)
1884
 
    if tt.final_name(e_trans_id) != entry.name:
1885
 
        adjust_path  = True
1886
 
    else:
1887
 
        parent_id = tt.final_parent(e_trans_id)
1888
 
        parent_file_id = tt.final_file_id(parent_id)
1889
 
        if parent_file_id != entry.parent_id:
1890
 
            adjust_path = True
1891
 
        else:
1892
 
            adjust_path = False
1893
 
    if adjust_path:
1894
 
        parent_trans_id = trans_id_file_id(entry.parent_id)
1895
 
        tt.adjust_path(entry.name, parent_trans_id, e_trans_id)
1896
 
 
1897
 
 
1898
1834
def get_backup_name(entry, by_parent, parent_trans_id, tt):
1899
1835
    return _get_backup_name(entry.name, by_parent, parent_trans_id, tt)
1900
1836
 
2048
1984
                    # preserve the execute bit when backing up
2049
1985
                    if keep_content and executable[0] == executable[1]:
2050
1986
                        tt.set_executability(executable[1], trans_id)
2051
 
                else:
2052
 
                    assert kind[1] is None
 
1987
                elif kind[1] is not None:
 
1988
                    raise AssertionError(kind[1])
2053
1989
            if versioned == (False, True):
2054
1990
                tt.version_file(file_id, trans_id)
2055
1991
            if versioned == (True, False):