| Submitter | Boris Feld |
|---|---|
| Date | Oct. 6, 2017, 9:22 a.m. |
| Message ID | <d54526c257afa33b7624.1507281749@FB> |
| Download | mbox | patch |
| Permalink | /patch/24594/ |
| State | Accepted |
| Headers | show |
Comments
On Fri, Oct 06, 2017 at 11:22:29AM +0200, Boris Feld wrote: > # HG changeset patch > # User Boris Feld <boris.feld@octobus.net> > # Date 1498786954 -7200 > # Fri Jun 30 03:42:34 2017 +0200 > # Node ID d54526c257afa33b7624f0b94c16822bcbd08df1 > # Parent b0c42fec8dc28dec5408c0ec506359afc64e4915 > # EXP-Topic config.register.gpg > # Available At https://bitbucket.org/octobus/mercurial-devel/ > # hg pull https://bitbucket.org/octobus/mercurial-devel/ -r d54526c257af > configitems: register the 'gpg.key' config Boris gave me a stack of 35 patches like this on IRC, which I think included these. In any case, these appear to be queued. Thanks!
On Wed, 2017-10-11 at 14:16 -0400, Augie Fackler wrote: > On Fri, Oct 06, 2017 at 11:22:29AM +0200, Boris Feld wrote: > > # HG changeset patch > > # User Boris Feld <boris.feld@octobus.net> > > # Date 1498786954 -7200 > > # Fri Jun 30 03:42:34 2017 +0200 > > # Node ID d54526c257afa33b7624f0b94c16822bcbd08df1 > > # Parent b0c42fec8dc28dec5408c0ec506359afc64e4915 > > # EXP-Topic config.register.gpg > > # Available At https://bitbucket.org/octobus/mercurial-devel/ > > # hg pull https://bitbucket.org/octobus/mercurial-deve > > l/ -r d54526c257af > > configitems: register the 'gpg.key' config > > Boris gave me a stack of 35 patches like this on IRC, which I think > included these. In any case, these appear to be queued. Thanks! It shouldn't as it's already public (https://www.mercurial-scm.org/repo /hg/rev/d54526c257af). Could you check if I screwed up somewhere?
Patch
diff -r b0c42fec8dc2 -r d54526c257af hgext/gpg.py --- a/hgext/gpg.py Fri Jun 30 03:42:33 2017 +0200 +++ b/hgext/gpg.py Fri Jun 30 03:42:34 2017 +0200 @@ -36,6 +36,9 @@ configitem('gpg', 'cmd', default='gpg', ) +configitem('gpg', 'key', + default=None, +) class gpg(object): def __init__(self, path, key=None): @@ -101,7 +104,7 @@ gpgpath = ui.config("gpg", "cmd") gpgkey = opts.get('key') if not gpgkey: - gpgkey = ui.config("gpg", "key", None) + gpgkey = ui.config("gpg", "key") return gpg(gpgpath, gpgkey) def sigwalk(repo):