equal
deleted
inserted
replaced
73 |
73 |
74 from mercurial.i18n import _ |
74 from mercurial.i18n import _ |
75 from mercurial import ( |
75 from mercurial import ( |
76 cmdutil, |
76 cmdutil, |
77 commands, |
77 commands, |
|
78 encoding, |
78 error, |
79 error, |
79 hg, |
80 hg, |
80 mail, |
81 mail, |
81 node as nodemod, |
82 node as nodemod, |
82 patch, |
83 patch, |
691 if replyto: |
692 if replyto: |
692 m['Reply-To'] = ', '.join(replyto) |
693 m['Reply-To'] = ', '.join(replyto) |
693 if opts.get('test'): |
694 if opts.get('test'): |
694 ui.status(_('displaying '), subj, ' ...\n') |
695 ui.status(_('displaying '), subj, ' ...\n') |
695 ui.flush() |
696 ui.flush() |
696 if 'PAGER' in os.environ and not ui.plain(): |
697 if 'PAGER' in encoding.environ and not ui.plain(): |
697 fp = util.popen(os.environ['PAGER'], 'w') |
698 fp = util.popen(encoding.environ['PAGER'], 'w') |
698 else: |
699 else: |
699 fp = ui |
700 fp = ui |
700 generator = emailmod.Generator.Generator(fp, mangle_from_=False) |
701 generator = emailmod.Generator.Generator(fp, mangle_from_=False) |
701 try: |
702 try: |
702 generator.flatten(m, 0) |
703 generator.flatten(m, 0) |