~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_dirstate_helpers_c.pyx

  • Committer: Benjamin Peterson
  • Date: 2008-10-04 17:01:00 UTC
  • mto: This revision was merged to the branch mainline in revision 3764.
  • Revision ID: benjamin.peterson@usfamily.net-20081004170100-9i3x7031mynre400
fix two small oversights

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
import errno
25
25
import os
26
26
import stat
 
27
import sys
27
28
 
28
29
from bzrlib import cache_utf8, errors, osutils
29
30
from bzrlib.dirstate import DirState
1070
1071
        target_minikind = _minikind_from_string(target_details[0])
1071
1072
        if path_info is not None and _versioned_minikind(target_minikind):
1072
1073
            if self.target_index != 0:
1073
 
                raise AssertionError("Unsupported target index %d" % target_index)
 
1074
                raise AssertionError("Unsupported target index %d" %
 
1075
                                     self.target_index)
1074
1076
            link_or_sha1 = _update_entry(self.state, entry, path_info[4], path_info[3])
1075
1077
            # The entry may have been modified by update_entry
1076
1078
            target_details = details_list[self.target_index]