diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -1427,8 +1427,10 @@ def commitmemorynode(repo, wctx, editor, extra, user, date, commitmsg): '''Commit the memory changes with parents p1 and p2. Return node of committed revision.''' - # Replicates the empty check in ``repo.commit``. - if wctx.isempty() and not repo.ui.configbool(b'ui', b'allowemptycommit'): + # FIXME: make empty commit check consistent with ``repo.commit`` + if wctx.nofilechanges() and not repo.ui.configbool( + b'ui', b'allowemptycommit' + ): return None # By convention, ``extra['branch']`` (set by extrafn) clobbers diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -2519,7 +2519,7 @@ def isdirty(self, path): return path in self._cache - def isempty(self): + def nofilechanges(self): # We need to discard any keys that are actually clean before the empty # commit check. self._compact()