← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
332
332
            # and now do the commit locally.
333
333
            self.branch.append_revision(self.rev_id)
334
334
 
335
 
            # if the builder gave us the revisiontree it created back, we
336
 
            # could use it straight away here.
337
 
            # TODO: implement this.
338
 
            self.work_tree.set_parent_trees([(self.rev_id,
339
 
                self.branch.repository.revision_tree(self.rev_id))])
 
335
            rev_tree = self.builder.revision_tree()
 
336
            self.work_tree.set_parent_trees([(self.rev_id, rev_tree)])
340
337
            # now the work tree is up to date with the branch
341
338
            
342
339
            self.reporter.completed(self.branch.revno(), self.rev_id)
353
350
            self._cleanup()
354
351
        return self.rev_id
355
352
 
 
353
    def _any_real_changes(self):
 
354
        """Are there real changes between new_inventory and basis?
 
355
 
 
356
        For trees without rich roots, inv.root.revision changes every commit.
 
357
        But if that is the only change, we want to treat it as though there
 
358
        are *no* changes.
 
359
        """
 
360
        new_entries = self.builder.new_inventory.iter_entries()
 
361
        basis_entries = self.basis_inv.iter_entries()
 
362
        new_path, new_root_ie = new_entries.next()
 
363
        basis_path, basis_root_ie = basis_entries.next()
 
364
 
 
365
        # This is a copy of InventoryEntry.__eq__ only leaving out .revision
 
366
        def ie_equal_no_revision(this, other):
 
367
            return ((this.file_id == other.file_id)
 
368
                    and (this.name == other.name)
 
369
                    and (this.symlink_target == other.symlink_target)
 
370
                    and (this.text_sha1 == other.text_sha1)
 
371
                    and (this.text_size == other.text_size)
 
372
                    and (this.text_id == other.text_id)
 
373
                    and (this.parent_id == other.parent_id)
 
374
                    and (this.kind == other.kind)
 
375
                    and (this.executable == other.executable)
 
376
                    )
 
377
        if not ie_equal_no_revision(new_root_ie, basis_root_ie):
 
378
            return True
 
379
 
 
380
        for new_ie, basis_ie in zip(new_entries, basis_entries):
 
381
            if new_ie != basis_ie:
 
382
                return True
 
383
 
 
384
        # No actual changes present
 
385
        return False
 
386
 
356
387
    def _check_pointless(self):
357
388
        if self.allow_pointless:
358
389
            return
359
390
        # A merge with no effect on files
360
391
        if len(self.parents) > 1:
361
392
            return
362
 
        # work around the fact that a newly-initted tree does differ from its
363
 
        # basis
 
393
        # Shortcut, if the number of entries changes, then we obviously have
 
394
        # a change
364
395
        if len(self.builder.new_inventory) != len(self.basis_inv):
365
396
            return
366
 
        if (len(self.builder.new_inventory) != 1 and
367
 
            self.builder.new_inventory != self.basis_inv):
 
397
        # If length == 1, then we only have the root entry. Which means
 
398
        # that there is no real difference (only the root could be different)
 
399
        if (len(self.builder.new_inventory) != 1 and self._any_real_changes()):
368
400
            return
369
401
        raise PointlessCommit()
370
402