Show More
@@ -1,79 +1,80 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | . "$TESTDIR/histedit-helpers.sh" |
|
3 | . "$TESTDIR/histedit-helpers.sh" | |
4 |
|
4 | |||
5 | cat >> $HGRCPATH <<EOF |
|
5 | cat >> $HGRCPATH <<EOF | |
6 | [extensions] |
|
6 | [extensions] | |
7 | graphlog= |
|
7 | graphlog= | |
8 | histedit= |
|
8 | histedit= | |
9 | EOF |
|
9 | EOF | |
10 |
|
10 | |||
11 | EDITED=`pwd`/editedhistory |
|
11 | EDITED=`pwd`/editedhistory | |
12 | cat > $EDITED <<EOF |
|
12 | cat > $EDITED <<EOF | |
13 | pick 177f92b77385 c |
|
13 | pick 177f92b77385 c | |
14 | pick 055a42cdd887 d |
|
14 | pick 055a42cdd887 d | |
15 | edit e860deea161a e |
|
15 | edit e860deea161a e | |
16 | pick 652413bf663e f |
|
16 | pick 652413bf663e f | |
17 | EOF |
|
17 | EOF | |
18 | initrepo () |
|
18 | initrepo () | |
19 | { |
|
19 | { | |
20 | hg init r |
|
20 | hg init r | |
21 | cd r |
|
21 | cd r | |
22 | for x in a b c d e f ; do |
|
22 | for x in a b c d e f ; do | |
23 | echo $x > $x |
|
23 | echo $x > $x | |
24 | hg add $x |
|
24 | hg add $x | |
25 | hg ci -m $x |
|
25 | hg ci -m $x | |
26 | done |
|
26 | done | |
27 | } |
|
27 | } | |
28 |
|
28 | |||
29 | initrepo |
|
29 | initrepo | |
30 |
|
30 | |||
31 | echo % log before edit |
|
31 | echo % log before edit | |
32 | hg log --graph |
|
32 | hg log --graph | |
33 |
|
33 | |||
34 | echo % edit the history |
|
34 | echo % edit the history | |
35 | HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle |
|
35 | HGEDITOR="cat $EDITED > " hg histedit 177f92b77385 2>&1 | fixbundle | |
36 |
|
36 | |||
37 | echo % edit the revision |
|
37 | echo % commit, then edit the revision | |
|
38 | hg ci -m 'wat' | |||
38 | echo a > e |
|
39 | echo a > e | |
39 | HGEDITOR='echo "foobaz" > ' hg histedit --continue 2>&1 | fixbundle |
|
40 | HGEDITOR='echo "foobaz" > ' hg histedit --continue 2>&1 | fixbundle | |
40 |
|
41 | |||
41 | hg log --graph |
|
42 | hg log --graph | |
42 |
|
43 | |||
43 | echo '% contents of e:' |
|
44 | echo '% contents of e:' | |
44 | hg cat e |
|
45 | hg cat e | |
45 |
|
46 | |||
46 | cat > $EDITED <<EOF |
|
47 | cat > $EDITED <<EOF | |
47 | edit c38516e9ed62 f |
|
48 | edit bf757c081cd0 f | |
48 | EOF |
|
49 | EOF | |
49 | HGEDITOR="cat $EDITED > " hg histedit tip 2>&1 | fixbundle |
|
50 | HGEDITOR="cat $EDITED > " hg histedit tip 2>&1 | fixbundle | |
50 | hg status |
|
51 | hg status | |
51 | HGEDITOR='true' hg histedit --continue |
|
52 | HGEDITOR='true' hg histedit --continue | |
52 | hg status |
|
53 | hg status | |
53 |
|
54 | |||
54 | echo % log after edit |
|
55 | echo % log after edit | |
55 | hg log --limit 1 |
|
56 | hg log --limit 1 | |
56 |
|
57 | |||
57 | echo "% say we'll change the message, but don't." |
|
58 | echo "% say we'll change the message, but don't." | |
58 | cat > ../edit.sh <<EOF |
|
59 | cat > ../edit.sh <<EOF | |
59 | #!/bin/sh |
|
60 | #!/bin/sh | |
60 | cat \$1 | sed s/pick/mess/ > tmp |
|
61 | cat \$1 | sed s/pick/mess/ > tmp | |
61 | mv tmp \$1 |
|
62 | mv tmp \$1 | |
62 | EOF |
|
63 | EOF | |
63 | chmod +x ../edit.sh |
|
64 | chmod +x ../edit.sh | |
64 | HGEDITOR="../edit.sh" hg histedit tip 2>&1 | fixbundle |
|
65 | HGEDITOR="../edit.sh" hg histedit tip 2>&1 | fixbundle | |
65 | hg status |
|
66 | hg status | |
66 | hg log --limit 1 |
|
67 | hg log --limit 1 | |
67 |
|
68 | |||
68 | echo % modify the message |
|
69 | echo % modify the message | |
69 | cat > $EDITED <<EOF |
|
70 | cat > $EDITED <<EOF | |
70 | mess c38516e9ed62 f |
|
71 | mess bf757c081cd0 f | |
71 | EOF |
|
72 | EOF | |
72 | HGEDITOR="cat $EDITED > " hg histedit tip 2>&1 | fixbundle |
|
73 | HGEDITOR="cat $EDITED > " hg histedit tip 2>&1 | fixbundle | |
73 | hg status |
|
74 | hg status | |
74 | hg log --limit 1 |
|
75 | hg log --limit 1 | |
75 |
|
76 | |||
76 | echo % rollback should not work after a histedit |
|
77 | echo % rollback should not work after a histedit | |
77 | hg rollback |
|
78 | hg rollback | |
78 |
|
79 | |||
79 | echo % EOF |
|
80 | echo % EOF |
@@ -1,105 +1,111 b'' | |||||
1 | % log before edit |
|
1 | % log before edit | |
2 | @ changeset: 5:652413bf663e |
|
2 | @ changeset: 5:652413bf663e | |
3 | | tag: tip |
|
3 | | tag: tip | |
4 | | user: test |
|
4 | | user: test | |
5 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
5 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
6 | | summary: f |
|
6 | | summary: f | |
7 | | |
|
7 | | | |
8 | o changeset: 4:e860deea161a |
|
8 | o changeset: 4:e860deea161a | |
9 | | user: test |
|
9 | | user: test | |
10 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
10 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
11 | | summary: e |
|
11 | | summary: e | |
12 | | |
|
12 | | | |
13 | o changeset: 3:055a42cdd887 |
|
13 | o changeset: 3:055a42cdd887 | |
14 | | user: test |
|
14 | | user: test | |
15 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
15 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
16 | | summary: d |
|
16 | | summary: d | |
17 | | |
|
17 | | | |
18 | o changeset: 2:177f92b77385 |
|
18 | o changeset: 2:177f92b77385 | |
19 | | user: test |
|
19 | | user: test | |
20 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
20 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
21 | | summary: c |
|
21 | | summary: c | |
22 | | |
|
22 | | | |
23 | o changeset: 1:d2ae7f538514 |
|
23 | o changeset: 1:d2ae7f538514 | |
24 | | user: test |
|
24 | | user: test | |
25 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
25 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
26 | | summary: b |
|
26 | | summary: b | |
27 | | |
|
27 | | | |
28 | o changeset: 0:cb9a9f314b8b |
|
28 | o changeset: 0:cb9a9f314b8b | |
29 | user: test |
|
29 | user: test | |
30 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
30 | date: Thu Jan 01 00:00:00 1970 +0000 | |
31 | summary: a |
|
31 | summary: a | |
32 |
|
32 | |||
33 | % edit the history |
|
33 | % edit the history | |
34 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
34 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
35 | abort: Make changes as needed, you may commit or record as needed now. |
|
35 | abort: Make changes as needed, you may commit or record as needed now. | |
36 | When you are finished, run hg histedit --continue to resume. |
|
36 | When you are finished, run hg histedit --continue to resume. | |
37 | % edit the revision |
|
37 | % commit, then edit the revision | |
|
38 | created new head | |||
38 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
39 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
39 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
40 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
40 |
@ changeset: |
|
41 | @ changeset: 6:bf757c081cd0 | |
41 | | tag: tip |
|
42 | | tag: tip | |
42 | | user: test |
|
43 | | user: test | |
43 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
44 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
44 | | summary: f |
|
45 | | summary: f | |
45 | | |
|
46 | | | |
46 |
o changeset: |
|
47 | o changeset: 5:d6b15fed32d4 | |
47 | | user: test |
|
48 | | user: test | |
48 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
49 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
49 | | summary: foobaz |
|
50 | | summary: foobaz | |
50 | | |
|
51 | | | |
|
52 | o changeset: 4:1a60820cd1f6 | |||
|
53 | | user: test | |||
|
54 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
55 | | summary: wat | |||
|
56 | | | |||
51 | o changeset: 3:055a42cdd887 |
|
57 | o changeset: 3:055a42cdd887 | |
52 | | user: test |
|
58 | | user: test | |
53 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
59 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
54 | | summary: d |
|
60 | | summary: d | |
55 | | |
|
61 | | | |
56 | o changeset: 2:177f92b77385 |
|
62 | o changeset: 2:177f92b77385 | |
57 | | user: test |
|
63 | | user: test | |
58 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
64 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
59 | | summary: c |
|
65 | | summary: c | |
60 | | |
|
66 | | | |
61 | o changeset: 1:d2ae7f538514 |
|
67 | o changeset: 1:d2ae7f538514 | |
62 | | user: test |
|
68 | | user: test | |
63 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
69 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
64 | | summary: b |
|
70 | | summary: b | |
65 | | |
|
71 | | | |
66 | o changeset: 0:cb9a9f314b8b |
|
72 | o changeset: 0:cb9a9f314b8b | |
67 | user: test |
|
73 | user: test | |
68 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
74 | date: Thu Jan 01 00:00:00 1970 +0000 | |
69 | summary: a |
|
75 | summary: a | |
70 |
|
76 | |||
71 | % contents of e: |
|
77 | % contents of e: | |
72 | a |
|
78 | a | |
73 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
79 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
74 | abort: Make changes as needed, you may commit or record as needed now. |
|
80 | abort: Make changes as needed, you may commit or record as needed now. | |
75 | When you are finished, run hg histedit --continue to resume. |
|
81 | When you are finished, run hg histedit --continue to resume. | |
76 | A f |
|
82 | A f | |
77 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
83 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
78 | % log after edit |
|
84 | % log after edit | |
79 |
changeset: |
|
85 | changeset: 6:bf757c081cd0 | |
80 | tag: tip |
|
86 | tag: tip | |
81 | user: test |
|
87 | user: test | |
82 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
88 | date: Thu Jan 01 00:00:00 1970 +0000 | |
83 | summary: f |
|
89 | summary: f | |
84 |
|
90 | |||
85 | % say we'll change the message, but don't. |
|
91 | % say we'll change the message, but don't. | |
86 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
92 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
87 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
93 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
88 |
changeset: |
|
94 | changeset: 6:bf757c081cd0 | |
89 | tag: tip |
|
95 | tag: tip | |
90 | user: test |
|
96 | user: test | |
91 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
97 | date: Thu Jan 01 00:00:00 1970 +0000 | |
92 | summary: f |
|
98 | summary: f | |
93 |
|
99 | |||
94 | % modify the message |
|
100 | % modify the message | |
95 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
101 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
96 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
102 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
97 |
changeset: |
|
103 | changeset: 6:0b16746f8e89 | |
98 | tag: tip |
|
104 | tag: tip | |
99 | user: test |
|
105 | user: test | |
100 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
106 | date: Thu Jan 01 00:00:00 1970 +0000 | |
101 |
summary: mess |
|
107 | summary: mess bf757c081cd0 f | |
102 |
|
108 | |||
103 | % rollback should not work after a histedit |
|
109 | % rollback should not work after a histedit | |
104 | no rollback information available |
|
110 | no rollback information available | |
105 | % EOF |
|
111 | % EOF |
General Comments 0
You need to be logged in to leave comments.
Login now