/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

Merge bzr.dev into brisbane-core and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
60
60
    debug,
61
61
    errors,
62
62
    revision,
 
63
    trace,
63
64
    tree,
64
65
    )
65
66
from bzrlib.branch import Branch
382
383
                # Add revision data to the local branch
383
384
                self.rev_id = self.builder.commit(self.message)
384
385
 
385
 
            except:
 
386
            except Exception, e:
 
387
                mutter("aborting commit write group because of exception:")
 
388
                trace.log_exception_quietly()
 
389
                note("aborting commit write group: %r" % (e,))
386
390
                self.builder.abort()
387
391
                raise
388
392
 
700
704
        # _populate_from_inventory?
701
705
        if (isinstance(self.basis_inv, Inventory)
702
706
            and isinstance(self.builder.new_inventory, Inventory)):
703
 
            # Performance with commit was profiled extensively, and it found that
704
 
            # using the keys (rather than eg building a set from the dict, or
705
 
            # from the key iterator) of the Inventory._byid was faster at the
706
 
            # time. We want to move away from doing this, but until careful
707
 
            # profiling is done, we're preserving the old behaviour.
708
 
            # <lifeless, poolie>
 
707
            # the older Inventory classes provide a _byid dict, and building a
 
708
            # set from the keys of this dict is substantially faster than even
 
709
            # getting a set of ids from the inventory
 
710
            #
 
711
            # <lifeless> set(dict) is roughly the same speed as
 
712
            # set(iter(dict)) and both are significantly slower than
 
713
            # set(dict.keys())
709
714
            deleted_ids = set(self.basis_inv._byid.keys()) - \
710
715
               set(self.builder.new_inventory._byid.keys())
711
716
        else: