equal
deleted
inserted
replaced
81 import os |
81 import os |
82 import socket |
82 import socket |
83 |
83 |
84 from mercurial.i18n import _ |
84 from mercurial.i18n import _ |
85 from mercurial.pycompat import open |
85 from mercurial.pycompat import open |
|
86 from mercurial.node import bin |
86 from mercurial import ( |
87 from mercurial import ( |
87 cmdutil, |
88 cmdutil, |
88 commands, |
89 commands, |
89 encoding, |
90 encoding, |
90 error, |
91 error, |
91 formatter, |
92 formatter, |
92 hg, |
93 hg, |
93 mail, |
94 mail, |
94 node as nodemod, |
|
95 patch, |
95 patch, |
96 pycompat, |
96 pycompat, |
97 registrar, |
97 registrar, |
98 scmutil, |
98 scmutil, |
99 templater, |
99 templater, |
304 if body: |
304 if body: |
305 msg.attach(mail.mimeencode(ui, body, _charsets, opts.get(b'test'))) |
305 msg.attach(mail.mimeencode(ui, body, _charsets, opts.get(b'test'))) |
306 p = mail.mimetextpatch( |
306 p = mail.mimetextpatch( |
307 b'\n'.join(patchlines), 'x-patch', opts.get(b'test') |
307 b'\n'.join(patchlines), 'x-patch', opts.get(b'test') |
308 ) |
308 ) |
309 binnode = nodemod.bin(node) |
309 binnode = bin(node) |
310 # if node is mq patch, it will have the patch file's name as a tag |
310 # if node is mq patch, it will have the patch file's name as a tag |
311 if not patchname: |
311 if not patchname: |
312 patchtags = [ |
312 patchtags = [ |
313 t |
313 t |
314 for t in repo.nodetags(binnode) |
314 for t in repo.nodetags(binnode) |