diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py --- a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -732,9 +732,9 @@ def addremove(repo, pats=[], opts={}, dr if repo.ui.verbose or not m.exact(abs): rel = m.rel(abs) if abs in unknownset: - status = _('adding %s\n') % ((pats and rel) or abs) + status = _('adding %s\n') % ((m.anypats() and rel) or abs) else: - status = _('removing %s\n') % ((pats and rel) or abs) + status = _('removing %s\n') % ((m.anypats() and rel) or abs) repo.ui.status(status) renames = _findrenames(repo, m, added + unknown, removed + deleted, diff --git a/tests/test-addremove.t b/tests/test-addremove.t --- a/tests/test-addremove.t +++ b/tests/test-addremove.t @@ -24,6 +24,21 @@ adding foo $ cd .. + $ hg init subdir + $ cd subdir + $ mkdir dir + $ cd dir + $ touch a.py + $ hg addremove 'glob:*.py' + adding a.py + $ hg forget a.py + $ hg addremove -I 'glob:*.py' + adding a.py + $ hg forget a.py + $ hg addremove + adding dir/a.py + $ cd .. + $ hg init sim $ cd sim $ echo a > a