Show More
@@ -153,8 +153,7 b' def getkeys(ui, repo, mygpg, sigdata, co' | |||||
153 | # warn for expired key and/or sigs |
|
153 | # warn for expired key and/or sigs | |
154 | for key in keys: |
|
154 | for key in keys: | |
155 | if key[0] == "ERRSIG": |
|
155 | if key[0] == "ERRSIG": | |
156 | ui.write(_("%s Unknown key ID \"%s\"\n") |
|
156 | ui.write(_("%s Unknown key ID \"%s\"\n") % (prefix, key[1])) | |
157 | % (prefix, shortkey(ui, key[1][:15]))) |
|
|||
158 | continue |
|
157 | continue | |
159 | if key[0] == "BADSIG": |
|
158 | if key[0] == "BADSIG": | |
160 | ui.write(_("%s Bad signature from \"%s\"\n") % (prefix, key[2])) |
|
159 | ui.write(_("%s Bad signature from \"%s\"\n") % (prefix, key[2])) | |
@@ -320,13 +319,6 b' def _dosign(ui, repo, *revs, **opts):' | |||||
320 | except ValueError as inst: |
|
319 | except ValueError as inst: | |
321 | raise error.Abort(str(inst)) |
|
320 | raise error.Abort(str(inst)) | |
322 |
|
321 | |||
323 | def shortkey(ui, key): |
|
|||
324 | if len(key) != 16: |
|
|||
325 | ui.debug("key ID \"%s\" format error\n" % key) |
|
|||
326 | return key |
|
|||
327 |
|
||||
328 | return key[-8:] |
|
|||
329 |
|
||||
330 | def node2txt(repo, node, ver): |
|
322 | def node2txt(repo, node, ver): | |
331 | """map a manifest into some text""" |
|
323 | """map a manifest into some text""" | |
332 | if ver == "0": |
|
324 | if ver == "0": |
General Comments 0
You need to be logged in to leave comments.
Login now