Mercurial > evolve
changeset 1346:9a1415f8b21b
inhbit: don't crash on commit with no changes
Before this patch inhibit would crash when running hg amend with no changes.
This patch fixes this case and adds a test to prevent regression.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Wed, 20 May 2015 10:58:32 -0700 |
| parents | 37c505975e28 |
| children | b00c2fe51ac8 |
| files | hgext/inhibit.py tests/test-inhibit.t |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/inhibit.py Wed May 20 13:32:32 2015 -0700 +++ b/hgext/inhibit.py Wed May 20 10:58:32 2015 -0700 @@ -43,7 +43,8 @@ def commit(self, *args, **kwargs): newnode = super(obsinhibitedrepo, self).commit(*args, **kwargs) - _inhibitmarkers(repo, [newnode]) + if newnode is not None: + _inhibitmarkers(repo, [newnode]) return newnode repo.__class__ = obsinhibitedrepo
--- a/tests/test-inhibit.t Wed May 20 13:32:32 2015 -0700 +++ b/tests/test-inhibit.t Wed May 20 10:58:32 2015 -0700 @@ -676,15 +676,22 @@ | o 0:54ccbc537fc2 add cA + $ cat >> $HGRCPATH <<EOF + > [extensions] + > EOF + $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext/inhibit.py" >> $HGRCPATH + +Empty commit + $ hg amend + nothing changed + [1] Inhibit should not work without directaccess $ cat >> $HGRCPATH <<EOF > [extensions] > directaccess=! > EOF - $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext/inhibit.py" >> $HGRCPATH - $ hg up 15 abort: Cannot use inhibit without the direct access extension [255] - +