/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: Marius Kruger
  • Date: 2007-01-11 12:44:17 UTC
  • mto: This revision was merged to the branch mainline in revision 2241.
  • Revision ID: amanic@gmail.com-20070111124417-34qobd08gvz0vo0n
* change error message telling user about --after option sightly
* change long line to rather use temp variable
* change expected version this will be introduced to 0.15
* remove comma again
* remove comment which we don't understand

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
256
256
        # if needed, or, when the cache sees a change, append it to the hash
257
257
        # cache file, and have the parser take the most recent entry for a
258
258
        # given path only.
259
 
        cache_filename = self.bzrdir.get_workingtree_transport(None) \
260
 
            .local_abspath('stat-cache')
 
259
        wt_trans = self.bzrdir.get_workingtree_transport(None)
 
260
        cache_filename = wt_trans.local_abspath('stat-cache')
261
261
        self._hashcache = hashcache.HashCache(basedir, cache_filename,
262
262
                                              self._control_files._file_mode)
263
263
        hc = self._hashcache
1000
1000
        The first mode moves the file in the filesystem and updates the 
1001
1001
        inventory. The second mode only updates the inventory without 
1002
1002
        touching the file on the filesystem. This is the new mode introduced 
1003
 
        in version 0.13.
 
1003
        in version 0.15.
1004
1004
        
1005
1005
        move uses the second mode if 'after == True' and the target is not
1006
1006
        versioned but present in the working tree.
1016
1016
        Everything else results in an error.
1017
1017
 
1018
1018
        This returns a list of (from_path, to_path) pairs for each
1019
 
        entry, that is moved.
 
1019
        entry that is moved.
1020
1020
        """
1021
1021
        rename_entries = []
1022
1022
        rename_tuples = []
1074
1074
        # determine which move mode to use. checks also for movability
1075
1075
        rename_entries = self._determine_mv_mode(rename_entries, after)
1076
1076
 
1077
 
        # move pairs.
1078
1077
        original_modified = self._inventory_is_modified
1079
1078
        try:
1080
 
            if len(from_paths): 
 
1079
            if len(from_paths):
1081
1080
                self._inventory_is_modified = True
1082
1081
            self._move(rename_entries)
1083
1082
        except:
1133
1132
                else:
1134
1133
                    raise errors.BzrRenameFailedError(from_rel,to_rel,
1135
1134
                        errors.FilesExist(paths=(str(from_rel), str(to_rel)),
1136
 
                        extra="(Use option '--after' to force rename)"))
 
1135
                        extra="(Use --after to update the Bazaar id)"))
1137
1136
            rename_entry.only_change_inv = only_change_inv                       
1138
1137
        return rename_entries
1139
1138