Mercurial > hg
annotate tests/test-commit-interactive.t @ 28219:97fe88806f6f
check-code: allow old style class with special comments
The following chgserver change will use an old style class to comply with
SocketServer's code style. This patch made it possible to pass check-code.
author | Jun Wu <quark@fb.com> |
---|---|
date | Wed, 24 Feb 2016 18:42:14 +0000 |
parents | baa9810ee3ec |
children | 44611ad4fbd9 |
rev | line source |
---|---|
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
1 Set up a repo |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
23172
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
23054
diff
changeset
|
3 $ cat <<EOF >> $HGRCPATH |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
23054
diff
changeset
|
4 > [ui] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
23054
diff
changeset
|
5 > interactive = true |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
23054
diff
changeset
|
6 > [extensions] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
23054
diff
changeset
|
7 > record = |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
23054
diff
changeset
|
8 > EOF |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
10 $ hg init a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
11 $ cd a |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
13 Select no files |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
15 $ touch empty-rw |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
16 $ hg add empty-rw |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 |
25796
4eb8d8a44bf1
record: omit meaningless 'commit' suggestion at 'hg commit -i'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25759
diff
changeset
|
18 $ hg record --config ui.interactive=false |
4eb8d8a44bf1
record: omit meaningless 'commit' suggestion at 'hg commit -i'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25759
diff
changeset
|
19 abort: running non-interactively, use commit instead |
4eb8d8a44bf1
record: omit meaningless 'commit' suggestion at 'hg commit -i'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25759
diff
changeset
|
20 [255] |
4eb8d8a44bf1
record: omit meaningless 'commit' suggestion at 'hg commit -i'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25759
diff
changeset
|
21 $ hg commit -i --config ui.interactive=false |
4eb8d8a44bf1
record: omit meaningless 'commit' suggestion at 'hg commit -i'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25759
diff
changeset
|
22 abort: running non-interactively |
4eb8d8a44bf1
record: omit meaningless 'commit' suggestion at 'hg commit -i'
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25759
diff
changeset
|
23 [255] |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
24 $ hg commit -i empty-rw<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
25 > n |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
26 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
27 diff --git a/empty-rw b/empty-rw |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
28 new file mode 100644 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
29 examine changes to 'empty-rw'? [Ynesfdaq?] n |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
30 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
31 no changes to record |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
32 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
33 $ hg tip -p |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
34 changeset: -1:000000000000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
35 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
36 user: |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
37 date: Thu Jan 01 00:00:00 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
38 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
39 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
40 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
41 Select files but no hunks |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
42 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
43 $ hg commit -i empty-rw<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
44 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
45 > n |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
46 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
47 diff --git a/empty-rw b/empty-rw |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
48 new file mode 100644 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
49 examine changes to 'empty-rw'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
50 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
51 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12074
diff
changeset
|
52 [255] |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
53 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
54 $ hg tip -p |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
55 changeset: -1:000000000000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
56 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
57 user: |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
58 date: Thu Jan 01 00:00:00 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
59 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
60 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
61 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
62 Record empty file |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
63 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
64 $ hg commit -i -d '0 0' -m empty empty-rw<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
65 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
66 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
67 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
68 diff --git a/empty-rw b/empty-rw |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
69 new file mode 100644 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
70 examine changes to 'empty-rw'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
71 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
72 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
73 $ hg tip -p |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
74 changeset: 0:c0708cf4e46e |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
75 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
76 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
77 date: Thu Jan 01 00:00:00 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
78 summary: empty |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
79 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
80 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
81 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
82 Summary shows we updated to the new cset |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
83 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
84 $ hg summary |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
85 parent: 0:c0708cf4e46e tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
86 empty |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
87 branch: default |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
88 commit: (clean) |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
89 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25111
diff
changeset
|
90 phases: 1 draft |
10964
aa0426c79664
test-record: add hg summary to verify we update dirstate
Augie Fackler <durin42@gmail.com>
parents:
8811
diff
changeset
|
91 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
92 Rename empty file |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
93 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
94 $ hg mv empty-rw empty-rename |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
95 $ hg commit -i -d '1 0' -m rename<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
96 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
97 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
98 diff --git a/empty-rw b/empty-rename |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
99 rename from empty-rw |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
100 rename to empty-rename |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
101 examine changes to 'empty-rw' and 'empty-rename'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
102 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
103 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
104 $ hg tip -p |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
105 changeset: 1:d695e8dcb197 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
106 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
107 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
108 date: Thu Jan 01 00:00:01 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
109 summary: rename |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
110 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
111 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
112 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
113 Copy empty file |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
114 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
115 $ hg cp empty-rename empty-copy |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
116 $ hg commit -i -d '2 0' -m copy<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
117 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
118 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
119 diff --git a/empty-rename b/empty-copy |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
120 copy from empty-rename |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
121 copy to empty-copy |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
122 examine changes to 'empty-rename' and 'empty-copy'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
123 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
124 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
125 $ hg tip -p |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
126 changeset: 2:1d4b90bea524 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
127 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
128 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
129 date: Thu Jan 01 00:00:02 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
130 summary: copy |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
131 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
132 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
133 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
134 Delete empty file |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
135 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
136 $ hg rm empty-copy |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
137 $ hg commit -i -d '3 0' -m delete<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
138 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
139 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
140 diff --git a/empty-copy b/empty-copy |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
141 deleted file mode 100644 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
142 examine changes to 'empty-copy'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
143 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
144 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
145 $ hg tip -p |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
146 changeset: 3:b39a238f01a1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
147 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
148 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
149 date: Thu Jan 01 00:00:03 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
150 summary: delete |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
151 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
152 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
153 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
154 Add binary file |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
155 |
26863
0879bf38ec84
test: enforce bundle1 in "test-commit-interactive.t"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25796
diff
changeset
|
156 $ hg bundle --type v1 --base -2 tip.bundle |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
157 1 changesets found |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
158 $ hg add tip.bundle |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
159 $ hg commit -i -d '4 0' -m binary<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
160 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
161 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
162 diff --git a/tip.bundle b/tip.bundle |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
163 new file mode 100644 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
164 this is a binary file |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
165 examine changes to 'tip.bundle'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
166 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
167 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
168 $ hg tip -p |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
169 changeset: 4:ad816da3711e |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
170 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
171 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
172 date: Thu Jan 01 00:00:04 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
173 summary: binary |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
174 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
175 diff -r b39a238f01a1 -r ad816da3711e tip.bundle |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
176 Binary file tip.bundle has changed |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
177 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
178 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
179 Change binary file |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
180 |
26863
0879bf38ec84
test: enforce bundle1 in "test-commit-interactive.t"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25796
diff
changeset
|
181 $ hg bundle --base -2 --type v1 tip.bundle |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
182 1 changesets found |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
183 $ hg commit -i -d '5 0' -m binary-change<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
184 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
185 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
186 diff --git a/tip.bundle b/tip.bundle |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
187 this modifies a binary file (all or nothing) |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
188 examine changes to 'tip.bundle'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
189 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
190 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
191 $ hg tip -p |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
192 changeset: 5:dccd6f3eb485 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
193 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
194 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
195 date: Thu Jan 01 00:00:05 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
196 summary: binary-change |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
197 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
198 diff -r ad816da3711e -r dccd6f3eb485 tip.bundle |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
199 Binary file tip.bundle has changed |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
200 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
201 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
202 Rename and change binary file |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
203 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
204 $ hg mv tip.bundle top.bundle |
26863
0879bf38ec84
test: enforce bundle1 in "test-commit-interactive.t"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25796
diff
changeset
|
205 $ hg bundle --base -2 --type v1 top.bundle |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
206 1 changesets found |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
207 $ hg commit -i -d '6 0' -m binary-change-rename<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
208 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
209 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
210 diff --git a/tip.bundle b/top.bundle |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
211 rename from tip.bundle |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
212 rename to top.bundle |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
213 this modifies a binary file (all or nothing) |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
214 examine changes to 'tip.bundle' and 'top.bundle'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
215 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
216 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
217 $ hg tip -p |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
218 changeset: 6:7fa44105f5b3 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
219 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
220 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
221 date: Thu Jan 01 00:00:06 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
222 summary: binary-change-rename |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
223 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
224 diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
225 Binary file tip.bundle has changed |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
226 diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
227 Binary file top.bundle has changed |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
228 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
229 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
230 Add plain file |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
231 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
232 $ for i in 1 2 3 4 5 6 7 8 9 10; do |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
233 > echo $i >> plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
234 > done |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
235 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
236 $ hg add plain |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
237 $ hg commit -i -d '7 0' -m plain plain<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
238 > y |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
239 > y |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
240 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
241 diff --git a/plain b/plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
242 new file mode 100644 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
243 examine changes to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
244 |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
245 @@ -0,0 +1,10 @@ |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
246 +1 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
247 +2 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
248 +3 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
249 +4 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
250 +5 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
251 +6 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
252 +7 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
253 +8 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
254 +9 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
255 +10 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
256 record this change to 'plain'? [Ynesfdaq?] y |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
257 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
258 $ hg tip -p |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
259 changeset: 7:11fb457c1be4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
260 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
261 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
262 date: Thu Jan 01 00:00:07 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
263 summary: plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
264 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
265 diff -r 7fa44105f5b3 -r 11fb457c1be4 plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
266 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
267 +++ b/plain Thu Jan 01 00:00:07 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
268 @@ -0,0 +1,10 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
269 +1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
270 +2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
271 +3 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
272 +4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
273 +5 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
274 +6 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
275 +7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
276 +8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
277 +9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
278 +10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
279 |
17446
3de04c07966a
record: checks for valid username before starting recording process (issue3456)
Sumeet <sumeet@fb.com>
parents:
16913
diff
changeset
|
280 Modify end of plain file with username unset |
3de04c07966a
record: checks for valid username before starting recording process (issue3456)
Sumeet <sumeet@fb.com>
parents:
16913
diff
changeset
|
281 |
3de04c07966a
record: checks for valid username before starting recording process (issue3456)
Sumeet <sumeet@fb.com>
parents:
16913
diff
changeset
|
282 $ echo 11 >> plain |
3de04c07966a
record: checks for valid username before starting recording process (issue3456)
Sumeet <sumeet@fb.com>
parents:
16913
diff
changeset
|
283 $ unset HGUSER |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
284 $ hg commit -i --config ui.username= -d '8 0' -m end plain |
20579
625533523c9e
tests: fix up config --edit breakage
Matt Mackall <mpm@selenic.com>
parents:
20266
diff
changeset
|
285 abort: no username supplied |
20580
b75a23eec9c9
ui: fix extra space in username abort
Matt Mackall <mpm@selenic.com>
parents:
20579
diff
changeset
|
286 (use "hg config --edit" to set your username) |
17446
3de04c07966a
record: checks for valid username before starting recording process (issue3456)
Sumeet <sumeet@fb.com>
parents:
16913
diff
changeset
|
287 [255] |
3de04c07966a
record: checks for valid username before starting recording process (issue3456)
Sumeet <sumeet@fb.com>
parents:
16913
diff
changeset
|
288 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
289 |
18266
09a2b6741695
record: use patch.diffopts to account for user diffopts
Denis Laxalde <denis@laxalde.org>
parents:
17446
diff
changeset
|
290 Modify end of plain file, also test that diffopts are accounted for |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
291 |
17446
3de04c07966a
record: checks for valid username before starting recording process (issue3456)
Sumeet <sumeet@fb.com>
parents:
16913
diff
changeset
|
292 $ HGUSER="test" |
3de04c07966a
record: checks for valid username before starting recording process (issue3456)
Sumeet <sumeet@fb.com>
parents:
16913
diff
changeset
|
293 $ export HGUSER |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
294 $ hg commit -i --config diff.showfunc=true -d '8 0' -m end plain <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
295 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
296 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
297 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
298 diff --git a/plain b/plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
299 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
300 examine changes to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
301 |
18266
09a2b6741695
record: use patch.diffopts to account for user diffopts
Denis Laxalde <denis@laxalde.org>
parents:
17446
diff
changeset
|
302 @@ -8,3 +8,4 @@ 7 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
303 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
304 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
305 10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
306 +11 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
307 record this change to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
308 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
309 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
310 Modify end of plain file, no EOL |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
311 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
312 $ hg tip --template '{node}' >> plain |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
313 $ hg commit -i -d '9 0' -m noeol plain <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
314 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
315 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
316 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
317 diff --git a/plain b/plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
318 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
319 examine changes to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
320 |
27411 | 321 @@ -9,3 +9,4 @@ 8 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
322 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
323 10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
324 11 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
325 +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
326 \ No newline at end of file |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
327 record this change to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
328 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
329 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
330 Record showfunc should preserve function across sections |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
331 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
332 $ cat > f1.py <<EOF |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
333 > def annotate(ui, repo, *pats, **opts): |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
334 > """show changeset information by line for each file |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
335 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
336 > List changes in files, showing the revision id responsible for |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
337 > each line. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
338 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
339 > This command is useful for discovering when a change was made and |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
340 > by whom. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
341 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
342 > If you include -f/-u/-d, the revision number is suppressed unless |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
343 > you also include -the revision number is suppressed unless |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
344 > you also include -n. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
345 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
346 > Without the -a/--text option, annotate will avoid processing files |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
347 > it detects as binary. With -a, annotate will annotate the file |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
348 > anyway, although the results will probably be neither useful |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
349 > nor desirable. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
350 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
351 > Returns 0 on success. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
352 > """ |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
353 > return 0 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
354 > def archive(ui, repo, dest, **opts): |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
355 > '''create an unversioned archive of a repository revision |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
356 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
357 > By default, the revision used is the parent of the working |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
358 > directory; use -r/--rev to specify a different revision. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
359 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
360 > The archive type is automatically detected based on file |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
361 > extension (to override, use -t/--type). |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
362 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
363 > .. container:: verbose |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
364 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
365 > Valid types are: |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
366 > EOF |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
367 $ hg add f1.py |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
368 $ hg commit -m funcs |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
369 $ cat > f1.py <<EOF |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
370 > def annotate(ui, repo, *pats, **opts): |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
371 > """show changeset information by line for each file |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
372 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
373 > List changes in files, showing the revision id responsible for |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
374 > each line |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
375 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
376 > This command is useful for discovering when a change was made and |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
377 > by whom. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
378 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
379 > Without the -a/--text option, annotate will avoid processing files |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
380 > it detects as binary. With -a, annotate will annotate the file |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
381 > anyway, although the results will probably be neither useful |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
382 > nor desirable. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
383 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
384 > Returns 0 on success. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
385 > """ |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
386 > return 0 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
387 > def archive(ui, repo, dest, **opts): |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
388 > '''create an unversioned archive of a repository revision |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
389 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
390 > By default, the revision used is the parent of the working |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
391 > directory; use -r/--rev to specify a different revision. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
392 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
393 > The archive type is automatically detected based on file |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
394 > extension (or override using -t/--type). |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
395 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
396 > .. container:: verbose |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
397 > |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
398 > Valid types are: |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
399 > EOF |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
400 $ hg commit -i -m interactive <<EOF |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
401 > y |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
402 > y |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
403 > y |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
404 > y |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
405 > EOF |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
406 diff --git a/f1.py b/f1.py |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
407 3 hunks, 6 lines changed |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
408 examine changes to 'f1.py'? [Ynesfdaq?] y |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
409 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
410 @@ -2,8 +2,8 @@ def annotate(ui, repo, *pats, **opts): |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
411 """show changeset information by line for each file |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
412 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
413 List changes in files, showing the revision id responsible for |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
414 - each line. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
415 + each line |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
416 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
417 This command is useful for discovering when a change was made and |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
418 by whom. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
419 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
420 record change 1/3 to 'f1.py'? [Ynesfdaq?] y |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
421 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
422 @@ -6,11 +6,7 @@ def annotate(ui, repo, *pats, **opts): |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
423 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
424 This command is useful for discovering when a change was made and |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
425 by whom. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
426 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
427 - If you include -f/-u/-d, the revision number is suppressed unless |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
428 - you also include -the revision number is suppressed unless |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
429 - you also include -n. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
430 - |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
431 Without the -a/--text option, annotate will avoid processing files |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
432 it detects as binary. With -a, annotate will annotate the file |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
433 anyway, although the results will probably be neither useful |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
434 record change 2/3 to 'f1.py'? [Ynesfdaq?] y |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
435 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
436 @@ -26,7 +22,7 @@ def archive(ui, repo, dest, **opts): |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
437 directory; use -r/--rev to specify a different revision. |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
438 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
439 The archive type is automatically detected based on file |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
440 - extension (to override, use -t/--type). |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
441 + extension (or override using -t/--type). |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
442 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
443 .. container:: verbose |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
444 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
445 record change 3/3 to 'f1.py'? [Ynesfdaq?] y |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
446 |
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
447 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
448 Modify end of plain file, add EOL |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
449 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
450 $ echo >> plain |
13292
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
451 $ echo 1 > plain2 |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
452 $ hg add plain2 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
453 $ hg commit -i -d '10 0' -m eol plain plain2 <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
454 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
455 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
456 > y |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
457 > y |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
458 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
459 diff --git a/plain b/plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
460 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
461 examine changes to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
462 |
27411 | 463 @@ -9,4 +9,4 @@ 8 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
464 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
465 10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
466 11 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
467 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
468 \ No newline at end of file |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
469 +7264f99c5f5ff3261504828afa4fb4d406c3af54 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
470 record change 1/2 to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
471 |
13292
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
472 diff --git a/plain2 b/plain2 |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
473 new file mode 100644 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
474 examine changes to 'plain2'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
475 |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
476 @@ -0,0 +1,1 @@ |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
477 +1 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
478 record change 2/2 to 'plain2'? [Ynesfdaq?] y |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
479 |
13292
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
480 Modify beginning, trim end, record both, add another file to test |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
481 changes numbering |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
482 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
483 $ rm plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
484 $ for i in 2 2 3 4 5 6 7 8 9 10; do |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
485 > echo $i >> plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
486 > done |
13292
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
487 $ echo 2 >> plain2 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
488 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
489 $ hg commit -i -d '10 0' -m begin-and-end plain plain2 <<EOF |
13292
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
490 > y |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
491 > y |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
492 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
493 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
494 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
495 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
496 diff --git a/plain b/plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
497 2 hunks, 3 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
498 examine changes to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
499 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
500 @@ -1,4 +1,4 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
501 -1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
502 +2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
503 2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
504 3 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
505 4 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
506 record change 1/3 to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
507 |
27411 | 508 @@ -8,5 +8,3 @@ 7 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
509 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
510 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
511 10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
512 -11 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
513 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
514 record change 2/3 to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
515 |
13292
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
516 diff --git a/plain2 b/plain2 |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
517 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
518 examine changes to 'plain2'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
519 |
13292
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
520 @@ -1,1 +1,2 @@ |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
521 1 |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
522 +2 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
523 record change 3/3 to 'plain2'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
524 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
525 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
526 $ hg tip -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
527 changeset: 13:f941910cff62 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
528 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
529 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
530 date: Thu Jan 01 00:00:10 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
531 summary: begin-and-end |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
532 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
533 diff -r 33abe24d946c -r f941910cff62 plain |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
534 --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
535 +++ b/plain Thu Jan 01 00:00:10 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
536 @@ -1,4 +1,4 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
537 -1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
538 +2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
539 2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
540 3 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
541 4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
542 @@ -8,5 +8,3 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
543 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
544 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
545 10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
546 -11 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
547 -7264f99c5f5ff3261504828afa4fb4d406c3af54 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
548 diff -r 33abe24d946c -r f941910cff62 plain2 |
13292
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
549 --- a/plain2 Thu Jan 01 00:00:10 1970 +0000 |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
550 +++ b/plain2 Thu Jan 01 00:00:10 1970 +0000 |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
551 @@ -1,1 +1,2 @@ |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
552 1 |
d32e09769048
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com>
parents:
13023
diff
changeset
|
553 +2 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
554 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
555 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
556 Trim beginning, modify end |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
557 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
558 $ rm plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
559 > for i in 4 5 6 7 8 9 10.new; do |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
560 > echo $i >> plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
561 > done |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
562 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
563 Record end |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
564 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
565 $ hg commit -i -d '11 0' -m end-only plain <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
566 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
567 > n |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
568 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
569 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
570 diff --git a/plain b/plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
571 2 hunks, 4 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
572 examine changes to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
573 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
574 @@ -1,9 +1,6 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
575 -2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
576 -2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
577 -3 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
578 4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
579 5 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
580 6 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
581 7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
582 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
583 9 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
584 record change 1/2 to 'plain'? [Ynesfdaq?] n |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
585 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
586 @@ -4,7 +1,7 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
587 4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
588 5 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
589 6 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
590 7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
591 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
592 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
593 -10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
594 +10.new |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
595 record change 2/2 to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
596 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
597 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
598 $ hg tip -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
599 changeset: 14:4915f538659b |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
600 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
601 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
602 date: Thu Jan 01 00:00:11 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
603 summary: end-only |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
604 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
605 diff -r f941910cff62 -r 4915f538659b plain |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
606 --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
607 +++ b/plain Thu Jan 01 00:00:11 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
608 @@ -7,4 +7,4 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
609 7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
610 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
611 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
612 -10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
613 +10.new |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
614 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
615 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
616 Record beginning |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
617 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
618 $ hg commit -i -d '12 0' -m begin-only plain <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
619 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
620 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
621 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
622 diff --git a/plain b/plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
623 1 hunks, 3 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
624 examine changes to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
625 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
626 @@ -1,6 +1,3 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
627 -2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
628 -2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
629 -3 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
630 4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
631 5 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
632 6 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
633 record this change to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
634 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
635 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
636 $ hg tip -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
637 changeset: 15:1b1f93d4b94b |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
638 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
639 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
640 date: Thu Jan 01 00:00:12 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
641 summary: begin-only |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
642 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
643 diff -r 4915f538659b -r 1b1f93d4b94b plain |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
644 --- a/plain Thu Jan 01 00:00:11 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
645 +++ b/plain Thu Jan 01 00:00:12 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
646 @@ -1,6 +1,3 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
647 -2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
648 -2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
649 -3 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
650 4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
651 5 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
652 6 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
653 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
654 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
655 Add to beginning, trim from end |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
656 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
657 $ rm plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
658 $ for i in 1 2 3 4 5 6 7 8 9; do |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
659 > echo $i >> plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
660 > done |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
661 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
662 Record end |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
663 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
664 $ hg commit -i --traceback -d '13 0' -m end-again plain<<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
665 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
666 > n |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
667 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
668 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
669 diff --git a/plain b/plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
670 2 hunks, 4 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
671 examine changes to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
672 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
673 @@ -1,6 +1,9 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
674 +1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
675 +2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
676 +3 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
677 4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
678 5 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
679 6 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
680 7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
681 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
682 9 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
683 record change 1/2 to 'plain'? [Ynesfdaq?] n |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
684 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
685 @@ -1,7 +4,6 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
686 4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
687 5 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
688 6 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
689 7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
690 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
691 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
692 -10.new |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
693 record change 2/2 to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
694 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
695 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
696 Add to beginning, middle, end |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
697 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
698 $ rm plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
699 $ for i in 1 2 3 4 5 5.new 5.reallynew 6 7 8 9 10 11; do |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
700 > echo $i >> plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
701 > done |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
702 |
23435
486a1fe09422
record: don't honor format-changing diffopts (issue4459)
Siddharth Agarwal <sid0@fb.com>
parents:
23172
diff
changeset
|
703 Record beginning, middle, and test that format-breaking diffopts are ignored |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
704 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
705 $ hg commit -i --config diff.noprefix=True -d '14 0' -m middle-only plain <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
706 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
707 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
708 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
709 > n |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
710 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
711 diff --git a/plain b/plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
712 3 hunks, 7 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
713 examine changes to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
714 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
715 @@ -1,2 +1,5 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
716 +1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
717 +2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
718 +3 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
719 4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
720 5 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
721 record change 1/3 to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
722 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
723 @@ -1,6 +4,8 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
724 4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
725 5 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
726 +5.new |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
727 +5.reallynew |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
728 6 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
729 7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
730 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
731 9 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
732 record change 2/3 to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
733 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
734 @@ -3,4 +8,6 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
735 6 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
736 7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
737 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
738 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
739 +10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
740 +11 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
741 record change 3/3 to 'plain'? [Ynesfdaq?] n |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
742 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
743 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
744 $ hg tip -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
745 changeset: 17:41cf3f5c55ae |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
746 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
747 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
748 date: Thu Jan 01 00:00:14 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
749 summary: middle-only |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
750 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
751 diff -r a69d252246e1 -r 41cf3f5c55ae plain |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
752 --- a/plain Thu Jan 01 00:00:13 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
753 +++ b/plain Thu Jan 01 00:00:14 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
754 @@ -1,5 +1,10 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
755 +1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
756 +2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
757 +3 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
758 4 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
759 5 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
760 +5.new |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
761 +5.reallynew |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
762 6 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
763 7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
764 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
765 |
5037
b2607267236d
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
766 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
767 Record end |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
768 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
769 $ hg commit -i -d '15 0' -m end-only plain <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
770 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
771 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
772 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
773 diff --git a/plain b/plain |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
774 1 hunks, 2 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
775 examine changes to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
776 |
27411 | 777 @@ -9,3 +9,5 @@ 6 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
778 7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
779 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
780 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
781 +10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
782 +11 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
783 record this change to 'plain'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
784 |
5128
c9126c24e098
record: work properly if invoked in a subdirectory
Bryan O'Sullivan <bos@serpentine.com>
parents:
5037
diff
changeset
|
785 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
786 $ hg tip -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
787 changeset: 18:58a72f46bc24 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
788 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
789 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
790 date: Thu Jan 01 00:00:15 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
791 summary: end-only |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
792 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
793 diff -r 41cf3f5c55ae -r 58a72f46bc24 plain |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
794 --- a/plain Thu Jan 01 00:00:14 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
795 +++ b/plain Thu Jan 01 00:00:15 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
796 @@ -9,3 +9,5 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
797 7 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
798 8 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
799 9 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
800 +10 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
801 +11 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
802 |
5128
c9126c24e098
record: work properly if invoked in a subdirectory
Bryan O'Sullivan <bos@serpentine.com>
parents:
5037
diff
changeset
|
803 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
804 $ mkdir subdir |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
805 $ cd subdir |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
806 $ echo a > a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
807 $ hg ci -d '16 0' -Amsubdir |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
808 adding subdir/a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
809 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
810 $ echo a >> a |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
811 $ hg commit -i -d '16 0' -m subdir-change a <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
812 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
813 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
814 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
815 diff --git a/subdir/a b/subdir/a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
816 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
817 examine changes to 'subdir/a'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
818 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
819 @@ -1,1 +1,2 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
820 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
821 +a |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
822 record this change to 'subdir/a'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
823 |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
824 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
825 $ hg tip -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
826 changeset: 20:e0f6b99f6c49 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
827 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
828 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
829 date: Thu Jan 01 00:00:16 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
830 summary: subdir-change |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
831 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
832 diff -r abd26b51de37 -r e0f6b99f6c49 subdir/a |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
833 --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
834 +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
835 @@ -1,1 +1,2 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
836 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
837 +a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
838 |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
839 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
840 $ echo a > f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
841 $ echo b > f2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
842 $ hg add f1 f2 |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
843 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
844 $ hg ci -mz -d '17 0' |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
845 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
846 $ echo a >> f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
847 $ echo b >> f2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
848 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
849 Help, quit |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
850 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
851 $ hg commit -i <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
852 > ? |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
853 > q |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
854 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
855 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
856 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
857 examine changes to 'subdir/f1'? [Ynesfdaq?] ? |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
858 |
20266
061766323061
record: use "ui.extractchoices()" to get the list of available responses
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20171
diff
changeset
|
859 y - yes, record this change |
061766323061
record: use "ui.extractchoices()" to get the list of available responses
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20171
diff
changeset
|
860 n - no, skip this change |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
861 e - edit this change manually |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
862 s - skip remaining changes to this file |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
863 f - record remaining changes to this file |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
864 d - done, skip remaining changes and files |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
865 a - record all changes to all remaining files |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
866 q - quit, recording no changes |
20266
061766323061
record: use "ui.extractchoices()" to get the list of available responses
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20171
diff
changeset
|
867 ? - ? (display help) |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
868 examine changes to 'subdir/f1'? [Ynesfdaq?] q |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
869 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
870 abort: user quit |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12074
diff
changeset
|
871 [255] |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
872 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
873 Skip |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
874 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
875 $ hg commit -i <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
876 > s |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
877 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
878 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
879 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
880 examine changes to 'subdir/f1'? [Ynesfdaq?] s |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
881 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
882 diff --git a/subdir/f2 b/subdir/f2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
883 1 hunks, 1 lines changed |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
884 examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12074
diff
changeset
|
885 [255] |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
886 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
887 No |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
888 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
889 $ hg commit -i <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
890 > n |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
891 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
892 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
893 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
894 examine changes to 'subdir/f1'? [Ynesfdaq?] n |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
895 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
896 diff --git a/subdir/f2 b/subdir/f2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
897 1 hunks, 1 lines changed |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
898 examine changes to 'subdir/f2'? [Ynesfdaq?] abort: response expected |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12074
diff
changeset
|
899 [255] |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
900 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
901 f, quit |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
902 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
903 $ hg commit -i <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
904 > f |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
905 > q |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
906 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
907 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
908 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
909 examine changes to 'subdir/f1'? [Ynesfdaq?] f |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
910 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
911 diff --git a/subdir/f2 b/subdir/f2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
912 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
913 examine changes to 'subdir/f2'? [Ynesfdaq?] q |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
914 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
915 abort: user quit |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12074
diff
changeset
|
916 [255] |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
917 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
918 s, all |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
919 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
920 $ hg commit -i -d '18 0' -mx <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
921 > s |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
922 > a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
923 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
924 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
925 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
926 examine changes to 'subdir/f1'? [Ynesfdaq?] s |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
927 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
928 diff --git a/subdir/f2 b/subdir/f2 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
929 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
930 examine changes to 'subdir/f2'? [Ynesfdaq?] a |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
931 |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
932 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
933 $ hg tip -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
934 changeset: 22:6afbbefacf35 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
935 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
936 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
937 date: Thu Jan 01 00:00:18 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
938 summary: x |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
939 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
940 diff -r b73c401c693c -r 6afbbefacf35 subdir/f2 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
941 --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
942 +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
943 @@ -1,1 +1,2 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
944 b |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
945 +b |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
946 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
947 |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
948 f |
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
949 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
950 $ hg commit -i -d '19 0' -my <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
951 > f |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
952 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
953 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
954 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
955 examine changes to 'subdir/f1'? [Ynesfdaq?] f |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
956 |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
957 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
958 $ hg tip -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
959 changeset: 23:715028a33949 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
960 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
961 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
962 date: Thu Jan 01 00:00:19 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
963 summary: y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
964 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
965 diff -r 6afbbefacf35 -r 715028a33949 subdir/f1 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
966 --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
967 +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
968 @@ -1,1 +1,2 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
969 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
970 +a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
971 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
972 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
973 #if execbit |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
974 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
975 Preserve chmod +x |
5154
67afecb8d6cc
record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com>
parents:
5128
diff
changeset
|
976 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
977 $ chmod +x f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
978 $ echo a >> f1 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
979 $ hg commit -i -d '20 0' -mz <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
980 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
981 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
982 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
983 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
984 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
985 old mode 100644 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
986 new mode 100755 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
987 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
988 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
989 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
990 @@ -1,2 +1,3 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
991 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
992 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
993 +a |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
994 record this change to 'subdir/f1'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
995 |
7718
6fa7b6fb90a9
record: do not lose permission changes on commit
Steve Borho <steve@borho.org>
parents:
5154
diff
changeset
|
996 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
997 $ hg tip --config diff.git=True -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
998 changeset: 24:db967c1e5884 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
999 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1000 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1001 date: Thu Jan 01 00:00:20 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1002 summary: z |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1003 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1004 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1005 old mode 100644 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1006 new mode 100755 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1007 --- a/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1008 +++ b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1009 @@ -1,2 +1,3 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1010 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1011 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1012 +a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1013 |
7718
6fa7b6fb90a9
record: do not lose permission changes on commit
Steve Borho <steve@borho.org>
parents:
5154
diff
changeset
|
1014 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1015 Preserve execute permission on original |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1016 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1017 $ echo b >> f1 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1018 $ hg commit -i -d '21 0' -maa <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1019 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1020 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1021 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1022 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1023 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1024 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1025 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1026 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1027 @@ -1,3 +1,4 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1028 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1029 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1030 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1031 +b |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1032 record this change to 'subdir/f1'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1033 |
7718
6fa7b6fb90a9
record: do not lose permission changes on commit
Steve Borho <steve@borho.org>
parents:
5154
diff
changeset
|
1034 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1035 $ hg tip --config diff.git=True -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
1036 changeset: 25:88903aef81c3 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1037 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1038 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1039 date: Thu Jan 01 00:00:21 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1040 summary: aa |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1041 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1042 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1043 --- a/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1044 +++ b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1045 @@ -1,3 +1,4 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1046 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1047 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1048 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1049 +b |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1050 |
7718
6fa7b6fb90a9
record: do not lose permission changes on commit
Steve Borho <steve@borho.org>
parents:
5154
diff
changeset
|
1051 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1052 Preserve chmod -x |
7718
6fa7b6fb90a9
record: do not lose permission changes on commit
Steve Borho <steve@borho.org>
parents:
5154
diff
changeset
|
1053 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1054 $ chmod -x f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1055 $ echo c >> f1 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1056 $ hg commit -i -d '22 0' -mab <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1057 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1058 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1059 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1060 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1061 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1062 old mode 100755 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1063 new mode 100644 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1064 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1065 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1066 |
27411 | 1067 @@ -2,3 +2,4 @@ a |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1068 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1069 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1070 b |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1071 +c |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1072 record this change to 'subdir/f1'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1073 |
8811
8b35b08724eb
Make mq, record and transplant honor patch.eol
Patrick Mezard <pmezard@gmail.com>
parents:
7718
diff
changeset
|
1074 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1075 $ hg tip --config diff.git=True -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
1076 changeset: 26:7af84b6cf560 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1077 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1078 user: test |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1079 date: Thu Jan 01 00:00:22 1970 +0000 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1080 summary: ab |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1081 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1082 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1083 old mode 100755 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1084 new mode 100644 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1085 --- a/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1086 +++ b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1087 @@ -2,3 +2,4 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1088 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1089 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1090 b |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1091 +c |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1092 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1093 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1094 #else |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1095 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1096 Slightly bogus tests to get almost same repo structure as when x bit is used |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1097 - but with different hashes. |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1098 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1099 Mock "Preserve chmod +x" |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1100 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1101 $ echo a >> f1 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1102 $ hg commit -i -d '20 0' -mz <<EOF |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1103 > y |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1104 > y |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1105 > y |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1106 > EOF |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1107 diff --git a/subdir/f1 b/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1108 1 hunks, 1 lines changed |
23054
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1109 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1110 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1111 @@ -1,2 +1,3 @@ |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1112 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1113 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1114 +a |
23054
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1115 record this change to 'subdir/f1'? [Ynesfdaq?] y |
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1116 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1117 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1118 $ hg tip --config diff.git=True -p |
27478
baa9810ee3ec
test-commit-interactive: updates for the no-execbit case
Matt Harbison <matt_harbison@yahoo.com>
parents:
27412
diff
changeset
|
1119 changeset: 24:c26cfe2c4eb0 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1120 tag: tip |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1121 user: test |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1122 date: Thu Jan 01 00:00:20 1970 +0000 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1123 summary: z |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1124 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1125 diff --git a/subdir/f1 b/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1126 --- a/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1127 +++ b/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1128 @@ -1,2 +1,3 @@ |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1129 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1130 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1131 +a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1132 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1133 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1134 Mock "Preserve execute permission on original" |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1135 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1136 $ echo b >> f1 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1137 $ hg commit -i -d '21 0' -maa <<EOF |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1138 > y |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1139 > y |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1140 > y |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1141 > EOF |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1142 diff --git a/subdir/f1 b/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1143 1 hunks, 1 lines changed |
23054
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1144 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1145 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1146 @@ -1,3 +1,4 @@ |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1147 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1148 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1149 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1150 +b |
23054
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1151 record this change to 'subdir/f1'? [Ynesfdaq?] y |
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1152 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1153 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1154 $ hg tip --config diff.git=True -p |
27478
baa9810ee3ec
test-commit-interactive: updates for the no-execbit case
Matt Harbison <matt_harbison@yahoo.com>
parents:
27412
diff
changeset
|
1155 changeset: 25:a48d2d60adde |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1156 tag: tip |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1157 user: test |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1158 date: Thu Jan 01 00:00:21 1970 +0000 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1159 summary: aa |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1160 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1161 diff --git a/subdir/f1 b/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1162 --- a/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1163 +++ b/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1164 @@ -1,3 +1,4 @@ |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1165 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1166 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1167 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1168 +b |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1169 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1170 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1171 Mock "Preserve chmod -x" |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1172 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1173 $ chmod -x f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1174 $ echo c >> f1 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1175 $ hg commit -i -d '22 0' -mab <<EOF |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1176 > y |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1177 > y |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1178 > y |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1179 > EOF |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1180 diff --git a/subdir/f1 b/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1181 1 hunks, 1 lines changed |
23054
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1182 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1183 |
27478
baa9810ee3ec
test-commit-interactive: updates for the no-execbit case
Matt Harbison <matt_harbison@yahoo.com>
parents:
27412
diff
changeset
|
1184 @@ -2,3 +2,4 @@ a |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1185 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1186 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1187 b |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1188 +c |
23054
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1189 record this change to 'subdir/f1'? [Ynesfdaq?] y |
40c01f95449b
tests: adjust expected prompt choice outputs in test-record.t for Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22589
diff
changeset
|
1190 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1191 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1192 $ hg tip --config diff.git=True -p |
27478
baa9810ee3ec
test-commit-interactive: updates for the no-execbit case
Matt Harbison <matt_harbison@yahoo.com>
parents:
27412
diff
changeset
|
1193 changeset: 26:5cc89ae210fa |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1194 tag: tip |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1195 user: test |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1196 date: Thu Jan 01 00:00:22 1970 +0000 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1197 summary: ab |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1198 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1199 diff --git a/subdir/f1 b/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1200 --- a/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1201 +++ b/subdir/f1 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1202 @@ -2,3 +2,4 @@ |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1203 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1204 a |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1205 b |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1206 +c |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1207 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1208 |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1209 #endif |
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1210 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1211 $ cd .. |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1212 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1213 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1214 Abort early when a merge is in progress |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1215 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1216 $ hg up 4 |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
1217 1 files updated, 0 files merged, 7 files removed, 0 files unresolved |
11237
feb2a58fc592
record: check that we are not committing a merge before patch selection
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8811
diff
changeset
|
1218 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1219 $ touch iwillmergethat |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1220 $ hg add iwillmergethat |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1221 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1222 $ hg branch thatbranch |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1223 marked working directory as branch thatbranch |
15615 | 1224 (branches are permanent and global, did you want a bookmark?) |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1225 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1226 $ hg ci -m'new head' |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1227 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1228 $ hg up default |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
1229 7 files updated, 0 files merged, 2 files removed, 0 files unresolved |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1230 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1231 $ hg merge thatbranch |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1232 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1233 (branch merge, don't forget to commit) |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1234 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1235 $ hg commit -i -m'will abort' |
13023
3e2281b85990
record: quote command in use hg commit message
timeless <timeless@gmail.com>
parents:
12843
diff
changeset
|
1236 abort: cannot partially commit a merge (use "hg commit" instead) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12074
diff
changeset
|
1237 [255] |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1238 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1239 $ hg up -C |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1240 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1241 |
18954
b1639e98e8a1
record: ignore trailing content when parsing patches - introduce 'other' lines
Mads Kiilerich <mads@kiilerich.com>
parents:
18953
diff
changeset
|
1242 Editing patch (and ignoring trailing text) |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1243 |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
1244 $ cat > editor.sh << '__EOF__' |
19080
5e4491c114b2
check-code: add a rule against a GNU sed-ism
Kevin Bullock <kbullock@ringworld.org>
parents:
18954
diff
changeset
|
1245 > sed -e 7d -e '5s/^-/ /' -e '/^# ---/i\ |
5e4491c114b2
check-code: add a rule against a GNU sed-ism
Kevin Bullock <kbullock@ringworld.org>
parents:
18954
diff
changeset
|
1246 > trailing\nditto' "$1" > tmp |
16332
42e95631887d
tests: remove sed -i from test-record
Matt Mackall <mpm@selenic.com>
parents:
16328
diff
changeset
|
1247 > mv tmp "$1" |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1248 > __EOF__ |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1249 $ cat > editedfile << '__EOF__' |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1250 > This is the first line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1251 > This is the second line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1252 > This is the third line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1253 > __EOF__ |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1254 $ hg add editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1255 $ hg commit -medit-patch-1 |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1256 $ cat > editedfile << '__EOF__' |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1257 > This line has changed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1258 > This change will be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1259 > This is the third line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1260 > __EOF__ |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1261 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-2 <<EOF |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1262 > y |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1263 > e |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1264 > EOF |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1265 diff --git a/editedfile b/editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1266 1 hunks, 2 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1267 examine changes to 'editedfile'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1268 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1269 @@ -1,3 +1,3 @@ |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1270 -This is the first line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1271 -This is the second line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1272 +This line has changed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1273 +This change will be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1274 This is the third line |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1275 record this change to 'editedfile'? [Ynesfdaq?] e |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1276 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1277 $ cat editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1278 This line has changed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1279 This change will be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1280 This is the third line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1281 $ hg cat -r tip editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1282 This is the first line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1283 This change will be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1284 This is the third line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1285 $ hg revert editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1286 |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1287 Trying to edit patch for whole file |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1288 |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1289 $ echo "This is the fourth line" >> editedfile |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1290 $ hg commit -i <<EOF |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1291 > e |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1292 > q |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1293 > EOF |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1294 diff --git a/editedfile b/editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1295 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1296 examine changes to 'editedfile'? [Ynesfdaq?] e |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1297 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1298 cannot edit patch for whole file |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1299 examine changes to 'editedfile'? [Ynesfdaq?] q |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1300 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1301 abort: user quit |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1302 [255] |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1303 $ hg revert editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1304 |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1305 Removing changes from patch |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1306 |
16338
118eb4575ea2
tests: fix one more sed -i
Matt Mackall <mpm@selenic.com>
parents:
16332
diff
changeset
|
1307 $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp |
118eb4575ea2
tests: fix one more sed -i
Matt Mackall <mpm@selenic.com>
parents:
16332
diff
changeset
|
1308 $ mv tmp editedfile |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1309 $ echo "This line has been added" >> editedfile |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
1310 $ cat > editor.sh << '__EOF__' |
16332
42e95631887d
tests: remove sed -i from test-record
Matt Mackall <mpm@selenic.com>
parents:
16328
diff
changeset
|
1311 > sed -e 's/^[-+]/ /' "$1" > tmp |
42e95631887d
tests: remove sed -i from test-record
Matt Mackall <mpm@selenic.com>
parents:
16328
diff
changeset
|
1312 > mv tmp "$1" |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1313 > __EOF__ |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1314 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1315 > y |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1316 > e |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1317 > EOF |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1318 diff --git a/editedfile b/editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1319 1 hunks, 3 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1320 examine changes to 'editedfile'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1321 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1322 @@ -1,3 +1,3 @@ |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1323 -This is the first line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1324 -This change will be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1325 -This is the third line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1326 +This change will not be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1327 +This is the second line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1328 +This line has been added |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1329 record this change to 'editedfile'? [Ynesfdaq?] e |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1330 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1331 no changes to record |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1332 $ cat editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1333 This change will not be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1334 This is the second line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1335 This line has been added |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1336 $ hg cat -r tip editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1337 This is the first line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1338 This change will be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1339 This is the third line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1340 $ hg revert editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1341 |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1342 Invalid patch |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1343 |
16332
42e95631887d
tests: remove sed -i from test-record
Matt Mackall <mpm@selenic.com>
parents:
16328
diff
changeset
|
1344 $ sed -e '3s/third/second/' -e '2s/will/will not/' -e 1d editedfile > tmp |
42e95631887d
tests: remove sed -i from test-record
Matt Mackall <mpm@selenic.com>
parents:
16328
diff
changeset
|
1345 $ mv tmp editedfile |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1346 $ echo "This line has been added" >> editedfile |
16901
5b89700cce30
tests: consistently use a HGEDITOR pattern that works with msys on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
16899
diff
changeset
|
1347 $ cat > editor.sh << '__EOF__' |
16332
42e95631887d
tests: remove sed -i from test-record
Matt Mackall <mpm@selenic.com>
parents:
16328
diff
changeset
|
1348 > sed s/This/That/ "$1" > tmp |
42e95631887d
tests: remove sed -i from test-record
Matt Mackall <mpm@selenic.com>
parents:
16328
diff
changeset
|
1349 > mv tmp "$1" |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1350 > __EOF__ |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1351 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1352 > y |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1353 > e |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1354 > EOF |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1355 diff --git a/editedfile b/editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1356 1 hunks, 3 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1357 examine changes to 'editedfile'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1358 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1359 @@ -1,3 +1,3 @@ |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1360 -This is the first line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1361 -This change will be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1362 -This is the third line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1363 +This change will not be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1364 +This is the second line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1365 +This line has been added |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1366 record this change to 'editedfile'? [Ynesfdaq?] e |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1367 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1368 patching file editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1369 Hunk #1 FAILED at 0 |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1370 1 out of 1 hunks FAILED -- saving rejects to file editedfile.rej |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1371 abort: patch failed to apply |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1372 [255] |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1373 $ cat editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1374 This change will not be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1375 This is the second line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1376 This line has been added |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1377 $ hg cat -r tip editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1378 This is the first line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1379 This change will be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1380 This is the third line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1381 $ cat editedfile.rej |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1382 --- editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1383 +++ editedfile |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1384 @@ -1,3 +1,3 @@ |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1385 -That is the first line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1386 -That change will be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1387 -That is the third line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1388 +That change will not be committed |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1389 +That is the second line |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1390 +That line has been added |
18953
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1391 |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1392 Malformed patch - error handling |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1393 |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1394 $ cat > editor.sh << '__EOF__' |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1395 > sed -e '/^@/p' "$1" > tmp |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1396 > mv tmp "$1" |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1397 > __EOF__ |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1398 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF |
18953
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1399 > y |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1400 > e |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1401 > EOF |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1402 diff --git a/editedfile b/editedfile |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1403 1 hunks, 3 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1404 examine changes to 'editedfile'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1405 |
18953
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1406 @@ -1,3 +1,3 @@ |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1407 -This is the first line |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1408 -This change will be committed |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1409 -This is the third line |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1410 +This change will not be committed |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1411 +This is the second line |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1412 +This line has been added |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1413 record this change to 'editedfile'? [Ynesfdaq?] e |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1414 |
18953
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1415 abort: error parsing patch: unhandled transition: range -> range |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1416 [255] |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1417 |
25483
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1418 Exiting editor with status 1, ignores the edit but does not stop the recording |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1419 session |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1420 |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1421 $ HGEDITOR=false hg commit -i <<EOF |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1422 > y |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1423 > e |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1424 > n |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1425 > EOF |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1426 diff --git a/editedfile b/editedfile |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1427 1 hunks, 3 lines changed |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1428 examine changes to 'editedfile'? [Ynesfdaq?] y |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1429 |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1430 @@ -1,3 +1,3 @@ |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1431 -This is the first line |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1432 -This change will be committed |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1433 -This is the third line |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1434 +This change will not be committed |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1435 +This is the second line |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1436 +This line has been added |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1437 record this change to 'editedfile'? [Ynesfdaq?] e |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1438 |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1439 editor exited with exit code 1 |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1440 record this change to 'editedfile'? [Ynesfdaq?] n |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1441 |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1442 no changes to record |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1443 |
fb04372d7b38
record: exiting editor with non-zero status should not stop recording session
Laurent Charignon <lcharignon@fb.com>
parents:
25382
diff
changeset
|
1444 |
18954
b1639e98e8a1
record: ignore trailing content when parsing patches - introduce 'other' lines
Mads Kiilerich <mads@kiilerich.com>
parents:
18953
diff
changeset
|
1445 random text in random positions is still an error |
b1639e98e8a1
record: ignore trailing content when parsing patches - introduce 'other' lines
Mads Kiilerich <mads@kiilerich.com>
parents:
18953
diff
changeset
|
1446 |
18953
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1447 $ cat > editor.sh << '__EOF__' |
19080
5e4491c114b2
check-code: add a rule against a GNU sed-ism
Kevin Bullock <kbullock@ringworld.org>
parents:
18954
diff
changeset
|
1448 > sed -e '/^@/i\ |
5e4491c114b2
check-code: add a rule against a GNU sed-ism
Kevin Bullock <kbullock@ringworld.org>
parents:
18954
diff
changeset
|
1449 > other' "$1" > tmp |
18953
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1450 > mv tmp "$1" |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1451 > __EOF__ |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1452 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i <<EOF |
18953
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1453 > y |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1454 > e |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1455 > EOF |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1456 diff --git a/editedfile b/editedfile |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1457 1 hunks, 3 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1458 examine changes to 'editedfile'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1459 |
18953
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1460 @@ -1,3 +1,3 @@ |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1461 -This is the first line |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1462 -This change will be committed |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1463 -This is the third line |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1464 +This change will not be committed |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1465 +This is the second line |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1466 +This line has been added |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1467 record this change to 'editedfile'? [Ynesfdaq?] e |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1468 |
18954
b1639e98e8a1
record: ignore trailing content when parsing patches - introduce 'other' lines
Mads Kiilerich <mads@kiilerich.com>
parents:
18953
diff
changeset
|
1469 abort: error parsing patch: unhandled transition: file -> other |
18953
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1470 [255] |
e4ae397595e8
record: abort on malformed patches instead of crashing
Mads Kiilerich <madski@unity3d.com>
parents:
18266
diff
changeset
|
1471 |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1472 $ hg up -C |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1473 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1474 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1475 With win32text |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1476 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1477 $ echo '[extensions]' >> .hg/hgrc |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1478 $ echo 'win32text = ' >> .hg/hgrc |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1479 $ echo '[decode]' >> .hg/hgrc |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1480 $ echo '** = cleverdecode:' >> .hg/hgrc |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1481 $ echo '[encode]' >> .hg/hgrc |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1482 $ echo '** = cleverencode:' >> .hg/hgrc |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1483 $ echo '[patch]' >> .hg/hgrc |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1484 $ echo 'eol = crlf' >> .hg/hgrc |
8811
8b35b08724eb
Make mq, record and transplant honor patch.eol
Patrick Mezard <pmezard@gmail.com>
parents:
7718
diff
changeset
|
1485 |
12843
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12328
diff
changeset
|
1486 Ignore win32text deprecation warning for now: |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12328
diff
changeset
|
1487 |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12328
diff
changeset
|
1488 $ echo '[win32text]' >> .hg/hgrc |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12328
diff
changeset
|
1489 $ echo 'warn = no' >> .hg/hgrc |
8aeb6184b008
tests: test/silence win32text deprecation warning
Martin Geisler <mg@lazybytes.net>
parents:
12328
diff
changeset
|
1490 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1491 $ echo d >> subdir/f1 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1492 $ hg commit -i -d '24 0' -mw1 <<EOF |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1493 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1494 > y |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1495 > EOF |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1496 diff --git a/subdir/f1 b/subdir/f1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1497 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1498 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1499 |
27411 | 1500 @@ -3,3 +3,4 @@ a |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1501 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1502 b |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1503 c |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1504 +d |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1505 record this change to 'subdir/f1'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1506 |
8811
8b35b08724eb
Make mq, record and transplant honor patch.eol
Patrick Mezard <pmezard@gmail.com>
parents:
7718
diff
changeset
|
1507 |
25759
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1508 $ hg status -A subdir/f1 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1509 C subdir/f1 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1510 $ hg tip -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
1511 changeset: 30:* (glob) |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1512 tag: tip |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1513 user: test |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1514 date: Thu Jan 01 00:00:24 1970 +0000 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1515 summary: w1 |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1516 |
16899
8149ff405c78
tests: convert some 'hghave execbit' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16338
diff
changeset
|
1517 diff -r ???????????? -r ???????????? subdir/f1 (glob) |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1518 --- a/subdir/f1 Thu Jan 01 00:00:23 1970 +0000 |
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15623
diff
changeset
|
1519 +++ b/subdir/f1 Thu Jan 01 00:00:24 1970 +0000 |
12074
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1520 @@ -3,3 +3,4 @@ |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1521 a |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1522 b |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1523 c |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1524 +d |
35c143e85b1b
tests: unify test-record
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
11238
diff
changeset
|
1525 |
24235
79fceed67676
record: allow editing new files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
23435
diff
changeset
|
1526 |
79fceed67676
record: allow editing new files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
23435
diff
changeset
|
1527 |
20171
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1528 Test --user when ui.username not set |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1529 $ unset HGUSER |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1530 $ echo e >> subdir/f1 |
24279
7cf9a9e0cf89
record: add new tests for commit interactive (same tests as record)
Laurent Charignon <lcharignon@fb.com>
parents:
24235
diff
changeset
|
1531 $ hg commit -i --config ui.username= -d '8 0' --user xyz -m "user flag" <<EOF |
20171
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1532 > y |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1533 > y |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1534 > EOF |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1535 diff --git a/subdir/f1 b/subdir/f1 |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1536 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1537 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1538 |
27411 | 1539 @@ -4,3 +4,4 @@ a |
20171
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1540 b |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1541 c |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1542 d |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1543 +e |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1544 record this change to 'subdir/f1'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
20580
diff
changeset
|
1545 |
25759
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1546 $ hg status -A subdir/f1 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1547 C subdir/f1 |
20171
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1548 $ hg log --template '{author}\n' -l 1 |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1549 xyz |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1550 $ HGUSER="test" |
a765611e06dc
record: --user/-u now works with record when ui.username not set (issue3857)
Prasoon Shukla <prasoon92.iitr@gmail.com>
parents:
19080
diff
changeset
|
1551 $ export HGUSER |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16901
diff
changeset
|
1552 |
24235
79fceed67676
record: allow editing new files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
23435
diff
changeset
|
1553 |
24837
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1554 Moving files |
24235
79fceed67676
record: allow editing new files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
23435
diff
changeset
|
1555 |
24837
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1556 $ hg update -C . |
25759
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1557 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
24837
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1558 $ hg mv plain plain3 |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1559 $ echo somechange >> plain3 |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1560 $ hg commit -i -d '23 0' -mmoving_files << EOF |
24235
79fceed67676
record: allow editing new files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
23435
diff
changeset
|
1561 > y |
24837
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1562 > y |
24235
79fceed67676
record: allow editing new files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
23435
diff
changeset
|
1563 > EOF |
24837
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1564 diff --git a/plain b/plain3 |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1565 rename from plain |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1566 rename to plain3 |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1567 1 hunks, 1 lines changed |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1568 examine changes to 'plain' and 'plain3'? [Ynesfdaq?] y |
24235
79fceed67676
record: allow editing new files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
23435
diff
changeset
|
1569 |
27411 | 1570 @@ -11,3 +11,4 @@ 8 |
24837
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1571 9 |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1572 10 |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1573 11 |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1574 +somechange |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1575 record this change to 'plain3'? [Ynesfdaq?] y |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1576 |
24861
15d7f435108a
test-commit-interactive: stablize output for no-execbit platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
24845
diff
changeset
|
1577 The #if execbit block above changes the hash here on some systems |
25759
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1578 $ hg status -A plain3 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1579 C plain3 |
24837
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1580 $ hg tip |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
1581 changeset: 32:* (glob) |
24837
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1582 tag: tip |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1583 user: test |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1584 date: Thu Jan 01 00:00:23 1970 +0000 |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1585 summary: moving_files |
edf907bd8144
record: fix record with change on moved file crashes (issue4619)
Laurent Charignon <lcharignon@fb.com>
parents:
24279
diff
changeset
|
1586 |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1587 Editing patch of newly added file |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1588 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1589 $ hg update -C . |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1590 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1591 $ cat > editor.sh << '__EOF__' |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1592 > cat "$1" | sed "s/first/very/g" > tt |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1593 > mv tt "$1" |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1594 > __EOF__ |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1595 $ cat > newfile << '__EOF__' |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1596 > This is the first line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1597 > This is the second line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1598 > This is the third line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1599 > __EOF__ |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1600 $ hg add newfile |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1601 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit -i -d '23 0' -medit-patch-new <<EOF |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1602 > y |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1603 > e |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1604 > EOF |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1605 diff --git a/newfile b/newfile |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1606 new file mode 100644 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1607 examine changes to 'newfile'? [Ynesfdaq?] y |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1608 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1609 @@ -0,0 +1,3 @@ |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1610 +This is the first line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1611 +This is the second line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1612 +This is the third line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1613 record this change to 'newfile'? [Ynesfdaq?] e |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1614 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1615 $ hg cat -r tip newfile |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1616 This is the very line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1617 This is the second line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1618 This is the third line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1619 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1620 $ cat newfile |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1621 This is the first line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1622 This is the second line |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24844
diff
changeset
|
1623 This is the third line |
24866
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1624 |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1625 Add new file from within a subdirectory |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1626 $ hg update -C . |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1627 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1628 $ mkdir folder |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1629 $ cd folder |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1630 $ echo "foo" > bar |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1631 $ hg add bar |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1632 $ hg commit -i -d '23 0' -mnewfilesubdir <<EOF |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1633 > y |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1634 > y |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1635 > EOF |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1636 diff --git a/folder/bar b/folder/bar |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1637 new file mode 100644 |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1638 examine changes to 'folder/bar'? [Ynesfdaq?] y |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1639 |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1640 @@ -0,0 +1,1 @@ |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1641 +foo |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1642 record this change to 'folder/bar'? [Ynesfdaq?] y |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1643 |
24884
d7778b88838c
test-commit-interactive: add more globs for no-execbit platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
24866
diff
changeset
|
1644 The #if execbit block above changes the hashes here on some systems |
24866
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1645 $ hg tip -p |
27412
14b184263846
record: fix hunk handling to remember the current function
timeless <timeless@mozdev.org>
parents:
27411
diff
changeset
|
1646 changeset: 34:* (glob) |
24866
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1647 tag: tip |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1648 user: test |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1649 date: Thu Jan 01 00:00:23 1970 +0000 |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1650 summary: newfilesubdir |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1651 |
24884
d7778b88838c
test-commit-interactive: add more globs for no-execbit platforms
Matt Harbison <matt_harbison@yahoo.com>
parents:
24866
diff
changeset
|
1652 diff -r * -r * folder/bar (glob) |
24866
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1653 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1654 +++ b/folder/bar Thu Jan 01 00:00:23 1970 +0000 |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1655 @@ -0,0 +1,1 @@ |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1656 +foo |
e1ec3d075c67
record: fix adding new file with record from within a subdir (issue4626)
Laurent Charignon <lcharignon@fb.com>
parents:
24861
diff
changeset
|
1657 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16901
diff
changeset
|
1658 $ cd .. |
25759
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1659 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1660 $ hg status -A folder/bar |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1661 C folder/bar |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1662 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1663 Clear win32text configuration before size/timestamp sensitive test |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1664 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1665 $ cat >> .hg/hgrc <<EOF |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1666 > [extensions] |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1667 > win32text = ! |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1668 > [decode] |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1669 > ** = ! |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1670 > [encode] |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1671 > ** = ! |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1672 > [patch] |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1673 > eol = strict |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1674 > EOF |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1675 $ hg update -q -C null |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1676 $ hg update -q -C tip |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1677 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1678 Test that partially committed file is still treated as "modified", |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1679 even if none of mode, size and timestamp is changed on the filesystem |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1680 (see also issue4583). |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1681 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1682 $ cat > subdir/f1 <<EOF |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1683 > A |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1684 > a |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1685 > a |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1686 > b |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1687 > c |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1688 > d |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1689 > E |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1690 > EOF |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1691 $ hg diff --git subdir/f1 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1692 diff --git a/subdir/f1 b/subdir/f1 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1693 --- a/subdir/f1 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1694 +++ b/subdir/f1 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1695 @@ -1,7 +1,7 @@ |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1696 -a |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1697 +A |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1698 a |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1699 a |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1700 b |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1701 c |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1702 d |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1703 -e |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1704 +E |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1705 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1706 $ touch -t 200001010000 subdir/f1 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1707 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1708 $ cat >> .hg/hgrc <<EOF |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1709 > # emulate invoking patch.internalpatch() at 2000-01-01 00:00 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1710 > [fakepatchtime] |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1711 > fakenow = 200001010000 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1712 > |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1713 > [extensions] |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1714 > fakepatchtime = $TESTDIR/fakepatchtime.py |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1715 > EOF |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1716 $ hg commit -i -m 'commit subdir/f1 partially' <<EOF |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1717 > y |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1718 > y |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1719 > n |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1720 > EOF |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1721 diff --git a/subdir/f1 b/subdir/f1 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1722 2 hunks, 2 lines changed |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1723 examine changes to 'subdir/f1'? [Ynesfdaq?] y |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1724 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1725 @@ -1,6 +1,6 @@ |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1726 -a |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1727 +A |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1728 a |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1729 a |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1730 b |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1731 c |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1732 d |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1733 record change 1/2 to 'subdir/f1'? [Ynesfdaq?] y |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1734 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1735 @@ -2,6 +2,6 @@ |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1736 a |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1737 a |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1738 b |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1739 c |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1740 d |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1741 -e |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1742 +E |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1743 record change 2/2 to 'subdir/f1'? [Ynesfdaq?] n |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1744 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1745 $ cat >> .hg/hgrc <<EOF |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1746 > [extensions] |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1747 > fakepatchtime = ! |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1748 > EOF |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1749 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1750 $ hg debugstate | grep ' subdir/f1$' |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1751 n 0 -1 unset subdir/f1 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1752 $ hg status -A subdir/f1 |
ff11c1565c04
cmdutil: apply dirstate.normallookup on (maybe partially) committed files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25483
diff
changeset
|
1753 M subdir/f1 |