equal
deleted
inserted
replaced
283 $ hg --cwd b tip | grep override |
283 $ hg --cwd b tip | grep override |
284 summary: override |
284 summary: override |
285 $ rm -r b |
285 $ rm -r b |
286 |
286 |
287 $ cat > mkmsg.py <<EOF |
287 $ cat > mkmsg.py <<EOF |
288 > import email.message, sys |
288 > import email.message |
|
289 > import sys |
289 > msg = email.message.Message() |
290 > msg = email.message.Message() |
290 > patch = open(sys.argv[1], 'rb').read() |
291 > patch = open(sys.argv[1], 'rb').read() |
291 > msg.set_payload(b'email commit message\n' + patch) |
292 > msg.set_payload(b'email commit message\n' + patch) |
292 > msg['Subject'] = 'email patch' |
293 > msg['Subject'] = 'email patch' |
293 > msg['From'] = 'email patcher' |
294 > msg['From'] = 'email patcher' |
381 |
382 |
382 subject: duplicate detection, removal of [PATCH] |
383 subject: duplicate detection, removal of [PATCH] |
383 The '---' tests the gitsendmail handling without proper mail headers |
384 The '---' tests the gitsendmail handling without proper mail headers |
384 |
385 |
385 $ cat > mkmsg2.py <<EOF |
386 $ cat > mkmsg2.py <<EOF |
386 > import email.message, sys |
387 > import email.message |
|
388 > import sys |
387 > msg = email.message.Message() |
389 > msg = email.message.Message() |
388 > patch = open(sys.argv[1], 'rb').read() |
390 > patch = open(sys.argv[1], 'rb').read() |
389 > msg.set_payload(b'email patch\n\nnext line\n---\n' + patch) |
391 > msg.set_payload(b'email patch\n\nnext line\n---\n' + patch) |
390 > msg['Subject'] = '[PATCH] email patch' |
392 > msg['Subject'] = '[PATCH] email patch' |
391 > msg['From'] = 'email patcher' |
393 > msg['From'] = 'email patcher' |
1869 |
1871 |
1870 Importing some extra header |
1872 Importing some extra header |
1871 =========================== |
1873 =========================== |
1872 |
1874 |
1873 $ cat > $TESTTMP/parseextra.py <<EOF |
1875 $ cat > $TESTTMP/parseextra.py <<EOF |
|
1876 > import mercurial.cmdutil |
1874 > import mercurial.patch |
1877 > import mercurial.patch |
1875 > import mercurial.cmdutil |
|
1876 > |
1878 > |
1877 > def processfoo(repo, data, extra, opts): |
1879 > def processfoo(repo, data, extra, opts): |
1878 > if b'foo' in data: |
1880 > if b'foo' in data: |
1879 > extra[b'foo'] = data[b'foo'] |
1881 > extra[b'foo'] = data[b'foo'] |
1880 > def postimport(ctx): |
1882 > def postimport(ctx): |