← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2006-06-13 12:55:45 UTC
  • mfrom: (1757.2.16 add)
  • mto: This revision was merged to the branch mainline in revision 1769.
  • Revision ID: robertc@robertcollins.net-20060613125545-cc77adde61a471bf
Merge add performance improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1444
1444
            try:
1445
1445
                if file_kind(self.abspath(conflicted)) != "file":
1446
1446
                    text = False
1447
 
            except OSError, e:
1448
 
                if e.errno == errno.ENOENT:
1449
 
                    text = False
1450
 
                else:
1451
 
                    raise
 
1447
            except errors.NoSuchFile:
 
1448
                text = False
1452
1449
            if text is True:
1453
1450
                for suffix in ('.THIS', '.OTHER'):
1454
1451
                    try:
1455
1452
                        kind = file_kind(self.abspath(conflicted+suffix))
1456
 
                    except OSError, e:
1457
 
                        if e.errno == errno.ENOENT:
 
1453
                        if kind != "file":
1458
1454
                            text = False
1459
 
                            break
1460
 
                        else:
1461
 
                            raise
1462
 
                    if kind != "file":
 
1455
                    except errors.NoSuchFile:
1463
1456
                        text = False
 
1457
                    if text == False:
1464
1458
                        break
1465
1459
            ctype = {True: 'text conflict', False: 'contents conflict'}[text]
1466
1460
            conflicts.append(Conflict.factory(ctype, path=conflicted,