mercurial-scm/hg: hgext/gpg.py annotate

annotate hgext/gpg.py @ 52644:e627cc25b6f3

pyupgrade: rewrite `yield` statements in a loop to `yield from` This is the `legacy` fixer in `pyupgrade`, with the `yield` statement yielding loop commented back in. This seems to help pytype in some cases, and hurt it in others. But that can be manually fixed later. Note that it's possibly buggy in that it aggressively changed `import-checker.py` to `yield from 'fcntl', 'grp', 'pwd', 'select', 'termios': # Unix only`, which is invalid syntax. Possibly it needed help from the token fixer that I've disabled locally (because that wants to make a bunch of unrelated changes). Just change those few places to yield from a list, to avoid having to constantly revert that.

author	Matt Harbison <matt_harbison@yahoo.com>
date	Sun, 05 Jan 2025 22:26:16 -0500
parents	24ee91ba9aa8
children

rev	line source
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	1 # Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	2 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	3 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9183 diff changeset	4 # GNU General Public License version 2 or any later version.
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	5
8934 9dda4c73fc3b extensions: change descriptions for extensions providing a few commands Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8894 diff changeset	6 '''commands to sign and verify changesets'''
8873 e872ef2e6758 help: add/fix docstrings for a bunch of extensions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8808 diff changeset	7
51859 f4733654f144 typing: add `from __future__ import annotations` to most files Matt Harbison <matt_harbison@yahoo.com> parents: 50875 diff changeset	8 from __future__ import annotations
29124 555ab813c237 py3: make hgext/gpg.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27814 diff changeset	9
555ab813c237 py3: make hgext/gpg.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27814 diff changeset	10 import binascii
555ab813c237 py3: make hgext/gpg.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27814 diff changeset	11 import os
29205 a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29124 diff changeset	12
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29124 diff changeset	13 from mercurial.i18n import _
46113 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	14 from mercurial.node import (
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	15 bin,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	16 hex,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	17 short,
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	18 )
29124 555ab813c237 py3: make hgext/gpg.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27814 diff changeset	19 from mercurial import (
555ab813c237 py3: make hgext/gpg.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27814 diff changeset	20 cmdutil,
555ab813c237 py3: make hgext/gpg.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27814 diff changeset	21 error,
40293 c303d65d2e34 help: assigning categories to existing commands rdamazio@google.com parents: 38164 diff changeset	22 help,
29124 555ab813c237 py3: make hgext/gpg.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27814 diff changeset	23 match,
30925 82f1ef8b4477 py3: convert the mode argument of os.fdopen to unicodes (2 of 2) Pulkit Goyal <7895pulkit@gmail.com> parents: 29841 diff changeset	24 pycompat,
32337 46ba2cdda476 registrar: move cmdutil.command to registrar module (API) Yuya Nishihara <yuya@tcha.org> parents: 31414 diff changeset	25 registrar,
29124 555ab813c237 py3: make hgext/gpg.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 27814 diff changeset	26 )
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	27 from mercurial.utils import (
a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	28 dateutil,
a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	29 procutil,
a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	30 )
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	31
14299 f3ba4125d9e9 gpg: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14168 diff changeset	32 cmdtable = {}
32337 46ba2cdda476 registrar: move cmdutil.command to registrar module (API) Yuya Nishihara <yuya@tcha.org> parents: 31414 diff changeset	33 command = registrar.command(cmdtable)
29841 d5883fd055c6 extensions: change magic "shipped with hg" string Augie Fackler <augie@google.com> parents: 29239 diff changeset	34 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
25186 80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	35 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	36 # be specifying the version(s) of Mercurial they are tested with, or
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	37 # leave the attribute unspecified.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	38 testedwith = b'ships-with-hg-core'
14299 f3ba4125d9e9 gpg: use cmdutil.command decorator Martin Geisler <mg@aragost.com> parents: 14168 diff changeset	39
34501 b0c42fec8dc2 configitems: register the 'gpg.cmd' config Boris Feld <boris.feld@octobus.net> parents: 32375 diff changeset	40 configtable = {}
b0c42fec8dc2 configitems: register the 'gpg.cmd' config Boris Feld <boris.feld@octobus.net> parents: 32375 diff changeset	41 configitem = registrar.configitem(configtable)
b0c42fec8dc2 configitems: register the 'gpg.cmd' config Boris Feld <boris.feld@octobus.net> parents: 32375 diff changeset	42
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	43 configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	44 b'gpg',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	45 b'cmd',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	46 default=b'gpg',
34501 b0c42fec8dc2 configitems: register the 'gpg.cmd' config Boris Feld <boris.feld@octobus.net> parents: 32375 diff changeset	47 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	48 configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	49 b'gpg',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	50 b'key',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	51 default=None,
34502 d54526c257af configitems: register the 'gpg.key' config Boris Feld <boris.feld@octobus.net> parents: 34501 diff changeset	52 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	53 configitem(
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	54 b'gpg',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	55 b'.*',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	56 default=None,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	57 generic=True,
34770 bb05720913d3 configitems: register the 'gpg' arbitraty key section Boris Feld <boris.feld@octobus.net> parents: 34502 diff changeset	58 )
34501 b0c42fec8dc2 configitems: register the 'gpg.cmd' config Boris Feld <boris.feld@octobus.net> parents: 32375 diff changeset	59
40293 c303d65d2e34 help: assigning categories to existing commands rdamazio@google.com parents: 38164 diff changeset	60 # Custom help category
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	61 _HELP_CATEGORY = b'gpg'
42235 ade02721d3fa help: register the 'gpg' command category and give it a description Sietse Brouwer <sbbrouwer@gmail.com> parents: 41676 diff changeset	62 help.CATEGORY_ORDER.insert(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	63 help.CATEGORY_ORDER.index(registrar.command.CATEGORY_HELP), _HELP_CATEGORY
42235 ade02721d3fa help: register the 'gpg' command category and give it a description Sietse Brouwer <sbbrouwer@gmail.com> parents: 41676 diff changeset	64 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	65 help.CATEGORY_NAMES[_HELP_CATEGORY] = b'Signing changes (GPG)'
40293 c303d65d2e34 help: assigning categories to existing commands rdamazio@google.com parents: 38164 diff changeset	66
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	67
48946 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 48875 diff changeset	68 class gpg:
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	69 def __init__(self, path, key=None):
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	70 self.path = path
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	71 self.key = (key and b" --local-user \"%s\"" % key) or b""
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	72
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	73 def sign(self, data):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	74 gpgcmd = b"%s --sign --detach-sign%s" % (self.path, self.key)
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36835 diff changeset	75 return procutil.filter(data, gpgcmd)
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	76
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	77 def verify(self, data, sig):
47062 f38bf44e077f black: make codebase compatible with black v21.4b2 and v20.8b1 Kyle Lippincott <spectral@google.com> parents: 46113 diff changeset	78 """returns of the good and bad signatures"""
2231 9a2f4b2e7cf1 gpg extension: Always remove temporary files created by 'hg sigcheck'. Thomas Arendsen Hein <thomas@intevation.de> parents: 2165 diff changeset	79 sigfile = datafile = None
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	80 try:
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	81 # create temporary files
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	82 fd, sigfile = pycompat.mkstemp(prefix=b"hg-gpg-", suffix=b".sig")
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43346 diff changeset	83 fp = os.fdopen(fd, 'wb')
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	84 fp.write(sig)
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	85 fp.close()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	86 fd, datafile = pycompat.mkstemp(prefix=b"hg-gpg-", suffix=b".txt")
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43346 diff changeset	87 fp = os.fdopen(fd, 'wb')
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	88 fp.write(data)
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	89 fp.close()
43346 6ada8a274b9c formatting: run black version 19.10b0 on the codebase Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	90 gpgcmd = (
6ada8a274b9c formatting: run black version 19.10b0 on the codebase Pierre-Yves David <pierre-yves.david@octobus.net> parents: 43117 diff changeset	91 b"%s --logger-fd 1 --status-fd 1 --verify \"%s\" \"%s\""
45942 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	92 % (
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	93 self.path,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	94 sigfile,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	95 datafile,
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43506 diff changeset	96 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	97 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	98 ret = procutil.filter(b"", gpgcmd)
2231 9a2f4b2e7cf1 gpg extension: Always remove temporary files created by 'hg sigcheck'. Thomas Arendsen Hein <thomas@intevation.de> parents: 2165 diff changeset	99 finally:
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	100 for f in (sigfile, datafile):
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	101 try:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	102 if f:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	103 os.unlink(f)
16688 cfb6682961b8 cleanup: replace naked excepts with more specific ones Brodie Rao <brodie@sf.io> parents: 14299 diff changeset	104 except OSError:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	105 pass
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	106 keys = []
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	107 key, fingerprint = None, None
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	108 for l in ret.splitlines():
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	109 # see DETAILS in the gnupg documentation
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	110 # filter the logger output
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	111 if not l.startswith(b"[GNUPG:]"):
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	112 continue
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	113 l = l[9:]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	114 if l.startswith(b"VALIDSIG"):
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	115 # fingerprint of the primary key
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	116 fingerprint = l.split()[10]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	117 elif l.startswith(b"ERRSIG"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	118 key = l.split(b" ", 3)[:2]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	119 key.append(b"")
19441 8b312c080adb gpg: treat "ERRSIG" as a valid key id but no fingerprint Wei, Elson <elson.wei@gmail.com> parents: 16991 diff changeset	120 fingerprint = None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	121 elif (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	122 l.startswith(b"GOODSIG")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	123 or l.startswith(b"EXPSIG")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	124 or l.startswith(b"EXPKEYSIG")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	125 or l.startswith(b"BADSIG")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	126 ):
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	127 if key is not None:
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	128 keys.append(key + [fingerprint])
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	129 key = l.split(b" ", 2)
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	130 fingerprint = None
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	131 if key is not None:
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	132 keys.append(key + [fingerprint])
19442 33c72f054e16 gpg: getkeys() removes unused returning value "err" Wei, Elson <elson.wei@gmail.com> parents: 19441 diff changeset	133 return keys
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	134
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	135
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	136 def newgpg(ui, **opts):
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	137 """create a new gpg instance"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	138 gpgpath = ui.config(b"gpg", b"cmd")
43506 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43346 diff changeset	139 gpgkey = opts.get('key')
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	140 if not gpgkey:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	141 gpgkey = ui.config(b"gpg", b"key")
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	142 return gpg(gpgpath, gpgkey)
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	143
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	144
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	145 def sigwalk(repo):
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	146 """
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	147 walk over every sigs, yields a couple
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	148 ((node, version, sig), (filename, linenumber))
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	149 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	150
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	151 def parsefile(fileiter, context):
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	152 ln = 1
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	153 for l in fileiter:
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	154 if not l:
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	155 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	156 yield (l.split(b" ", 2), (context, ln))
10394 4612cded5176 fix coding style (reported by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	157 ln += 1
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	158
8210 344751cd8cb8 replace various uses of list.reverse() Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	159 # read the heads
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	160 fl = repo.file(b".hgsigs")
8210 344751cd8cb8 replace various uses of list.reverse() Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	161 for r in reversed(fl.heads()):
46113 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	162 fn = b".hgsigs\|%s" % short(r)
52644 e627cc25b6f3 pyupgrade: rewrite `yield` statements in a loop to `yield from` Matt Harbison <matt_harbison@yahoo.com> parents: 52640 diff changeset	163 yield from parsefile(fl.read(r).splitlines(), fn)
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	164 try:
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	165 # read local signatures
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	166 fn = b"localsigs"
52644 e627cc25b6f3 pyupgrade: rewrite `yield` statements in a loop to `yield from` Matt Harbison <matt_harbison@yahoo.com> parents: 52640 diff changeset	167 yield from parsefile(repo.vfs(fn), fn)
52640 24ee91ba9aa8 pyupgrade: drop usage of py3 aliases for `OSError` Matt Harbison <matt_harbison@yahoo.com> parents: 51859 diff changeset	168 except OSError:
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	169 pass
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	170
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	171
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	172 def getkeys(ui, repo, mygpg, sigdata, context):
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	173 """get the keys who signed a data"""
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	174 fn, ln = context
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	175 node, version, sig = sigdata
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	176 prefix = b"%s:%d" % (fn, ln)
46113 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	177 node = bin(node)
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	178
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	179 data = node2txt(repo, node, version)
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	180 sig = binascii.a2b_base64(sig)
19442 33c72f054e16 gpg: getkeys() removes unused returning value "err" Wei, Elson <elson.wei@gmail.com> parents: 19441 diff changeset	181 keys = mygpg.verify(data, sig)
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	182
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	183 validkeys = []
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	184 # warn for expired key and/or sigs
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	185 for key in keys:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	186 if key[0] == b"ERRSIG":
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	187 ui.write(_(b"%s Unknown key ID \"%s\"\n") % (prefix, key[1]))
19444 f9e04a4e28d0 gpg: show "Unknown key ID xxxxxxxx" when the status is ERRSIG Wei, Elson <elson.wei@gmail.com> parents: 19443 diff changeset	188 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	189 if key[0] == b"BADSIG":
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	190 ui.write(_(b"%s Bad signature from \"%s\"\n") % (prefix, key[2]))
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	191 continue
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	192 if key[0] == b"EXPSIG":
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	193 ui.write(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43077 diff changeset	194 _(b"%s Note: Signature has expired (signed by: \"%s\")\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	195 % (prefix, key[2])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	196 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	197 elif key[0] == b"EXPKEYSIG":
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	198 ui.write(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43077 diff changeset	199 _(b"%s Note: This key has expired (signed by: \"%s\")\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	200 % (prefix, key[2])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	201 )
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	202 validkeys.append((key[1], key[2], key[3]))
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	203 return validkeys
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	204
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	205
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	206 @command(b"sigs", [], _(b'hg sigs'), helpcategory=_HELP_CATEGORY)
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	207 def sigs(ui, repo):
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	208 """list signed changesets"""
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	209 mygpg = newgpg(ui)
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	210 revs = {}
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	211
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	212 for data, context in sigwalk(repo):
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	213 node, version, sig = data
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	214 fn, ln = context
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	215 try:
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	216 n = repo.lookup(node)
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	217 except KeyError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	218 ui.warn(_(b"%s:%d node does not exist\n") % (fn, ln))
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	219 continue
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	220 r = repo.changelog.rev(n)
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	221 keys = getkeys(ui, repo, mygpg, data, context)
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	222 if not keys:
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	223 continue
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	224 revs.setdefault(r, [])
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	225 revs[r].extend(keys)
8303 db52cc4f2f97 gpg: use reverse kwarg to sort sigs in reversed order Martin Geisler <mg@lazybytes.net> parents: 8301 diff changeset	226 for rev in sorted(revs, reverse=True):
1682 ca1cda9220d5 fix an exception in gpg.py with multiples sigs for the same cset Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1681 diff changeset	227 for k in revs[rev]:
46113 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	228 r = b"%5d:%s" % (rev, hex(repo.changelog.node(rev)))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	229 ui.write(b"%-30s %s\n" % (keystr(ui, k), r))
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	230
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	231
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	232 @command(b"sigcheck", [], _(b'hg sigcheck REV'), helpcategory=_HELP_CATEGORY)
27117 ad2627f4af27 gpg: rename sigcheck function timeless <timeless@mozdev.org> parents: 26587 diff changeset	233 def sigcheck(ui, repo, rev):
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	234 """verify all the signatures there may be for a particular revision"""
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	235 mygpg = newgpg(ui)
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	236 rev = repo.lookup(rev)
46113 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	237 hexrev = hex(rev)
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	238 keys = []
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	239
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	240 for data, context in sigwalk(repo):
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	241 node, version, sig = data
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	242 if node == hexrev:
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	243 k = getkeys(ui, repo, mygpg, data, context)
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	244 if k:
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	245 keys.extend(k)
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	246
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	247 if not keys:
46113 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	248 ui.write(_(b"no valid signature for %s\n") % short(rev))
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	249 return
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	250
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	251 # print summary
46113 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	252 ui.write(_(b"%s is signed by:\n") % short(rev))
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	253 for key in keys:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	254 ui.write(b" %s\n" % keystr(ui, key))
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	255
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	256
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	257 def keystr(ui, key):
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	258 """associate a string to a key (username, comment)"""
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	259 keyid, user, fingerprint = key
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	260 comment = ui.config(b"gpg", fingerprint)
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	261 if comment:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	262 return b"%s (%s)" % (user, comment)
1681 98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	263 else:
98eef041f9c7 fixes for gpg.py extension Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1676 diff changeset	264 return user
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	265
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	266
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	267 @command(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	268 b"sign",
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	269 [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	270 (b'l', b'local', None, _(b'make the signature local')),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	271 (b'f', b'force', None, _(b'sign even if the sigfile is modified')),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	272 (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	273 b'',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	274 b'no-commit',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	275 None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	276 _(b'do not commit the sigfile after signing'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	277 ),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	278 (b'k', b'key', b'', _(b'the key id to sign with'), _(b'ID')),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	279 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	280 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	281 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	282 + cmdutil.commitopts2,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	283 _(b'hg sign [OPTION]... [REV]...'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	284 helpcategory=_HELP_CATEGORY,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	285 )
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	286 def sign(ui, repo, revs, *opts):
3916 b1806b211910 Make 'hg sign' behave like other commands: Default to current parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 2875 diff changeset	287 """add a signature for the current or given revision
b1806b211910 Make 'hg sign' behave like other commands: Default to current parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 2875 diff changeset	288
b1806b211910 Make 'hg sign' behave like other commands: Default to current parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 2875 diff changeset	289 If no revision is given, the parent of the working directory is used,
b1806b211910 Make 'hg sign' behave like other commands: Default to current parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 2875 diff changeset	290 or tip if no revision is checked out.
6163 1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6139 diff changeset	291
25791 917be0574d7f gpg: mention undocumented options Matt Mackall <mpm@selenic.com> parents: 25660 diff changeset	292 The ``gpg.cmd`` config setting can be used to specify the command
917be0574d7f gpg: mention undocumented options Matt Mackall <mpm@selenic.com> parents: 25660 diff changeset	293 to run. A default key can be specified with ``gpg.key``.
917be0574d7f gpg: mention undocumented options Matt Mackall <mpm@selenic.com> parents: 25660 diff changeset	294
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 10532 diff changeset	295 See :hg:`help dates` for a list of formats valid for -d/--date.
3916 b1806b211910 Make 'hg sign' behave like other commands: Default to current parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 2875 diff changeset	296 """
27814 a72735028336 with: use context manager for wlock in sign Bryan O'Sullivan <bryano@fb.com> parents: 27196 diff changeset	297 with repo.wlock():
27196 7b4a61570d61 gpg: make sign acquire wlock before processing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27117 diff changeset	298 return _dosign(ui, repo, revs, *opts)
3916 b1806b211910 Make 'hg sign' behave like other commands: Default to current parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 2875 diff changeset	299
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	300
27196 7b4a61570d61 gpg: make sign acquire wlock before processing FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27117 diff changeset	301 def _dosign(ui, repo, revs, *opts):
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	302 mygpg = newgpg(ui, **opts)
50874 b3ac579bde41 gpg: migrate `opts` to native kwargs Matt Harbison <matt_harbison@yahoo.com> parents: 50819 diff changeset	303
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	304 sigver = b"0"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	305 sigmessage = b""
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 5475 diff changeset	306
50874 b3ac579bde41 gpg: migrate `opts` to native kwargs Matt Harbison <matt_harbison@yahoo.com> parents: 50819 diff changeset	307 date = opts.get('date')
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 5475 diff changeset	308 if date:
50874 b3ac579bde41 gpg: migrate `opts` to native kwargs Matt Harbison <matt_harbison@yahoo.com> parents: 50819 diff changeset	309 opts['date'] = dateutil.parsedate(date)
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 5475 diff changeset	310
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	311 if revs:
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	312 nodes = [repo.lookup(n) for n in revs]
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	313 else:
47012 d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46113 diff changeset	314 nodes = [
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46113 diff changeset	315 node for node in repo.dirstate.parents() if node != repo.nullid
d55b71393907 node: replace nullid and friends with nodeconstants class Joerg Sonnenberger <joerg@bec.de> parents: 46113 diff changeset	316 ]
3916 b1806b211910 Make 'hg sign' behave like other commands: Default to current parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 2875 diff changeset	317 if len(nodes) > 1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	318 raise error.Abort(
43117 8ff1ecfadcd1 cleanup: join string literals that are already on one line Martin von Zweigbergk <martinvonz@google.com> parents: 43077 diff changeset	319 _(b'uncommitted merge - please provide a specific revision')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	320 )
3916 b1806b211910 Make 'hg sign' behave like other commands: Default to current parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 2875 diff changeset	321 if not nodes:
b1806b211910 Make 'hg sign' behave like other commands: Default to current parent. Thomas Arendsen Hein <thomas@intevation.de> parents: 2875 diff changeset	322 nodes = [repo.changelog.tip()]
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	323
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	324 for n in nodes:
46113 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	325 hexnode = hex(n)
59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	326 ui.write(_(b"signing %d:%s\n") % (repo.changelog.rev(n), short(n)))
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	327 # build data
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	328 data = node2txt(repo, n, sigver)
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	329 sig = mygpg.sign(data)
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	330 if not sig:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	331 raise error.Abort(_(b"error while signing"))
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	332 sig = binascii.b2a_base64(sig)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	333 sig = sig.replace(b"\n", b"")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	334 sigmessage += b"%s %s %s\n" % (hexnode, sigver, sig)
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	335
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	336 # write it
50874 b3ac579bde41 gpg: migrate `opts` to native kwargs Matt Harbison <matt_harbison@yahoo.com> parents: 50819 diff changeset	337 if opts['local']:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	338 repo.vfs.append(b"localsigs", sigmessage)
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	339 return
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	340
50819 181936ad069a gpg: fix an UnboundLocalError whenever using --force Matt Harbison <matt_harbison@yahoo.com> parents: 50037 diff changeset	341 msigs = match.exact([b'.hgsigs'])
181936ad069a gpg: fix an UnboundLocalError whenever using --force Matt Harbison <matt_harbison@yahoo.com> parents: 50037 diff changeset	342
50874 b3ac579bde41 gpg: migrate `opts` to native kwargs Matt Harbison <matt_harbison@yahoo.com> parents: 50819 diff changeset	343 if not opts["force"]:
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 23877 diff changeset	344 if any(repo.status(match=msigs, unknown=True, ignored=True)):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	345 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	346 _(b"working copy of .hgsigs is changed "),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	347 hint=_(b"please commit .hgsigs manually"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	348 )
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	349
50875 bbaac3a222bb gpg: use a context manager to write `.hgsigs` Matt Harbison <matt_harbison@yahoo.com> parents: 50874 diff changeset	350 with repo.wvfs(b".hgsigs", b"ab") as sigsfile:
bbaac3a222bb gpg: use a context manager to write `.hgsigs` Matt Harbison <matt_harbison@yahoo.com> parents: 50874 diff changeset	351 sigsfile.write(sigmessage)
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	352
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	353 if b'.hgsigs' not in repo.dirstate:
50037 46883d91e2b0 dirstate: use `dirstate.change_files` to scope the change in `gpg` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48946 diff changeset	354 with repo.dirstate.changing_files(repo):
46883d91e2b0 dirstate: use `dirstate.change_files` to scope the change in `gpg` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48946 diff changeset	355 repo[None].add([b".hgsigs"])
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	356
50874 b3ac579bde41 gpg: migrate `opts` to native kwargs Matt Harbison <matt_harbison@yahoo.com> parents: 50819 diff changeset	357 if opts["no_commit"]:
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	358 return
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	359
50874 b3ac579bde41 gpg: migrate `opts` to native kwargs Matt Harbison <matt_harbison@yahoo.com> parents: 50819 diff changeset	360 message = opts['message']
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	361 if not message:
9183 d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 8934 diff changeset	362 # we don't translate commit messages
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	363 message = b"\n".join(
46113 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	364 [b"Added signature for changeset %s" % short(n) for n in nodes]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	365 )
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	366 try:
50874 b3ac579bde41 gpg: migrate `opts` to native kwargs Matt Harbison <matt_harbison@yahoo.com> parents: 50819 diff changeset	367 editor = cmdutil.getcommiteditor(editform=b'gpg.sign', **opts)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	368 repo.commit(
50874 b3ac579bde41 gpg: migrate `opts` to native kwargs Matt Harbison <matt_harbison@yahoo.com> parents: 50819 diff changeset	369 message, opts['user'], opts['date'], match=msigs, editor=editor
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	370 )
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25186 diff changeset	371 except ValueError as inst:
36653 2f7a3c90c0d7 py3: use pycompat.bytestr() to convert error messages to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 36607 diff changeset	372 raise error.Abort(pycompat.bytestr(inst))
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	373
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	374
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	375 def node2txt(repo, node, ver):
347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	376 """map a manifest into some text"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	377 if ver == b"0":
46113 59fa3890d40a node: import symbols explicitly Joerg Sonnenberger <joerg@bec.de> parents: 45942 diff changeset	378 return b"%s\n" % hex(node)
1592 347c44611348 gpg signing extension for hg Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: diff changeset	379 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	380 raise error.Abort(_(b"unknown signature version"))
40293 c303d65d2e34 help: assigning categories to existing commands rdamazio@google.com parents: 38164 diff changeset	381
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	382
40293 c303d65d2e34 help: assigning categories to existing commands rdamazio@google.com parents: 38164 diff changeset	383 def extsetup(ui):
c303d65d2e34 help: assigning categories to existing commands rdamazio@google.com parents: 38164 diff changeset	384 # Add our category before "Repository maintenance".
c303d65d2e34 help: assigning categories to existing commands rdamazio@google.com parents: 38164 diff changeset	385 help.CATEGORY_ORDER.insert(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	386 help.CATEGORY_ORDER.index(command.CATEGORY_MAINTENANCE), _HELP_CATEGORY
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42235 diff changeset	387 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	388 help.CATEGORY_NAMES[_HELP_CATEGORY] = b'GPG signing'

Mercurial > public > mercurial-scm > hg

annotate hgext/gpg.py @ 52644:e627cc25b6f3