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

  • Committer: abentley
  • Date: 2005-10-14 04:53:26 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@lappy-20051014045326-97313b563161422e
Got even closer to standard Tree interface

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
944
944
                except OSError, e:
945
945
                    if e.errno != errno.ENOENT:
946
946
                        raise
947
 
                    if conflict_handler.missing_for_rename(src_path) == "skip":
 
947
                    if conflict_handler.missing_for_rename(src_path, to_name) \
 
948
                        == "skip":
948
949
                        continue
949
950
 
950
951
    return temp_name
1071
1072
 
1072
1073
 
1073
1074
class MissingForRename(Exception):
1074
 
    def __init__(self, filename):
1075
 
        msg = "Attempt to move missing path %s" % (filename)
 
1075
    def __init__(self, filename, to_path):
 
1076
        msg = "Attempt to move missing path %s to %s" % (filename, to_path)
1076
1077
        Exception.__init__(self, msg)
1077
1078
        self.filename = filename
1078
1079
 
1148
1149
    def missing_for_rm(self, filename, change):
1149
1150
        raise MissingForRm(filename)
1150
1151
 
1151
 
    def missing_for_rename(self, filename):
1152
 
        raise MissingForRename(filename)
 
1152
    def missing_for_rename(self, filename, to_path):
 
1153
        raise MissingForRename(filename, to_path)
1153
1154
 
1154
1155
    def missing_for_merge(self, file_id, other_path):
1155
1156
        raise MissingForMerge(other_path)
1429
1430
    def get_entry(self, file_id, tree):
1430
1431
        if not tree.has_or_had_id(file_id):
1431
1432
            return None
1432
 
        return tree.tree.inventory[file_id]
 
1433
        return tree.inventory[file_id]
1433
1434
 
1434
1435
    def get_entry_parent(self, entry):
1435
1436
        if entry is None: