Mercurial > hg
annotate tests/test-mq-symlinks.t @ 26228:0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
One of the things I missed the most when transitioning from versioned MQ to
evolve was the loss of being able to check that rebase conflicts were properly
resolved by:
$ hg ci --mq -m "before"
$ hg rebase -s qbase -d tip
$ hg bcompare --mq
The old csets stay in the tree with evolve, but a straight diff includes all of
the other changes that were pulled in, obscuring the code that was rebased.
Diffing deltas can be confusing, but unless radical changes were made during the
resolve, it is very clear when individual hunks are added, dropped or modified.
Unlike the MQ technique, this can only compare a single pair of csets/patches at
a time. Like the MQ method, this also highlights changes in the commit comment
and other metadata.
I originally tried monkey patching from the evolve extension, but that is too
complicated given that it depends on the order the two different extensions are
loaded. This functionality is also useful when comparing grafts however, so
implementing it in the core is more than just convenience.
The --change argument doesn't make much sense for this, but it isn't harmful so
I didn't bother blocking it. The -I/-X options are ignored because of a
limitation of cmdutil.export(). We'll fix that next.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 09 Sep 2015 21:07:38 -0400 |
parents | 4d2b9b304ad0 |
children | c2380b448265 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
18395
diff
changeset
|
1 #require symlink |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
2 |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
3 $ echo "[extensions]" >> $HGRCPATH |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
4 $ echo "mq=" >> $HGRCPATH |
5157
f6c520fd70cf
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
6 $ hg init |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
7 $ hg qinit |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
8 $ hg qnew base.patch |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
9 $ echo aaa > a |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
10 $ echo bbb > b |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
11 $ echo ccc > c |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
12 $ hg add a b c |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
13 $ hg qrefresh |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23749
diff
changeset
|
14 $ readlink.py a |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
15 a -> a not a symlink |
6360
95413879bac9
test-mq-symlinks: skip if symlinks are not supported
Patrick Mezard <pmezard@gmail.com>
parents:
5683
diff
changeset
|
16 |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
17 |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
18 test replacing a file with a symlink |
5157
f6c520fd70cf
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
19 |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
20 $ hg qnew symlink.patch |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
21 $ rm a |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
22 $ ln -s b a |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
23 $ hg qrefresh --git |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23749
diff
changeset
|
24 $ readlink.py a |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
25 a -> b |
5157
f6c520fd70cf
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
26 |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
27 $ hg qpop |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
28 popping symlink.patch |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
29 now at: base.patch |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
30 $ hg qpush |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
31 applying symlink.patch |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
32 now at: symlink.patch |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23749
diff
changeset
|
33 $ readlink.py a |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
34 a -> b |
5157
f6c520fd70cf
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
35 |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
36 |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
37 test updating a symlink |
7517
49f34b43cf90
patch: handle git patches that remove symlinks (issue1438)
Brendan Cully <brendan@kublai.com>
parents:
6360
diff
changeset
|
38 |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
39 $ rm a |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
40 $ ln -s c a |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
41 $ hg qnew --git -f updatelink |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23749
diff
changeset
|
42 $ readlink.py a |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
43 a -> c |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
44 $ hg qpop |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
45 popping updatelink |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
46 now at: symlink.patch |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
47 $ hg qpush --debug |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
48 applying updatelink |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
49 patching file a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
22046
diff
changeset
|
50 committing files: |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
51 a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
22046
diff
changeset
|
52 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
22046
diff
changeset
|
53 committing changelog |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
54 now at: updatelink |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23749
diff
changeset
|
55 $ readlink.py a |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
56 a -> c |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
57 $ hg st |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
58 |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
59 |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
60 test replacing a symlink with a file |
9586
d08099e74b81
patch: handle symlink updates/replacements (issue1785)
Patrick Mezard <pmezard@gmail.com>
parents:
9585
diff
changeset
|
61 |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
62 $ ln -s c s |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
63 $ hg add s |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
64 $ hg qnew --git -f addlink |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
65 $ rm s |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
66 $ echo sss > s |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
67 $ hg qnew --git -f replacelinkwithfile |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
68 $ hg qpop |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
69 popping replacelinkwithfile |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
70 now at: addlink |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
71 $ hg qpush |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
72 applying replacelinkwithfile |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
73 now at: replacelinkwithfile |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
74 $ cat s |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
75 sss |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
76 $ hg st |
9586
d08099e74b81
patch: handle symlink updates/replacements (issue1785)
Patrick Mezard <pmezard@gmail.com>
parents:
9585
diff
changeset
|
77 |
11908
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
78 |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
79 test symlink removal |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
80 |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
81 $ hg qnew removesl.patch |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
82 $ hg rm a |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
83 $ hg qrefresh --git |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
84 $ hg qpop |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
85 popping removesl.patch |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
86 now at: replacelinkwithfile |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
87 $ hg qpush |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
88 applying removesl.patch |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
89 now at: removesl.patch |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
90 $ hg st -c |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
91 C b |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
92 C c |
7f48f0b188c6
tests: unify test-mq-symlinks
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10397
diff
changeset
|
93 C s |
12345 | 94 |
95 replace broken symlink with another broken symlink | |
12340
b0bb72460c44
patch: fix target when patching broken symlinks (issue2368)
Patrick Mezard <pmezard@gmail.com>
parents:
10397
diff
changeset
|
96 |
12345 | 97 $ ln -s linka linka |
98 $ hg add linka | |
99 $ hg qnew link | |
100 $ hg mv linka linkb | |
12398 | 101 $ rm linkb |
102 $ ln -s linkb linkb | |
12345 | 103 $ hg qnew movelink |
104 $ hg qpop | |
105 popping movelink | |
106 now at: link | |
107 $ hg qpush | |
108 applying movelink | |
109 now at: movelink | |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
23749
diff
changeset
|
110 $ readlink.py linkb |
12345 | 111 linkb -> linkb |