/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

  • Committer: Martin Pool
  • Date: 2008-05-02 07:31:24 UTC
  • mto: (3408.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 3410.
  • Revision ID: mbp@sourcefrog.net-20080502073124-nxmeqrzkji6u2m76
Remove code deprecated prior to 1.1 and its tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
111
111
        deprecated_method,
112
112
        deprecated_function,
113
113
        DEPRECATED_PARAMETER,
114
 
        zero_eleven,
115
 
        zero_thirteen,
116
114
        )
117
115
 
118
116
 
122
120
ERROR_PATH_NOT_FOUND = 3    # WindowsError errno code, equivalent to ENOENT
123
121
 
124
122
 
125
 
@deprecated_function(zero_thirteen)
126
 
def gen_file_id(name):
127
 
    """Return new file id for the basename 'name'.
128
 
 
129
 
    Use bzrlib.generate_ids.gen_file_id() instead
130
 
    """
131
 
    return generate_ids.gen_file_id(name)
132
 
 
133
 
 
134
 
@deprecated_function(zero_thirteen)
135
 
def gen_root_id():
136
 
    """Return a new tree-root file id.
137
 
 
138
 
    This has been deprecated in favor of bzrlib.generate_ids.gen_root_id()
139
 
    """
140
 
    return generate_ids.gen_root_id()
141
 
 
142
 
 
143
123
class TreeEntry(object):
144
124
    """An entry that implements the minimum interface used by commands.
145
125
 
733
713
        else:
734
714
            return (kind, None, None, None)
735
715
 
736
 
    @deprecated_method(zero_eleven)
737
 
    @needs_read_lock
738
 
    def pending_merges(self):
739
 
        """Return a list of pending merges.
740
 
 
741
 
        These are revisions that have been merged into the working
742
 
        directory but not yet committed.
743
 
 
744
 
        As of 0.11 this is deprecated. Please see WorkingTree.get_parent_ids()
745
 
        instead - which is available on all tree objects.
746
 
        """
747
 
        return self.get_parent_ids()[1:]
748
 
 
749
716
    def _check_parents_for_ghosts(self, revision_ids, allow_leftmost_as_ghost):
750
717
        """Common ghost checking functionality from set_parent_*.
751
718
 
2052
2019
        """Set the root id for this tree."""
2053
2020
        # for compatability 
2054
2021
        if file_id is None:
2055
 
            symbol_versioning.warn(symbol_versioning.zero_twelve
2056
 
                % 'WorkingTree.set_root_id with fileid=None',
2057
 
                DeprecationWarning,
2058
 
                stacklevel=3)
2059
 
            file_id = ROOT_ID
2060
 
        else:
2061
 
            file_id = osutils.safe_file_id(file_id)
 
2022
            raise ValueError(
 
2023
                'WorkingTree.set_root_id with fileid=None')
 
2024
        file_id = osutils.safe_file_id(file_id)
2062
2025
        self._set_root_id(file_id)
2063
2026
 
2064
2027
    def _set_root_id(self, file_id):