diff --git a/hgext/releasenotes.py b/hgext/releasenotes.py --- a/hgext/releasenotes.py +++ b/hgext/releasenotes.py @@ -552,7 +552,15 @@ release note after it has been added to the release notes file. """ sections = releasenotessections(ui, repo) - if opts.get('list'): + + listflag = opts.get('list') + + if listflag and opts.get('rev'): + raise error.Abort(_('cannot use both \'--list\' and \'--rev\'')) + if listflag and opts.get('check'): + raise error.Abort(_('cannot use both \'--list\' and \'--check\'')) + + if listflag: return _getadmonitionlist(ui, sections) rev = opts.get('rev') diff --git a/tests/test-releasenotes-formatting.t b/tests/test-releasenotes-formatting.t --- a/tests/test-releasenotes-formatting.t +++ b/tests/test-releasenotes-formatting.t @@ -420,3 +420,17 @@ fix: Bug Fixes perf: Performance Improvements api: API Changes + + $ cd .. + +Raise error on simultaneous usage of flags + + $ hg init relnotes-raise-error + $ cd relnotes-raise-error + $ hg releasenotes -r . -l + abort: cannot use both '--list' and '--rev' + [255] + + $ hg releasenotes -l -c + abort: cannot use both '--list' and '--check' + [255]