| yuja |
| hg-reviewers |
time.strftime() does not accepts bytes as its first argument on py3.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/bugzilla.py (2 lines) | |||
| M | mercurial/debugcommands.py (2 lines) | |||
| M | mercurial/mail.py (2 lines) |
| '''update bug state with comment text. | '''update bug state with comment text. | ||||
| Try adding comment as committer of changeset, otherwise as | Try adding comment as committer of changeset, otherwise as | ||||
| default bugzilla user.''' | default bugzilla user.''' | ||||
| if len(newstate) > 0: | if len(newstate) > 0: | ||||
| self.ui.warn(_("Bugzilla/MySQL cannot update bug state\n")) | self.ui.warn(_("Bugzilla/MySQL cannot update bug state\n")) | ||||
| (user, userid) = self.get_bugzilla_user(committer) | (user, userid) = self.get_bugzilla_user(committer) | ||||
| now = time.strftime('%Y-%m-%d %H:%M:%S') | now = time.strftime(r'%Y-%m-%d %H:%M:%S') | ||||
| self.run('''insert into longdescs | self.run('''insert into longdescs | ||||
| (bug_id, who, bug_when, thetext) | (bug_id, who, bug_when, thetext) | ||||
| values (%s, %s, %s, %s)''', | values (%s, %s, %s, %s)''', | ||||
| (bugid, userid, now, text)) | (bugid, userid, now, text)) | ||||
| self.run('''insert into bugs_activity (bug_id, who, bug_when, fieldid) | self.run('''insert into bugs_activity (bug_id, who, bug_when, fieldid) | ||||
| values (%s, %s, %s, %s)''', | values (%s, %s, %s, %s)''', | ||||
| (bugid, userid, now, self.longdesc_id)) | (bugid, userid, now, self.longdesc_id)) | ||||
| self.conn.commit() | self.conn.commit() | ||||
| else: | else: | ||||
| keyfunc = None # sort by filename | keyfunc = None # sort by filename | ||||
| for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): | ||||
| if ent[3] == -1: | if ent[3] == -1: | ||||
| timestr = 'unset ' | timestr = 'unset ' | ||||
| elif nodates: | elif nodates: | ||||
| timestr = 'set ' | timestr = 'set ' | ||||
| else: | else: | ||||
| timestr = time.strftime("%Y-%m-%d %H:%M:%S ", | timestr = time.strftime(r"%Y-%m-%d %H:%M:%S ", | ||||
| time.localtime(ent[3])) | time.localtime(ent[3])) | ||||
| if ent[1] & 0o20000: | if ent[1] & 0o20000: | ||||
| mode = 'lnk' | mode = 'lnk' | ||||
| else: | else: | ||||
| mode = '%3o' % (ent[1] & 0o777 & ~util.umask) | mode = '%3o' % (ent[1] & 0o777 & ~util.umask) | ||||
| ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) | ||||
| for f in repo.dirstate.copies(): | for f in repo.dirstate.copies(): | ||||
| ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) | ||||
| os.path.basename(program.split(None, 1)[0]), | os.path.basename(program.split(None, 1)[0]), | ||||
| util.explainexit(ret)[0])) | util.explainexit(ret)[0])) | ||||
| def _mbox(mbox, sender, recipients, msg): | def _mbox(mbox, sender, recipients, msg): | ||||
| '''write mails to mbox''' | '''write mails to mbox''' | ||||
| fp = open(mbox, 'ab+') | fp = open(mbox, 'ab+') | ||||
| # Should be time.asctime(), but Windows prints 2-characters day | # Should be time.asctime(), but Windows prints 2-characters day | ||||
| # of month instead of one. Make them print the same thing. | # of month instead of one. Make them print the same thing. | ||||
| date = time.strftime('%a %b %d %H:%M:%S %Y', time.localtime()) | date = time.strftime(r'%a %b %d %H:%M:%S %Y', time.localtime()) | ||||
| fp.write('From %s %s\n' % (sender, date)) | fp.write('From %s %s\n' % (sender, date)) | ||||
| fp.write(msg) | fp.write(msg) | ||||
| fp.write('\n\n') | fp.write('\n\n') | ||||
| fp.close() | fp.close() | ||||
| def connect(ui, mbox=None): | def connect(ui, mbox=None): | ||||
| '''make a mail connection. return a function to send mail. | '''make a mail connection. return a function to send mail. | ||||
| call as sendmail(sender, list-of-recipients, msg).''' | call as sendmail(sender, list-of-recipients, msg).''' | ||||