← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

merge merge tweaks from aaron, which includes latest .dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
1003
1003
    descend from this class if they have a better way to handle some or
1004
1004
    all types of conflict.
1005
1005
    """
1006
 
    def __init__(self, dir):
1007
 
        self.dir = dir
1008
 
    
1009
1006
    def missing_parent(self, pathname):
1010
1007
        parent = os.path.dirname(pathname)
1011
1008
        raise Exception("Parent directory missing for %s" % pathname)
1065
1062
    def new_contents_conflict(self, filename, other_contents):
1066
1063
        raise NewContentsConflict(filename)
1067
1064
 
1068
 
    def finalize():
 
1065
    def finalize(self):
1069
1066
        pass
1070
1067
 
1071
1068
def apply_changeset(changeset, inventory, dir, conflict_handler=None, 
1084
1081
    :rtype: Dictionary
1085
1082
    """
1086
1083
    if conflict_handler is None:
1087
 
        conflict_handler = ExceptionConflictHandler(dir)
 
1084
        conflict_handler = ExceptionConflictHandler()
1088
1085
    temp_dir = os.path.join(dir, "bzr-tree-change")
1089
1086
    try:
1090
1087
        os.mkdir(temp_dir)