← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to baz2bzr

  • Committer: Aaron Bentley
  • Date: 2005-06-01 23:47:50 UTC
  • Revision ID: abentley@bruiser-20050601234750-c91e6e70a1cd3e7e
Updated for new Branch locking

Show diffs side-by-side

added added

removed removed

Lines of Context:
baz2bzr
239
239
            os.rename(old, new)
240
240
            baz_inv, log = apply_revision(revdir, revision)
241
241
            os.rename(new, old)
242
 
            branch.unlock()
243
242
            branch = bzrlib.Branch(revdir)
244
 
        branch.set_inventory(baz_inv)
245
243
        timestamp = email.Utils.mktime_tz(log.date + (0,))
246
244
        rev_id = revision_id(revision)
247
 
        bzrlib.trace.silent = True
 
245
        branch.lock_write()
248
246
        try:
 
247
            branch.set_inventory(baz_inv)
 
248
            bzrlib.trace.silent = True
249
249
            branch.commit(log.summary, verbose=False, committer=log.creator,
250
250
                          timestamp=timestamp, timezone=0, rev_id=rev_id)
251
251
        finally:
252
252
            bzrlib.trace.silent = False   
 
253
            branch.unlock()
253
254
    yield Progress("revisions", len(ancestors), len(ancestors))
254
255
    unlink_unversioned(branch, revdir)
255
256
    os.rename(revdir, output_dir)