Show More
@@ -63,14 +63,27 b' overwritten by command line flags like -' | |||||
63 | You can set patchbomb to always ask for confirmation by setting |
|
63 | You can set patchbomb to always ask for confirmation by setting | |
64 | ``patchbomb.confirm`` to true. |
|
64 | ``patchbomb.confirm`` to true. | |
65 | ''' |
|
65 | ''' | |
|
66 | from __future__ import absolute_import | |||
66 |
|
67 | |||
67 | import os, errno, socket, tempfile, cStringIO |
|
68 | import cStringIO | |
68 | import email as emailmod |
|
69 | import email as emailmod | |
|
70 | import errno | |||
|
71 | import os | |||
|
72 | import socket | |||
|
73 | import tempfile | |||
69 |
|
74 | |||
70 | from mercurial import cmdutil, commands, hg, mail, patch, util, error |
|
75 | from mercurial import ( | |
71 | from mercurial import scmutil |
|
76 | cmdutil, | |
|
77 | commands, | |||
|
78 | error, | |||
|
79 | hg, | |||
|
80 | mail, | |||
|
81 | node as nodemod, | |||
|
82 | patch, | |||
|
83 | scmutil, | |||
|
84 | util, | |||
|
85 | ) | |||
72 | from mercurial.i18n import _ |
|
86 | from mercurial.i18n import _ | |
73 | from mercurial.node import bin |
|
|||
74 |
|
87 | |||
75 | cmdtable = {} |
|
88 | cmdtable = {} | |
76 | command = cmdutil.command(cmdtable) |
|
89 | command = cmdutil.command(cmdtable) | |
@@ -167,7 +180,7 b' def makepatch(ui, repo, patchlines, opts' | |||||
167 | msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test'))) |
|
180 | msg.attach(mail.mimeencode(ui, body, _charsets, opts.get('test'))) | |
168 | p = mail.mimetextpatch('\n'.join(patchlines), 'x-patch', |
|
181 | p = mail.mimetextpatch('\n'.join(patchlines), 'x-patch', | |
169 | opts.get('test')) |
|
182 | opts.get('test')) | |
170 | binnode = bin(node) |
|
183 | binnode = nodemod.bin(node) | |
171 | # if node is mq patch, it will have the patch file's name as a tag |
|
184 | # if node is mq patch, it will have the patch file's name as a tag | |
172 | if not patchname: |
|
185 | if not patchname: | |
173 | patchtags = [t for t in repo.nodetags(binnode) |
|
186 | patchtags = [t for t in repo.nodetags(binnode) |
@@ -45,7 +45,6 b'' | |||||
45 | hgext/largefiles/wirestore.py not using absolute_import |
|
45 | hgext/largefiles/wirestore.py not using absolute_import | |
46 | hgext/mq.py not using absolute_import |
|
46 | hgext/mq.py not using absolute_import | |
47 | hgext/notify.py not using absolute_import |
|
47 | hgext/notify.py not using absolute_import | |
48 | hgext/patchbomb.py not using absolute_import |
|
|||
49 | hgext/rebase.py not using absolute_import |
|
48 | hgext/rebase.py not using absolute_import | |
50 | hgext/share.py not using absolute_import |
|
49 | hgext/share.py not using absolute_import | |
51 | hgext/transplant.py not using absolute_import |
|
50 | hgext/transplant.py not using absolute_import |
General Comments 0
You need to be logged in to leave comments.
Login now