Mercurial > hg
comparison tests/test-mq-header-from @ 5673:dd3ce7515f4d
mq: add --currentuser and --user options to qnew and qrefresh
These options make qnew and qrefresh add/update the "From:" header (or, if present,
the "# User" header). This allows proper attribution of patches in patch queues
with multiple contributors.
author | peter.arrenbrecht@gmail.com |
---|---|
date | Wed, 19 Dec 2007 22:36:18 +0100 |
parents | |
children | 38b592536a58 |
comparison
equal
deleted
inserted
replaced
5653:1b35bc1c1968 | 5673:dd3ce7515f4d |
---|---|
1 #!/bin/sh | |
2 | |
3 echo "[extensions]" >> $HGRCPATH | |
4 echo "mq=" >> $HGRCPATH | |
5 echo "[diff]" >> $HGRCPATH | |
6 echo "nodates=true" >> $HGRCPATH | |
7 | |
8 | |
9 catlog() { | |
10 cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" | |
11 hg log --template "{rev}: {desc} - {author}\n" | |
12 } | |
13 | |
14 | |
15 echo ==== init | |
16 hg init a | |
17 cd a | |
18 hg qinit | |
19 | |
20 | |
21 echo ==== qnew -U | |
22 hg qnew -U 1.patch | |
23 catlog 1 | |
24 | |
25 echo ==== qref | |
26 echo "1" >1 | |
27 hg add | |
28 hg qref | |
29 catlog 1 | |
30 | |
31 echo ==== qref -u | |
32 hg qref -u mary | |
33 catlog 1 | |
34 | |
35 echo ==== qnew | |
36 hg qnew 2.patch | |
37 echo "2" >2 | |
38 hg add | |
39 hg qref | |
40 catlog 2 | |
41 | |
42 echo ==== qref -u | |
43 hg qref -u jane | |
44 catlog 2 | |
45 | |
46 | |
47 echo ==== qnew -U -m | |
48 hg qnew -U -m "Three" 3.patch | |
49 catlog 3 | |
50 | |
51 echo ==== qref | |
52 echo "3" >3 | |
53 hg add | |
54 hg qref | |
55 catlog 3 | |
56 | |
57 echo ==== qref -m | |
58 hg qref -m "Drei" | |
59 catlog 3 | |
60 | |
61 echo ==== qref -u | |
62 hg qref -u mary | |
63 catlog 3 | |
64 | |
65 echo ==== qref -u -m | |
66 hg qref -u maria -m "Three (again)" | |
67 catlog 3 | |
68 | |
69 echo ==== qnew -m | |
70 hg qnew -m "Four" 4.patch | |
71 echo "4" >4 | |
72 hg add | |
73 hg qref | |
74 catlog 4 | |
75 | |
76 echo ==== qref -u | |
77 hg qref -u jane | |
78 catlog 4 | |
79 | |
80 | |
81 echo ==== qnew with HG header | |
82 hg qnew 5.patch | |
83 hg qpop | |
84 echo "# HG changeset patch" >>.hg/patches/5.patch | |
85 echo "# User johndoe" >>.hg/patches/5.patch | |
86 # Drop patch specific error line | |
87 hg qpush 2>&1 | grep -v garbage | |
88 catlog 5 | |
89 | |
90 echo ==== hg qref | |
91 echo "5" >5 | |
92 hg add | |
93 hg qref | |
94 catlog 5 | |
95 | |
96 echo ==== hg qref -U | |
97 hg qref -U | |
98 catlog 5 | |
99 | |
100 echo ==== hg qref -u | |
101 hg qref -u johndeere | |
102 catlog 5 | |
103 | |
104 | |
105 echo ==== "qpop -a / qpush -a" | |
106 hg qpop -a | |
107 hg qpush -a | |
108 hg log --template "{rev}: {desc} - {author}\n" |