##// END OF EJS Templates
histedit: change state format to allow non-hash lines...
histedit: change state format to allow non-hash lines The existing state serialization format assumed the rule line consisted of an action and a hash. In our external extension that adds 'exec' this is not the case (there is no hash, just the shell command). So let's change the format to be more generic with just an action and a remainder, and the various commands can handle it as they wish. Flagged for stable since we want to get this format tweak in before the new format goes live in the release.

File last commit:

r23877:7cc77030 default
r24810:f5416657 stable
Show More
gpg.py
297 lines | 9.5 KiB | text/x-python | PythonLexer
Benoit Boissinot
fixes for gpg.py extension...
r1681 # Copyright 2005, 2006 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Benoit Boissinot
fixes for gpg.py extension...
r1681
Dirkjan Ochtman
extensions: change descriptions for extensions providing a few commands
r8934 '''commands to sign and verify changesets'''
Dirkjan Ochtman
help: add/fix docstrings for a bunch of extensions
r8873
Benoit Boissinot
fixes for gpg.py extension...
r1681 import os, tempfile, binascii
Martin Geisler
gpg: use cmdutil.command decorator
r14299 from mercurial import util, commands, match, cmdutil
Benoit Boissinot
gpg signing extension for hg...
r1592 from mercurial import node as hgnode
Matt Mackall
Simplify i18n imports
r3891 from mercurial.i18n import _
Benoit Boissinot
gpg signing extension for hg...
r1592
Martin Geisler
gpg: use cmdutil.command decorator
r14299 cmdtable = {}
command = cmdutil.command(cmdtable)
Augie Fackler
hgext: mark all first-party extensions as such
r16743 testedwith = 'internal'
Martin Geisler
gpg: use cmdutil.command decorator
r14299
Benoit Boissinot
use new style classes
r8778 class gpg(object):
Benoit Boissinot
gpg signing extension for hg...
r1592 def __init__(self, path, key=None):
self.path = path
self.key = (key and " --local-user \"%s\"" % key) or ""
def sign(self, data):
gpgcmd = "%s --sign --detach-sign%s" % (self.path, self.key)
return util.filter(data, gpgcmd)
def verify(self, data, sig):
""" returns of the good and bad signatures"""
Thomas Arendsen Hein
gpg extension: Always remove temporary files created by 'hg sigcheck'.
r2231 sigfile = datafile = None
Benoit Boissinot
gpg signing extension for hg...
r1592 try:
Benoit Boissinot
fixes for gpg.py extension...
r1681 # create temporary files
Thomas Arendsen Hein
Use better names (hg-{usage}-{random}.{suffix}) for temporary files.
r2165 fd, sigfile = tempfile.mkstemp(prefix="hg-gpg-", suffix=".sig")
Benoit Boissinot
gpg signing extension for hg...
r1592 fp = os.fdopen(fd, 'wb')
fp.write(sig)
fp.close()
Thomas Arendsen Hein
Use better names (hg-{usage}-{random}.{suffix}) for temporary files.
r2165 fd, datafile = tempfile.mkstemp(prefix="hg-gpg-", suffix=".txt")
Benoit Boissinot
gpg signing extension for hg...
r1592 fp = os.fdopen(fd, 'wb')
fp.write(data)
fp.close()
Benoit Boissinot
fixes for gpg.py extension...
r1681 gpgcmd = ("%s --logger-fd 1 --status-fd 1 --verify "
"\"%s\" \"%s\"" % (self.path, sigfile, datafile))
Benoit Boissinot
gpg signing extension for hg...
r1592 ret = util.filter("", gpgcmd)
Thomas Arendsen Hein
gpg extension: Always remove temporary files created by 'hg sigcheck'.
r2231 finally:
Benoit Boissinot
gpg signing extension for hg...
r1592 for f in (sigfile, datafile):
try:
Matt Mackall
many, many trivial check-code fixups
r10282 if f:
os.unlink(f)
Brodie Rao
cleanup: replace naked excepts with more specific ones
r16688 except OSError:
Matt Mackall
many, many trivial check-code fixups
r10282 pass
Benoit Boissinot
gpg signing extension for hg...
r1592 keys = []
key, fingerprint = None, None
for l in ret.splitlines():
# see DETAILS in the gnupg documentation
# filter the logger output
if not l.startswith("[GNUPG:]"):
continue
l = l[9:]
Wei, Elson
gpg: treat "ERRSIG" as a valid key id but no fingerprint
r19441 if l.startswith("VALIDSIG"):
Benoit Boissinot
gpg signing extension for hg...
r1592 # fingerprint of the primary key
fingerprint = l.split()[10]
Wei, Elson
gpg: treat "ERRSIG" as a valid key id but no fingerprint
r19441 elif l.startswith("ERRSIG"):
key = l.split(" ", 3)[:2]
key.append("")
fingerprint = None
Benoit Boissinot
gpg signing extension for hg...
r1592 elif (l.startswith("GOODSIG") or
l.startswith("EXPSIG") or
l.startswith("EXPKEYSIG") or
l.startswith("BADSIG")):
if key is not None:
keys.append(key + [fingerprint])
key = l.split(" ", 2)
fingerprint = None
if key is not None:
keys.append(key + [fingerprint])
Wei, Elson
gpg: getkeys() removes unused returning value "err"
r19442 return keys
Benoit Boissinot
gpg signing extension for hg...
r1592
def newgpg(ui, **opts):
Benoit Boissinot
fixes for gpg.py extension...
r1681 """create a new gpg instance"""
Benoit Boissinot
gpg signing extension for hg...
r1592 gpgpath = ui.config("gpg", "cmd", "gpg")
gpgkey = opts.get('key')
if not gpgkey:
gpgkey = ui.config("gpg", "key", None)
return gpg(gpgpath, gpgkey)
Benoit Boissinot
fixes for gpg.py extension...
r1681 def sigwalk(repo):
"""
walk over every sigs, yields a couple
((node, version, sig), (filename, linenumber))
"""
def parsefile(fileiter, context):
ln = 1
for l in fileiter:
if not l:
continue
yield (l.split(" ", 2), (context, ln))
Benoit Boissinot
fix coding style (reported by pylint)
r10394 ln += 1
Benoit Boissinot
fixes for gpg.py extension...
r1681
Matt Mackall
replace various uses of list.reverse()
r8210 # read the heads
Benoit Boissinot
fixes for gpg.py extension...
r1681 fl = repo.file(".hgsigs")
Matt Mackall
replace various uses of list.reverse()
r8210 for r in reversed(fl.heads()):
Benoit Boissinot
fixes for gpg.py extension...
r1681 fn = ".hgsigs|%s" % hgnode.short(r)
for item in parsefile(fl.read(r).splitlines(), fn):
yield item
try:
# read local signatures
fn = "localsigs"
Angel Ezquerra
localrepo: remove all external users of localrepo.opener...
r23877 for item in parsefile(repo.vfs(fn), fn):
Benoit Boissinot
fixes for gpg.py extension...
r1681 yield item
except IOError:
pass
def getkeys(ui, repo, mygpg, sigdata, context):
"""get the keys who signed a data"""
fn, ln = context
node, version, sig = sigdata
prefix = "%s:%d" % (fn, ln)
node = hgnode.bin(node)
data = node2txt(repo, node, version)
sig = binascii.a2b_base64(sig)
Wei, Elson
gpg: getkeys() removes unused returning value "err"
r19442 keys = mygpg.verify(data, sig)
Benoit Boissinot
fixes for gpg.py extension...
r1681
validkeys = []
# warn for expired key and/or sigs
for key in keys:
Wei, Elson
gpg: show "Unknown key ID xxxxxxxx" when the status is ERRSIG
r19444 if key[0] == "ERRSIG":
ui.write(_("%s Unknown key ID \"%s\"\n")
% (prefix, shortkey(ui, key[1][:15])))
continue
Benoit Boissinot
fixes for gpg.py extension...
r1681 if key[0] == "BADSIG":
ui.write(_("%s Bad signature from \"%s\"\n") % (prefix, key[2]))
continue
if key[0] == "EXPSIG":
ui.write(_("%s Note: Signature has expired"
" (signed by: \"%s\")\n") % (prefix, key[2]))
elif key[0] == "EXPKEYSIG":
ui.write(_("%s Note: This key has expired"
" (signed by: \"%s\")\n") % (prefix, key[2]))
validkeys.append((key[1], key[2], key[3]))
return validkeys
Martin Geisler
gpg: use cmdutil.command decorator
r14299 @command("sigs", [], _('hg sigs'))
Benoit Boissinot
fixes for gpg.py extension...
r1681 def sigs(ui, repo):
"""list signed changesets"""
mygpg = newgpg(ui)
revs = {}
for data, context in sigwalk(repo):
node, version, sig = data
fn, ln = context
try:
n = repo.lookup(node)
except KeyError:
ui.warn(_("%s:%d node does not exist\n") % (fn, ln))
continue
r = repo.changelog.rev(n)
keys = getkeys(ui, repo, mygpg, data, context)
if not keys:
continue
revs.setdefault(r, [])
revs[r].extend(keys)
Martin Geisler
gpg: use reverse kwarg to sort sigs in reversed order
r8303 for rev in sorted(revs, reverse=True):
Benoit Boissinot
fix an exception in gpg.py with multiples sigs for the same cset...
r1682 for k in revs[rev]:
r = "%5d:%s" % (rev, hgnode.hex(repo.changelog.node(rev)))
Benoit Boissinot
fixes for gpg.py extension...
r1681 ui.write("%-30s %s\n" % (keystr(ui, k), r))
Thomas Arendsen Hein
consistency: use REV instead of REVISION
r16991 @command("sigcheck", [], _('hg sigcheck REV'))
Benoit Boissinot
gpg signing extension for hg...
r1592 def check(ui, repo, rev):
"""verify all the signatures there may be for a particular revision"""
mygpg = newgpg(ui)
rev = repo.lookup(rev)
hexrev = hgnode.hex(rev)
keys = []
Benoit Boissinot
fixes for gpg.py extension...
r1681 for data, context in sigwalk(repo):
node, version, sig = data
if node == hexrev:
k = getkeys(ui, repo, mygpg, data, context)
if k:
keys.extend(k)
Benoit Boissinot
gpg signing extension for hg...
r1592
if not keys:
Martin Geisler
gpg: lowercase messages
r16927 ui.write(_("no valid signature for %s\n") % hgnode.short(rev))
Benoit Boissinot
gpg signing extension for hg...
r1592 return
Benoit Boissinot
fixes for gpg.py extension...
r1681
Benoit Boissinot
gpg signing extension for hg...
r1592 # print summary
ui.write("%s is signed by:\n" % hgnode.short(rev))
Benoit Boissinot
fixes for gpg.py extension...
r1681 for key in keys:
ui.write(" %s\n" % keystr(ui, key))
Benoit Boissinot
gpg signing extension for hg...
r1592
Benoit Boissinot
fixes for gpg.py extension...
r1681 def keystr(ui, key):
"""associate a string to a key (username, comment)"""
keyid, user, fingerprint = key
comment = ui.config("gpg", fingerprint, None)
if comment:
return "%s (%s)" % (user, comment)
else:
return user
Benoit Boissinot
gpg signing extension for hg...
r1592
Martin Geisler
gpg: use cmdutil.command decorator
r14299 @command("sign",
[('l', 'local', None, _('make the signature local')),
('f', 'force', None, _('sign even if the sigfile is modified')),
('', 'no-commit', None, _('do not commit the sigfile after signing')),
('k', 'key', '',
_('the key id to sign with'), _('ID')),
('m', 'message', '',
FUJIWARA Katsunori
doc: unify help text for "--message" option...
r21951 _('use text as commit message'), _('TEXT')),
FUJIWARA Katsunori
gpg: accept '--edit' like other commands creating new changeset...
r21711 ('e', 'edit', False, _('invoke editor on commit messages')),
Martin Geisler
gpg: use cmdutil.command decorator
r14299 ] + commands.commitopts2,
Thomas Arendsen Hein
consistency: use REV instead of REVISION
r16991 _('hg sign [OPTION]... [REV]...'))
Benoit Boissinot
gpg signing extension for hg...
r1592 def sign(ui, repo, *revs, **opts):
Thomas Arendsen Hein
Make 'hg sign' behave like other commands: Default to current parent.
r3916 """add a signature for the current or given revision
If no revision is given, the parent of the working directory is used,
or tip if no revision is checked out.
Thomas Arendsen Hein
Document log date ranges and mention 'hg help dates' for all commands (issue998)
r6163
Martin Geisler
Use our custom hg reStructuredText role some more...
r11193 See :hg:`help dates` for a list of formats valid for -d/--date.
Thomas Arendsen Hein
Make 'hg sign' behave like other commands: Default to current parent.
r3916 """
Benoit Boissinot
gpg signing extension for hg...
r1592 mygpg = newgpg(ui, **opts)
sigver = "0"
sigmessage = ""
Thomas Arendsen Hein
Fix bad behaviour when specifying an invalid date (issue700)...
r6139
date = opts.get('date')
if date:
opts['date'] = util.parsedate(date)
Benoit Boissinot
gpg signing extension for hg...
r1592 if revs:
nodes = [repo.lookup(n) for n in revs]
else:
Thomas Arendsen Hein
Make 'hg sign' behave like other commands: Default to current parent.
r3916 nodes = [node for node in repo.dirstate.parents()
if node != hgnode.nullid]
if len(nodes) > 1:
raise util.Abort(_('uncommitted merge - please provide a '
'specific revision'))
if not nodes:
nodes = [repo.changelog.tip()]
Benoit Boissinot
gpg signing extension for hg...
r1592
for n in nodes:
hexnode = hgnode.hex(n)
Martin Geisler
gpg: lowercase messages
r16927 ui.write(_("signing %d:%s\n") % (repo.changelog.rev(n),
Benoit Boissinot
i18n: mark more strings for translation
r10510 hgnode.short(n)))
Benoit Boissinot
gpg signing extension for hg...
r1592 # build data
data = node2txt(repo, n, sigver)
sig = mygpg.sign(data)
if not sig:
Richard Hopkins
gpg, commands: fixed util.abort to util.Abort typos...
r12965 raise util.Abort(_("error while signing"))
Benoit Boissinot
gpg signing extension for hg...
r1592 sig = binascii.b2a_base64(sig)
sig = sig.replace("\n", "")
sigmessage += "%s %s %s\n" % (hexnode, sigver, sig)
# write it
if opts['local']:
Angel Ezquerra
localrepo: remove all external users of localrepo.opener...
r23877 repo.vfs.append("localsigs", sigmessage)
Benoit Boissinot
gpg signing extension for hg...
r1592 return
Matt Mackall
gpg: move test of force before status call
r22682 if not opts["force"]:
msigs = match.exact(repo.root, '', ['.hgsigs'])
if util.any(repo.status(match=msigs, unknown=True, ignored=True)):
Matt Mackall
gpg: use an abort hint and don't mention --force
r22683 raise util.Abort(_("working copy of .hgsigs is changed "),
hint=_("please commit .hgsigs manually"))
Benoit Boissinot
gpg signing extension for hg...
r1592
Dan Villiom Podlaski Christiansen
explicitly close files...
r13400 sigsfile = repo.wfile(".hgsigs", "ab")
sigsfile.write(sigmessage)
sigsfile.close()
Benoit Boissinot
gpg signing extension for hg...
r1592
Matt Mackall
dirstate: add __contains__ and make __getitem__ more useful...
r4906 if '.hgsigs' not in repo.dirstate:
Dirkjan Ochtman
move working dir/dirstate methods from localrepo to workingctx
r11303 repo[None].add([".hgsigs"])
Benoit Boissinot
gpg signing extension for hg...
r1592
if opts["no_commit"]:
return
message = opts['message']
if not message:
Martin Geisler
do not translate commit messages...
r9183 # we don't translate commit messages
message = "\n".join(["Added signature for changeset %s"
Benoit Boissinot
gpg: use the same log message format as hg tag
r5475 % hgnode.short(n)
Benoit Boissinot
gpg signing extension for hg...
r1592 for n in nodes])
try:
FUJIWARA Katsunori
gpg: pass 'editform' argument to 'cmdutil.getcommiteditor'...
r22001 editor = cmdutil.getcommiteditor(editform='gpg.sign', **opts)
FUJIWARA Katsunori
gpg: accept '--edit' like other commands creating new changeset...
r21711 repo.commit(message, opts['user'], opts['date'], match=msigs,
FUJIWARA Katsunori
gpg: pass 'editform' argument to 'cmdutil.getcommiteditor'...
r22001 editor=editor)
Benoit Boissinot
gpg signing extension for hg...
r1592 except ValueError, inst:
raise util.Abort(str(inst))
Wei, Elson
gpg: add shortkey() to convert from long id to short
r19443 def shortkey(ui, key):
if len(key) != 16:
ui.debug("key ID \"%s\" format error\n" % key)
return key
return key[-8:]
Benoit Boissinot
gpg signing extension for hg...
r1592 def node2txt(repo, node, ver):
"""map a manifest into some text"""
if ver == "0":
return "%s\n" % hgnode.hex(node)
else:
Benoit Boissinot
extension gpg.py: really raise the exception in case of invalid data
r1685 raise util.Abort(_("unknown signature version"))