Mercurial > public > mercurial-scm > hg
comparison mercurial/patch.py @ 9591:012f1244cd4c
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 09 Oct 2009 00:29:39 +0200 |
| parents | 4c041f1ee1b4 b8352a3617f3 |
| children | a981ddb16b80 |
comparison
equal
deleted
inserted
replaced
| 9546:4333b9744419 | 9591:012f1244cd4c |
|---|---|
| 61 try: | 61 try: |
| 62 msg = email.Parser.Parser().parse(fileobj) | 62 msg = email.Parser.Parser().parse(fileobj) |
| 63 | 63 |
| 64 subject = msg['Subject'] | 64 subject = msg['Subject'] |
| 65 user = msg['From'] | 65 user = msg['From'] |
| 66 if not subject and not user: | |
| 67 # Not an email, restore parsed headers if any | |
| 68 subject = '\n'.join(': '.join(h) for h in msg.items()) + '\n' | |
| 69 | |
| 66 gitsendmail = 'git-send-email' in msg.get('X-Mailer', '') | 70 gitsendmail = 'git-send-email' in msg.get('X-Mailer', '') |
| 67 # should try to parse msg['Date'] | 71 # should try to parse msg['Date'] |
| 68 date = None | 72 date = None |
| 69 nodeid = None | 73 nodeid = None |
| 70 branch = None | 74 branch = None |