dulwich disable empty commit

[QGB]

how to?

[jelmer]

Please post questions on stackoverflow rather than here on GitHub.

Do you mean "pointless" commits, i.e. commits without changes?

One way in which you could check for empty commits is to create a tree first, check whether that's different from the current tree and fail otherwise::

 index = r.open_index()
 new_tree = index.commit_tree(r.object_store)
 if new_tree != r[r.head()].tree:
      r.commit("Some message", tree=new_tree)
 else:
       print("Empty commit!")

[QGB]

sorry @jelmer

C:/qgb\qgb\git.py in commit(repo, commit_msg)
     91
     92         index = repo.open_index()
---> 93         new_tree = index.commit_tree(repo.object_store)
     94         if new_tree != repo[repo.head()].tree:
     95                 bhash=repo.commit(commit_msg, tree=new_tree)

AttributeError: 'Index' object has no attribute 'commit_tree'

In [199]: dulwich.__version__
Out[199]: (0, 19, 15)

[QGB]

did you mean: tree = index.commit(repo.object_store) ?

[jelmer]

On Thu, Jan 30, 2020 at 05:46:17PM -0800, Too large to fit in the margin wrote: did you mean: tree = index.commit(self.object_store) ?

Yep.

…

-- Jelmer Vernooij <jelmer@jelmer.uk> PGP Key: https://www.jelmer.uk/D729A457.asc

[luckydonald]

In case of already using dulwich_tree, subclassing with this overwritten function includes that check:

If allow_empty_commits is False (default), it will check for the tree to be changed, and not commit in that case.

from dulwich_tree import TreeWriter


class TreeWriterNoEmptyCommits(TreeWriter):
    """
    Allows to not commit empty commits
    https://github.com/dulwich/dulwich/issues/740
    """
    def do_commit(self, allow_empty_commits=False, **kwargs):
        self.add_changed_to_object_store()
        tree: bytes = self.tree.id
        if not allow_empty_commits:
            index = self.repo.open_index()
            index.commit(self.repo.object_store)
            head_tree = self.repo[self.ref].tree
            if tree == head_tree:
                # unchanged => no file changes
                self.reset()
                return None
            # end if
        # end if
        ret = self.repo.do_commit(tree=tree, ref=self.ref, **kwargs)
        self.reset()
        return ret
    # end def
# end class

Usage example:

writer = TreeWriterNoEmptyCommits(repo)

file_content = b'file b'

writer.set_data('a/b', file_content)
commit_hash = writer.do_commit(message=b'Add a/b.')
assert commit_hash is not None

writer.set_data('a/b', file_content)
commit_hash = writer.do_commit(message=b'Unchanged a/b, this will not will be commited')
assert commit_hash is None

writer.set_data('a/b', file_content)
commit_hash = writer.do_commit(message=b'Unchanged a/b, but will be commited and be empty', allow_empty_commits=True)
assert commit_hash is not None