Mercurial > hg

changeset 22683:f1872fdc1c3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gpg: use an abort hint and don't mention --force
author Matt Mackall <mpm@selenic.com>
date Thu, 02 Oct 2014 18:50:41 -0500
parents 9c89ac99690e
children 73d7de6f9b47
files hgext/gpg.py
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/gpg.py	Thu Oct 02 18:47:02 2014 -0500
+++ b/hgext/gpg.py	Thu Oct 02 18:50:41 2014 -0500
@@ -256,9 +256,8 @@
     if not opts["force"]:
         msigs = match.exact(repo.root, '', ['.hgsigs'])
         if util.any(repo.status(match=msigs, unknown=True, ignored=True)):
-            raise util.Abort(_("working copy of .hgsigs is changed "
-                               "(please commit .hgsigs manually "
-                               "or use --force)"))
+            raise util.Abort(_("working copy of .hgsigs is changed "),
+                             hint=_("please commit .hgsigs manually"))
 
     sigsfile = repo.wfile(".hgsigs", "ab")
     sigsfile.write(sigmessage)