equal
deleted
inserted
replaced
74 fp.close() |
74 fp.close() |
75 fd, datafile = pycompat.mkstemp(prefix=b"hg-gpg-", suffix=b".txt") |
75 fd, datafile = pycompat.mkstemp(prefix=b"hg-gpg-", suffix=b".txt") |
76 fp = os.fdopen(fd, r'wb') |
76 fp = os.fdopen(fd, r'wb') |
77 fp.write(data) |
77 fp.write(data) |
78 fp.close() |
78 fp.close() |
79 gpgcmd = b"%s --logger-fd 1 --status-fd 1 --verify " b"\"%s\" \"%s\"" % ( |
79 gpgcmd = b"%s --logger-fd 1 --status-fd 1 --verify \"%s\" \"%s\"" % ( |
80 self.path, |
80 self.path, |
81 sigfile, |
81 sigfile, |
82 datafile, |
82 datafile, |
83 ) |
83 ) |
84 ret = procutil.filter(b"", gpgcmd) |
84 ret = procutil.filter(b"", gpgcmd) |
177 if key[0] == b"BADSIG": |
177 if key[0] == b"BADSIG": |
178 ui.write(_(b"%s Bad signature from \"%s\"\n") % (prefix, key[2])) |
178 ui.write(_(b"%s Bad signature from \"%s\"\n") % (prefix, key[2])) |
179 continue |
179 continue |
180 if key[0] == b"EXPSIG": |
180 if key[0] == b"EXPSIG": |
181 ui.write( |
181 ui.write( |
182 _(b"%s Note: Signature has expired" b" (signed by: \"%s\")\n") |
182 _(b"%s Note: Signature has expired (signed by: \"%s\")\n") |
183 % (prefix, key[2]) |
183 % (prefix, key[2]) |
184 ) |
184 ) |
185 elif key[0] == b"EXPKEYSIG": |
185 elif key[0] == b"EXPKEYSIG": |
186 ui.write( |
186 ui.write( |
187 _(b"%s Note: This key has expired" b" (signed by: \"%s\")\n") |
187 _(b"%s Note: This key has expired (signed by: \"%s\")\n") |
188 % (prefix, key[2]) |
188 % (prefix, key[2]) |
189 ) |
189 ) |
190 validkeys.append((key[1], key[2], key[3])) |
190 validkeys.append((key[1], key[2], key[3])) |
191 return validkeys |
191 return validkeys |
192 |
192 |
302 nodes = [ |
302 nodes = [ |
303 node for node in repo.dirstate.parents() if node != hgnode.nullid |
303 node for node in repo.dirstate.parents() if node != hgnode.nullid |
304 ] |
304 ] |
305 if len(nodes) > 1: |
305 if len(nodes) > 1: |
306 raise error.Abort( |
306 raise error.Abort( |
307 _(b'uncommitted merge - please provide a ' b'specific revision') |
307 _(b'uncommitted merge - please provide a specific revision') |
308 ) |
308 ) |
309 if not nodes: |
309 if not nodes: |
310 nodes = [repo.changelog.tip()] |
310 nodes = [repo.changelog.tip()] |
311 |
311 |
312 for n in nodes: |
312 for n in nodes: |