Show More
@@ -105,6 +105,7 b' class patchheader(object):' | |||
|
105 | 105 | message.append(line) |
|
106 | 106 | format = None |
|
107 | 107 | elif line == '# HG changeset patch': |
|
108 | message = [] | |
|
108 | 109 | format = "hgpatch" |
|
109 | 110 | elif (format != "tagdone" and (line.startswith("Subject: ") or |
|
110 | 111 | line.startswith("subject: "))): |
@@ -27,6 +27,38 b' cd repo' | |||
|
27 | 27 | echo % qimport non-existing-file |
|
28 | 28 | hg qimport non-existing-file |
|
29 | 29 | |
|
30 | echo % import email | |
|
31 | hg qimport --push -n email - <<EOF | |
|
32 | From: Username in email <test@example.net> | |
|
33 | Subject: [PATCH] Message in email | |
|
34 | Date: Fri, 02 Jan 1970 00:00:00 +0000 | |
|
35 | ||
|
36 | Text before patch. | |
|
37 | ||
|
38 | # HG changeset patch | |
|
39 | # User Username in patch <test@example.net> | |
|
40 | # Date 0 0 | |
|
41 | # Node ID 1a706973a7d84cb549823634a821d9bdf21c6220 | |
|
42 | # Parent 0000000000000000000000000000000000000000 | |
|
43 | First line of commit message. | |
|
44 | ||
|
45 | More text in commit message. | |
|
46 | ||
|
47 | diff --git a/x b/x | |
|
48 | new file mode 100644 | |
|
49 | --- /dev/null | |
|
50 | +++ b/x | |
|
51 | @@ -0,0 +1,1 @@ | |
|
52 | +new file | |
|
53 | Text after patch. | |
|
54 | ||
|
55 | EOF | |
|
56 | ||
|
57 | echo % hg tip -v | |
|
58 | hg tip -v | |
|
59 | hg qpop | |
|
60 | hg qdelete email | |
|
61 | ||
|
30 | 62 | echo % import URL |
|
31 | 63 | echo foo >> foo |
|
32 | 64 | hg add foo |
@@ -1,5 +1,25 b'' | |||
|
1 | 1 | % qimport non-existing-file |
|
2 | 2 | abort: unable to read non-existing-file |
|
3 | % import email | |
|
4 | adding email to series file | |
|
5 | applying email | |
|
6 | now at: email | |
|
7 | % hg tip -v | |
|
8 | changeset: 0:1a706973a7d8 | |
|
9 | tag: qtip | |
|
10 | tag: tip | |
|
11 | tag: email | |
|
12 | tag: qbase | |
|
13 | user: Username in patch <test@example.net> | |
|
14 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
15 | files: x | |
|
16 | description: | |
|
17 | First line of commit message. | |
|
18 | ||
|
19 | More text in commit message. | |
|
20 | ||
|
21 | ||
|
22 | patch queue now empty | |
|
3 | 23 | % import URL |
|
4 | 24 | adding url.diff to series file |
|
5 | 25 | url.diff |
General Comments 0
You need to be logged in to leave comments.
Login now