← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: INADA Naoki
  • Date: 2011-05-17 00:45:09 UTC
  • mfrom: (5875 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5891.
  • Revision ID: songofacandy@gmail.com-20110517004509-q58negjbdjh7t6u1
merge from lp:bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
52
52
from bzrlib import (
53
53
    debug,
54
54
    errors,
 
55
    revision,
55
56
    trace,
56
57
    tree,
57
58
    ui,
442
443
        except Exception, e:
443
444
            mutter("aborting commit write group because of exception:")
444
445
            trace.log_exception_quietly()
 
446
            note("aborting commit write group: %r" % (e,))
445
447
            self.builder.abort()
446
448
            raise
447
449
 
723
725
        if self.specific_files or self.exclude:
724
726
            specific_files = self.specific_files or []
725
727
            for path, old_ie in self.basis_inv.iter_entries():
726
 
                if self.builder.new_inventory.has_id(old_ie.file_id):
 
728
                if old_ie.file_id in self.builder.new_inventory:
727
729
                    # already added - skip.
728
730
                    continue
729
731
                if (is_inside_any(specific_files, path)