← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2006-04-05 04:54:00 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: aaron.bentley@utoronto.ca-20060405045400-7b57a53ee7fdaab6
Moved and renamed conflict functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
18
18
import errno
19
19
from stat import S_ISREG
20
20
 
 
21
from bzrlib.conflicts import conflicts_to_strings
21
22
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
22
23
                           ReusingTransform, NotVersionedError, CantMoveRoot,
23
24
                           ExistingLimbo, ImmortalLimbo)
1081
1082
            raw_conflicts = resolve_conflicts(tt, child_pb)
1082
1083
        finally:
1083
1084
            child_pb.finished()
1084
 
        for line in conflicts_strings(cook_conflicts(raw_conflicts, tt)):
 
1085
        for line in conflicts_to_strings(cook_conflicts(raw_conflicts, tt)):
1085
1086
            warning(line)
1086
1087
        pp.next_phase()
1087
1088
        tt.apply()
1180
1181
                                   file_id=modified_id, 
1181
1182
                                   conflict_path=conflicting_path,
1182
1183
                                   conflict_file_id=conflicting_id)
1183
 
 
1184
 
 
1185
 
def conflicts_strings(conflicts):
1186
 
    """Generate strings for the provided conflicts"""
1187
 
    for conflict in conflicts:
1188
 
        yield str(conflict)