author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
Sat, 06 Feb 2010 19:00:50 +0100 | |
changeset 10345 | bc2866bdf3e0 |
parent 10190 | 9c2c94934f0d |
child 10397 | 8cb81d75730c |
permissions | -rwxr-xr-x |
8426 | 1 |
#!/bin/sh |
2 |
||
3 |
echo "[extensions]" >> $HGRCPATH |
|
4 |
echo "mq=" >> $HGRCPATH |
|
10190
9c2c94934f0d
mq: upgrade to git patch when necessary (issue767)
Patrick Mezard <pmezard@gmail.com>
parents:
10186
diff
changeset
|
5 |
echo "[mq]" >> $HGRCPATH |
9c2c94934f0d
mq: upgrade to git patch when necessary (issue767)
Patrick Mezard <pmezard@gmail.com>
parents:
10186
diff
changeset
|
6 |
echo "git=keep" >> $HGRCPATH |
8426 | 7 |
|
8 |
filterdiff() |
|
9 |
{ |
|
10 |
grep -v diff | \ |
|
11 |
sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
12 |
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
|
13 |
} |
|
14 |
||
15 |
echo '% init' |
|
16 |
hg init repo |
|
17 |
cd repo |
|
18 |
echo a > a |
|
19 |
hg ci -Am adda |
|
20 |
echo a >> a |
|
21 |
hg qnew -f p1 |
|
22 |
echo b >> a |
|
23 |
hg qnew -f p2 |
|
24 |
echo c >> a |
|
25 |
hg qnew -f p3 |
|
26 |
echo '% fold in the middle of the queue' |
|
27 |
hg qpop p1 |
|
28 |
hg qdiff | filterdiff |
|
29 |
hg qfold p2 |
|
10186
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
30 |
grep git .hg/patches/p1 && echo 'git patch found!' |
8426 | 31 |
hg qser |
32 |
hg qdiff | filterdiff |
|
33 |
echo '% fold with local changes' |
|
34 |
echo d >> a |
|
35 |
hg qfold p3 |
|
36 |
hg diff -c . | filterdiff |
|
10186
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
37 |
hg revert -a --no-backup |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
38 |
|
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
39 |
echo '% fold git patch into a regular patch, expect git patch' |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
40 |
echo a >> a |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
41 |
hg qnew -f regular |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
42 |
hg cp a aa |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
43 |
hg qnew --git -f git |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
44 |
hg qpop |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
45 |
hg qfold git |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
46 |
cat .hg/patches/regular |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
47 |
hg qpop |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
48 |
hg qdel regular |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
49 |
|
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
50 |
echo '% fold regular patch into a git patch, expect git patch' |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
51 |
hg cp a aa |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
52 |
hg qnew --git -f git |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
53 |
echo b >> aa |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
54 |
hg qnew -f regular |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
55 |
hg qpop |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
56 |
hg qfold regular |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
57 |
cat .hg/patches/git |
296a0b14a686
mq: preserve --git flag when folding patches
Patrick Mezard <pmezard@gmail.com>
parents:
8426
diff
changeset
|
58 |
|
8426 | 59 |
cd .. |
60 |
||
61 |