← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Martin Pool
  • Date: 2008-05-22 05:48:22 UTC
  • mfrom: (3407.2.16 controlfiles)
  • mto: This revision was merged to the branch mainline in revision 3448.
  • Revision ID: mbp@sourcefrog.net-20080522054822-lrq17tx62wbfzj8r
merge further LockableFile deprecations

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1145
1145
        tree.lock_tree_write()
1146
1146
 
1147
1147
        try:
1148
 
            control_files = tree._control_files
1149
1148
            limbodir = urlutils.local_path_from_url(
1150
 
                control_files.controlfilename('limbo'))
 
1149
                tree._transport.abspath('limbo'))
1151
1150
            try:
1152
1151
                os.mkdir(limbodir)
1153
1152
            except OSError, e:
1154
1153
                if e.errno == errno.EEXIST:
1155
1154
                    raise ExistingLimbo(limbodir)
1156
1155
            deletiondir = urlutils.local_path_from_url(
1157
 
                control_files.controlfilename('pending-deletion'))
 
1156
                tree._transport.abspath('pending-deletion'))
1158
1157
            try:
1159
1158
                os.mkdir(deletiondir)
1160
1159
            except OSError, e: