Mercurial > hg
annotate tests/test-import.t @ 40910:4bb6195755b1
test: enable sparse-revlog for test-ssh-proto-unbundle.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5337
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 12 Nov 2018 01:17:05 +0100 |
parents | 07e181ed82ef |
children | db33e4f25729 |
rev | line source |
---|---|
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1 $ hg init a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
2 $ mkdir a/d1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
3 $ mkdir a/d1/d2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
4 $ echo line 1 > a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
5 $ echo line 1 > a/d1/d2/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
6 $ hg --cwd a ci -Ama |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
7 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
8 adding d1/d2/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
9 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
10 $ echo line 2 >> a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
11 $ hg --cwd a ci -u someone -d '1 0' -m'second change' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
12 |
15327
67e92d29ecb5
import: abort usefully if no patch name given
Kevin Bullock <kbullock@ringworld.org>
parents:
15198
diff
changeset
|
13 import with no args: |
67e92d29ecb5
import: abort usefully if no patch name given
Kevin Bullock <kbullock@ringworld.org>
parents:
15198
diff
changeset
|
14 |
67e92d29ecb5
import: abort usefully if no patch name given
Kevin Bullock <kbullock@ringworld.org>
parents:
15198
diff
changeset
|
15 $ hg --cwd a import |
67e92d29ecb5
import: abort usefully if no patch name given
Kevin Bullock <kbullock@ringworld.org>
parents:
15198
diff
changeset
|
16 abort: need at least one patch to import |
67e92d29ecb5
import: abort usefully if no patch name given
Kevin Bullock <kbullock@ringworld.org>
parents:
15198
diff
changeset
|
17 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
18 |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
19 generate patches for the test |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
20 |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
21 $ hg --cwd a export tip > exported-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
22 $ hg --cwd a diff -r0:1 > diffed-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
23 |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
24 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
25 import exported patch |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
26 (this also tests that editor is not invoked, if the patch contains the |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
27 commit message and '--edit' is not specified) |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
28 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
29 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
30 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
31 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
32 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
33 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
34 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
35 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
36 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
37 $ HGEDITOR=cat hg --cwd b import ../exported-tip.patch |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
38 applying ../exported-tip.patch |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
39 |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
17712
diff
changeset
|
40 message and committer and date should be same |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
41 |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
42 $ hg --cwd b tip |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
43 changeset: 1:1d4bd90af0e4 |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
44 tag: tip |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
45 user: someone |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
46 date: Thu Jan 01 00:00:01 1970 +0000 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
47 summary: second change |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
48 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
49 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
50 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
51 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
52 import exported patch with external patcher |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
53 (this also tests that editor is invoked, if the '--edit' is specified, |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
54 regardless of the commit message in the patch) |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
55 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
56 $ cat > dummypatch.py <<EOF |
29485
6a98f9408a50
py3: make files use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27054
diff
changeset
|
57 > from __future__ import print_function |
6a98f9408a50
py3: make files use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
27054
diff
changeset
|
58 > print('patching file a') |
36024
2a81ed6c3bb9
py3: replace file() with open() in test-import.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
59 > open('a', 'wb').write(b'line2\n') |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
60 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
61 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
62 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
63 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
64 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
65 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
66 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
67 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
68 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
40872
07e181ed82ef
py3: quote several instances of $PYTHON for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
40369
diff
changeset
|
69 $ HGEDITOR=cat hg --config ui.patch="\"$PYTHON\" ../dummypatch.py" --cwd b import --edit ../exported-tip.patch |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
70 applying ../exported-tip.patch |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
71 second change |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
72 |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
73 |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
74 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
75 HG: Leave message empty to abort commit. |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
76 HG: -- |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
77 HG: user: someone |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
78 HG: branch 'default' |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
79 HG: changed a |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
80 $ cat b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
81 line2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
82 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
83 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
84 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
85 import of plain diff should fail without message |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
86 (this also tests that editor is invoked, if the patch doesn't contain |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
87 the commit message, regardless of '--edit') |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
88 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
89 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
90 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
91 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
92 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
93 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
94 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
95 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
96 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
22250
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21553
diff
changeset
|
97 $ cat > $TESTTMP/editor.sh <<EOF |
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21553
diff
changeset
|
98 > env | grep HGEDITFORM |
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21553
diff
changeset
|
99 > cat \$1 |
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21553
diff
changeset
|
100 > EOF |
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21553
diff
changeset
|
101 $ HGEDITOR="sh $TESTTMP/editor.sh" hg --cwd b import ../diffed-tip.patch |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
102 applying ../diffed-tip.patch |
22250
f3200bf460a8
import: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21553
diff
changeset
|
103 HGEDITFORM=import.normal.normal |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
104 |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
105 |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
106 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
107 HG: Leave message empty to abort commit. |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
108 HG: -- |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
109 HG: user: test |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
110 HG: branch 'default' |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
111 HG: changed a |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
112 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11807
diff
changeset
|
113 [255] |
22278
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
114 |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
115 Test avoiding editor invocation at applying the patch with --exact, |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
116 even if commit message is empty |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
117 |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
118 $ echo a >> b/a |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
119 $ hg --cwd b commit -m ' ' |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
120 $ hg --cwd b tip -T "{node}\n" |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
121 d8804f3f5396d800812f579c8452796a5993bdb2 |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
122 $ hg --cwd b export -o ../empty-log.diff . |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
123 $ hg --cwd b update -q -C ".^1" |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
124 $ hg --cwd b --config extensions.strip= strip -q tip |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
125 $ HGEDITOR=cat hg --cwd b import --exact ../empty-log.diff |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
126 applying ../empty-log.diff |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
127 $ hg --cwd b tip -T "{node}\n" |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
128 d8804f3f5396d800812f579c8452796a5993bdb2 |
ffaaa80fa724
import: avoid editor invocation when importing with "--exact" for exact-ness
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
22250
diff
changeset
|
129 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
130 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
131 |
7247
c4461ea8b4c8
patch: fix patched files records in externalpatcher()
Patrick Mezard <pmezard@gmail.com>
parents:
6758
diff
changeset
|
132 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
133 import of plain diff should be ok with message |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
134 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
135 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
136 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
137 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
138 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
139 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
140 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
141 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
142 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
143 $ hg --cwd b import -mpatch ../diffed-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
144 applying ../diffed-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
145 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
146 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
147 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
148 import of plain diff with specific date and user |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
149 (this also tests that editor is not invoked, if |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
150 '--message'/'--logfile' is specified and '--edit' is not) |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
151 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
152 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
153 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
154 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
155 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
156 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
157 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
158 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
159 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
160 $ hg --cwd b import -mpatch -d '1 0' -u 'user@nowhere.net' ../diffed-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
161 applying ../diffed-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
162 $ hg -R b tip -pv |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
163 changeset: 1:ca68f19f3a40 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
164 tag: tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
165 user: user@nowhere.net |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
166 date: Thu Jan 01 00:00:01 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
167 files: a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
168 description: |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
169 patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
170 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
171 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
172 diff -r 80971e65b431 -r ca68f19f3a40 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
173 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
174 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
175 @@ -1,1 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
176 line 1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
177 +line 2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
178 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
179 $ rm -r b |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
180 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
181 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
182 import of plain diff should be ok with --no-commit |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
183 (this also tests that editor is not invoked, if '--no-commit' is |
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
184 specified, regardless of '--edit') |
5953
e7f1be4bf40a
Permitting the import command to accept a --user option.
Jesse Glick <jesse.glick@sun.com>
parents:
5937
diff
changeset
|
185 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
186 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
187 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
188 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
189 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
190 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
191 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
192 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
193 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21417
308aaeb956e2
import: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19513
diff
changeset
|
194 $ HGEDITOR=cat hg --cwd b import --no-commit --edit ../diffed-tip.patch |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
195 applying ../diffed-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
196 $ hg --cwd b diff --nodates |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
197 diff -r 80971e65b431 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
198 --- a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
199 +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
200 @@ -1,1 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
201 line 1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
202 +line 2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
203 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
204 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
205 |
12675
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
206 import of malformed plain diff should fail |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
207 |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
208 $ hg clone -r0 a b |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
209 adding changesets |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
210 adding manifests |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
211 adding file changes |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
212 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
213 new changesets 80971e65b431 |
12675
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
214 updating to branch default |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
215 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
216 $ sed 's/1,1/foo/' < diffed-tip.patch > broken.patch |
12675
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
217 $ hg --cwd b import -mpatch ../broken.patch |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
218 applying ../broken.patch |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
219 abort: bad hunk #1 |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
220 [255] |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
221 $ rm -r b |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
222 |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
223 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
224 hg -R repo import |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
225 put the clone in a subdir - having a directory named "a" |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
226 used to hide a bug. |
5937
d8878742a924
Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5853
diff
changeset
|
227 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
228 $ mkdir dir |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
229 $ hg clone -r0 a dir/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
230 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
231 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
232 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
233 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
234 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
235 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
236 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
237 $ cd dir |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
238 $ hg -R b import ../exported-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
239 applying ../exported-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
240 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
241 $ rm -r dir |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
242 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
243 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
244 import from stdin |
4230
c93562fb12cc
Fix handling of paths when run outside the repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3988
diff
changeset
|
245 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
246 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
247 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
248 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
249 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
250 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
251 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
252 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
253 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
254 $ hg --cwd b import - < exported-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
255 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
256 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
257 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
258 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
259 import two patches in one stream |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
260 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
261 $ hg init b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
262 $ hg --cwd a export 0:tip | hg --cwd b import - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
263 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
264 $ hg --cwd a id |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
265 1d4bd90af0e4 tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
266 $ hg --cwd b id |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
267 1d4bd90af0e4 tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
268 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
269 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
270 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
271 override commit message |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
272 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
273 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
274 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
275 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
276 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
277 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
278 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
279 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
280 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
281 $ hg --cwd b import -m 'override' - < exported-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
282 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
283 $ hg --cwd b tip | grep override |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
284 summary: override |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
285 $ rm -r b |
10384
832f35386067
import: import each patch in a file or stream as a separate change
Brendan Cully <brendan@kublai.com>
parents:
9594
diff
changeset
|
286 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
287 $ cat > mkmsg.py <<EOF |
40369
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
39707
diff
changeset
|
288 > import email.message |
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
39707
diff
changeset
|
289 > import sys |
37466
abd9f5ec1d82
py3: use lower-cased module 'email.message' in test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
37457
diff
changeset
|
290 > msg = email.message.Message() |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
291 > patch = open(sys.argv[1], 'rb').read() |
37467
9bf65d1b43a6
py3: fix string issues of email message in test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
37466
diff
changeset
|
292 > msg.set_payload(b'email commit message\n' + patch) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
293 > msg['Subject'] = 'email patch' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
294 > msg['From'] = 'email patcher' |
37467
9bf65d1b43a6
py3: fix string issues of email message in test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
37466
diff
changeset
|
295 > open(sys.argv[2], 'wb').write(bytes(msg)) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
296 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
297 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
298 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
299 plain diff in email, subject, message body |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
300 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
301 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
302 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
303 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
304 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
305 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
306 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
307 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
308 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39405
diff
changeset
|
309 $ "$PYTHON" mkmsg.py diffed-tip.patch msg.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
310 $ hg --cwd b import ../msg.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
311 applying ../msg.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
312 $ hg --cwd b tip | grep email |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
313 user: email patcher |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
314 summary: email patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
315 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
316 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
317 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
318 plain diff in email, no subject, message body |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
319 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
320 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
321 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
322 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
323 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
324 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
325 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
326 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
327 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
328 $ grep -v '^Subject:' msg.patch | hg --cwd b import - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
329 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
330 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
331 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
332 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
333 plain diff in email, subject, no message body |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
334 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
335 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
336 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
337 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
338 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
339 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
340 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
341 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
342 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
343 $ grep -v '^email ' msg.patch | hg --cwd b import - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
344 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
345 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
346 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
347 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
348 plain diff in email, no subject, no message body, should fail |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
349 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
350 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
351 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
352 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
353 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
354 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
355 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
356 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
357 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
358 $ egrep -v '^(Subject|email)' msg.patch | hg --cwd b import - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
359 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
360 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11807
diff
changeset
|
361 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
362 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
363 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
364 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
365 hg export in email, should use patch header |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
366 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
367 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
368 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
369 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
370 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
371 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
372 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
373 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
374 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39405
diff
changeset
|
375 $ "$PYTHON" mkmsg.py exported-tip.patch msg.patch |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
376 $ cat msg.patch | hg --cwd b import - |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
377 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
378 $ hg --cwd b tip | grep second |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
379 summary: second change |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
380 $ rm -r b |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
381 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
382 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
383 subject: duplicate detection, removal of [PATCH] |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
384 The '---' tests the gitsendmail handling without proper mail headers |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
385 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
386 $ cat > mkmsg2.py <<EOF |
40369
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
39707
diff
changeset
|
387 > import email.message |
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
39707
diff
changeset
|
388 > import sys |
37466
abd9f5ec1d82
py3: use lower-cased module 'email.message' in test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
37457
diff
changeset
|
389 > msg = email.message.Message() |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
390 > patch = open(sys.argv[1], 'rb').read() |
37467
9bf65d1b43a6
py3: fix string issues of email message in test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
37466
diff
changeset
|
391 > msg.set_payload(b'email patch\n\nnext line\n---\n' + patch) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
392 > msg['Subject'] = '[PATCH] email patch' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
393 > msg['From'] = 'email patcher' |
37467
9bf65d1b43a6
py3: fix string issues of email message in test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
37466
diff
changeset
|
394 > open(sys.argv[2], 'wb').write(bytes(msg)) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
395 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
396 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
397 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
398 plain diff in email, [PATCH] subject, message body with subject |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
399 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
400 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
401 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
402 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
403 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
404 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
405 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
406 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
407 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39405
diff
changeset
|
408 $ "$PYTHON" mkmsg2.py diffed-tip.patch msg.patch |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
409 $ cat msg.patch | hg --cwd b import - |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
410 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
411 $ hg --cwd b tip --template '{desc}\n' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
412 email patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
413 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
414 next line |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
415 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
416 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
417 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
418 Issue963: Parent of working dir incorrect after import of multiple |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
419 patches and rollback |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
420 |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
421 We weren't backing up the correct dirstate file when importing many |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
422 patches: import patch1 patch2; rollback |
4779
a7915f79d4cc
Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4230
diff
changeset
|
423 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
424 $ echo line 3 >> a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
425 $ hg --cwd a ci -m'third change' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
426 $ hg --cwd a export -o '../patch%R' 1 2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
427 $ hg clone -qr0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
428 $ hg --cwd b parents --template 'parent: {rev}\n' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
429 parent: 0 |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
430 $ hg --cwd b import -v ../patch1 ../patch2 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
431 applying ../patch1 |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
432 patching file a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
22947
diff
changeset
|
433 committing files: |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
434 a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
22947
diff
changeset
|
435 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
22947
diff
changeset
|
436 committing changelog |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
437 created 1d4bd90af0e4 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
438 applying ../patch2 |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
439 patching file a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
22947
diff
changeset
|
440 committing files: |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
441 a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
22947
diff
changeset
|
442 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
22947
diff
changeset
|
443 committing changelog |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
444 created 6d019af21222 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
445 $ hg --cwd b rollback |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
446 repository tip rolled back to revision 0 (undo import) |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
447 working directory now based on revision 0 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
448 $ hg --cwd b parents --template 'parent: {rev}\n' |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
449 parent: 0 |
26631
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
450 |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
451 Test that "hg rollback" doesn't restore dirstate to one at the |
30332
318a24b52eeb
spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents:
30078
diff
changeset
|
452 beginning of the rolled back transaction in not-"parent-gone" case. |
26631
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
453 |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
454 invoking pretxncommit hook will cause marking '.hg/dirstate' as a file |
30332
318a24b52eeb
spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents:
30078
diff
changeset
|
455 to be restored when rolling back, after DirstateTransactionPlan (see wiki |
26631
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
456 page for detail). |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
457 |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
458 $ hg --cwd b branch -q foobar |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
459 $ hg --cwd b commit -m foobar |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
460 $ hg --cwd b update 0 -q |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
461 $ hg --cwd b import ../patch1 ../patch2 --config hooks.pretxncommit=true |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
462 applying ../patch1 |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
463 applying ../patch2 |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
464 $ hg --cwd b update -q 1 |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
465 $ hg --cwd b rollback -q |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
466 $ hg --cwd b parents --template 'parent: {rev}\n' |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
467 parent: 1 |
e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26562
diff
changeset
|
468 |
26750
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
469 $ hg --cwd b update -q -C 0 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
470 $ hg --cwd b --config extensions.strip= strip -q 1 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
471 |
30332
318a24b52eeb
spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents:
30078
diff
changeset
|
472 Test visibility of in-memory dirstate changes inside transaction to |
26750
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
473 external process |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
474 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
475 $ echo foo > a/foo |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
476 $ hg --cwd a commit -A -m 'adding foo' foo |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
477 $ hg --cwd a export -o '../patch%R' 3 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
478 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
479 $ cat > $TESTTMP/checkvisibility.sh <<EOF |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
480 > echo "====" |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
481 > hg parents --template "VISIBLE {rev}:{node|short}\n" |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
482 > hg status -amr |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
483 > # test that pending changes are hidden |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
484 > unset HG_PENDING |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
485 > hg parents --template "ACTUAL {rev}:{node|short}\n" |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
486 > hg status -amr |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
487 > echo "====" |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
488 > EOF |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
489 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
490 == test visibility to external editor |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
491 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
492 $ (cd b && sh "$TESTTMP/checkvisibility.sh") |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
493 ==== |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
494 VISIBLE 0:80971e65b431 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
495 ACTUAL 0:80971e65b431 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
496 ==== |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
497 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
498 $ HGEDITOR="sh $TESTTMP/checkvisibility.sh" hg --cwd b import -v --edit ../patch1 ../patch2 ../patch3 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
499 applying ../patch1 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
500 patching file a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
501 ==== |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
502 VISIBLE 0:80971e65b431 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
503 M a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
504 ACTUAL 0:80971e65b431 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
505 M a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
506 ==== |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
507 committing files: |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
508 a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
509 committing manifest |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
510 committing changelog |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
511 created 1d4bd90af0e4 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
512 applying ../patch2 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
513 patching file a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
514 ==== |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
515 VISIBLE 1:1d4bd90af0e4 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
516 M a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
517 ACTUAL 0:80971e65b431 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
518 M a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
519 ==== |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
520 committing files: |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
521 a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
522 committing manifest |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
523 committing changelog |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
524 created 6d019af21222 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
525 applying ../patch3 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
526 patching file foo |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
527 adding foo |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
528 ==== |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
529 VISIBLE 2:6d019af21222 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
530 A foo |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
531 ACTUAL 0:80971e65b431 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
532 M a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
533 ==== |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
534 committing files: |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
535 foo |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
536 committing manifest |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
537 committing changelog |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
538 created 55e3f75b2378 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
539 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
540 $ hg --cwd b rollback -q |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
541 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
542 (content of file "a" is already changed and it should be recognized as |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
543 "M", even though dirstate is restored to one before "hg import") |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
544 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
545 $ (cd b && sh "$TESTTMP/checkvisibility.sh") |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
546 ==== |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
547 VISIBLE 0:80971e65b431 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
548 M a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
549 ACTUAL 0:80971e65b431 |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
550 M a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
551 ==== |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
552 $ hg --cwd b revert --no-backup a |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
553 $ rm -f b/foo |
9f9ec4abe700
cmdutil: make in-memory changes visible to external editor (issue4378)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26631
diff
changeset
|
554 |
26751
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
555 == test visibility to precommit external hook |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
556 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
557 $ cat >> b/.hg/hgrc <<EOF |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
558 > [hooks] |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
559 > precommit.visibility = sh $TESTTMP/checkvisibility.sh |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
560 > EOF |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
561 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
562 $ (cd b && sh "$TESTTMP/checkvisibility.sh") |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
563 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
564 VISIBLE 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
565 ACTUAL 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
566 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
567 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
568 $ hg --cwd b import ../patch1 ../patch2 ../patch3 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
569 applying ../patch1 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
570 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
571 VISIBLE 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
572 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
573 ACTUAL 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
574 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
575 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
576 applying ../patch2 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
577 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
578 VISIBLE 1:1d4bd90af0e4 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
579 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
580 ACTUAL 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
581 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
582 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
583 applying ../patch3 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
584 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
585 VISIBLE 2:6d019af21222 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
586 A foo |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
587 ACTUAL 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
588 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
589 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
590 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
591 $ hg --cwd b rollback -q |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
592 $ (cd b && sh "$TESTTMP/checkvisibility.sh") |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
593 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
594 VISIBLE 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
595 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
596 ACTUAL 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
597 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
598 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
599 $ hg --cwd b revert --no-backup a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
600 $ rm -f b/foo |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
601 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
602 $ cat >> b/.hg/hgrc <<EOF |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
603 > [hooks] |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
604 > precommit.visibility = |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
605 > EOF |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
606 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
607 == test visibility to pretxncommit external hook |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
608 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
609 $ cat >> b/.hg/hgrc <<EOF |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
610 > [hooks] |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
611 > pretxncommit.visibility = sh $TESTTMP/checkvisibility.sh |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
612 > EOF |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
613 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
614 $ (cd b && sh "$TESTTMP/checkvisibility.sh") |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
615 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
616 VISIBLE 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
617 ACTUAL 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
618 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
619 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
620 $ hg --cwd b import ../patch1 ../patch2 ../patch3 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
621 applying ../patch1 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
622 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
623 VISIBLE 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
624 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
625 ACTUAL 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
626 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
627 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
628 applying ../patch2 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
629 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
630 VISIBLE 1:1d4bd90af0e4 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
631 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
632 ACTUAL 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
633 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
634 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
635 applying ../patch3 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
636 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
637 VISIBLE 2:6d019af21222 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
638 A foo |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
639 ACTUAL 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
640 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
641 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
642 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
643 $ hg --cwd b rollback -q |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
644 $ (cd b && sh "$TESTTMP/checkvisibility.sh") |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
645 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
646 VISIBLE 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
647 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
648 ACTUAL 0:80971e65b431 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
649 M a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
650 ==== |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
651 $ hg --cwd b revert --no-backup a |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
652 $ rm -f b/foo |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
653 |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
654 $ cat >> b/.hg/hgrc <<EOF |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
655 > [hooks] |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
656 > pretxncommit.visibility = |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
657 > EOF |
520defbc0335
hook: centralize passing HG_PENDING to external hook process
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
26750
diff
changeset
|
658 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
659 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
660 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
661 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
662 importing a patch in a subdirectory failed at the commit stage |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
663 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
664 $ echo line 2 >> a/d1/d2/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
665 $ hg --cwd a ci -u someoneelse -d '1 0' -m'subdir change' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
666 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
667 hg import in a subdirectory |
4779
a7915f79d4cc
Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4230
diff
changeset
|
668 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
669 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
670 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
671 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
672 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
673 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32976
diff
changeset
|
674 new changesets 80971e65b431 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
675 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
676 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12316
diff
changeset
|
677 $ hg --cwd a export tip > tmp |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
678 $ sed -e 's/d1\/d2\///' < tmp > subdir-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
679 $ dir=`pwd` |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
680 $ cd b/d1/d2 2>&1 > /dev/null |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
681 $ hg import ../../../subdir-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
682 applying ../../../subdir-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
683 $ cd "$dir" |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
684 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
685 message should be 'subdir change' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
686 committer should be 'someoneelse' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
687 |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
688 $ hg --cwd b tip |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
689 changeset: 1:3577f5aea227 |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
690 tag: tip |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
691 user: someoneelse |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
692 date: Thu Jan 01 00:00:01 1970 +0000 |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
693 summary: subdir change |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
694 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
695 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
696 should be empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
697 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
698 $ hg --cwd b status |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
699 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
700 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
701 Test fuzziness (ambiguous patch location, fuzz=2) |
4779
a7915f79d4cc
Added import test for [PATCH] subject and message body with subject
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4230
diff
changeset
|
702 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
703 $ hg init fuzzy |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
704 $ cd fuzzy |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
705 $ echo line1 > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
706 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
707 $ echo line3 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
708 $ hg ci -Am adda |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
709 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
710 $ echo line1 > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
711 $ echo line2 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
712 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
713 $ echo line3 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
714 $ hg ci -m change a |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
715 $ hg export tip > fuzzy-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
716 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
717 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
718 $ echo line1 > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
719 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
720 $ echo line1 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
721 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
722 $ hg ci -m brancha |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
723 created new head |
25631
2748bf78a5bf
patch: add fuzz config flag (issue4697)
Matt Mackall <mpm@selenic.com>
parents:
25397
diff
changeset
|
724 $ hg import --config patch.fuzz=0 -v fuzzy-tip.patch |
2748bf78a5bf
patch: add fuzz config flag (issue4697)
Matt Mackall <mpm@selenic.com>
parents:
25397
diff
changeset
|
725 applying fuzzy-tip.patch |
2748bf78a5bf
patch: add fuzz config flag (issue4697)
Matt Mackall <mpm@selenic.com>
parents:
25397
diff
changeset
|
726 patching file a |
2748bf78a5bf
patch: add fuzz config flag (issue4697)
Matt Mackall <mpm@selenic.com>
parents:
25397
diff
changeset
|
727 Hunk #1 FAILED at 0 |
2748bf78a5bf
patch: add fuzz config flag (issue4697)
Matt Mackall <mpm@selenic.com>
parents:
25397
diff
changeset
|
728 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
2748bf78a5bf
patch: add fuzz config flag (issue4697)
Matt Mackall <mpm@selenic.com>
parents:
25397
diff
changeset
|
729 abort: patch failed to apply |
2748bf78a5bf
patch: add fuzz config flag (issue4697)
Matt Mackall <mpm@selenic.com>
parents:
25397
diff
changeset
|
730 [255] |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
731 $ hg import --no-commit -v fuzzy-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
732 applying fuzzy-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
733 patching file a |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
734 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
735 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
736 $ hg revert -a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
737 reverting a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
738 |
37815
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
739 Test --exact failure |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
740 |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
741 $ sed 's/^# Parent .*/# Parent '"`hg log -r. -T '{node}'`"'/' \ |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
742 > < fuzzy-tip.patch > fuzzy-reparent.patch |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
743 $ hg import --config patch.fuzz=0 --exact fuzzy-reparent.patch |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
744 applying fuzzy-reparent.patch |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
745 patching file a |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
746 Hunk #1 FAILED at 0 |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
747 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
748 abort: patch failed to apply |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
749 [255] |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
750 $ hg up -qC |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
751 $ hg import --config patch.fuzz=2 --exact fuzzy-reparent.patch |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
752 applying fuzzy-reparent.patch |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
753 patching file a |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
754 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
755 transaction abort! |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
756 rollback completed |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
757 abort: patch is damaged or loses information |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
758 [255] |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
759 $ hg up -qC |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
760 |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
761 $ grep '^#' fuzzy-tip.patch > empty.patch |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
762 $ cat <<'EOF' >> empty.patch |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
763 > change |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
764 > |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
765 > diff -r bb90ef1daa38 -r 0e9b883378d4 a |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
766 > --- a/a Thu Jan 01 00:00:00 1970 +0000 |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
767 > --- b/a Thu Jan 01 00:00:00 1970 +0000 |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
768 > EOF |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
769 $ hg import --exact empty.patch |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
770 applying empty.patch |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
771 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
772 abort: patch is damaged or loses information |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
773 [255] |
32a75a8a5b0f
import: fix crash on --exact check of empty commit (issue5702)
Yuya Nishihara <yuya@tcha.org>
parents:
37573
diff
changeset
|
774 $ hg up -qC |
12913
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
775 |
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
776 import with --no-commit should have written .hg/last-message.txt |
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
777 |
12945
99f7dc8def34
test-import: workaround for missing newline is no longer needed
Mads Kiilerich <mads@kiilerich.com>
parents:
12914
diff
changeset
|
778 $ cat .hg/last-message.txt |
99f7dc8def34
test-import: workaround for missing newline is no longer needed
Mads Kiilerich <mads@kiilerich.com>
parents:
12914
diff
changeset
|
779 change (no-eol) |
12913
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
780 |
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
781 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
782 test fuzziness with eol=auto |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
783 |
14125
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
784 $ hg --config patch.eol=auto import --no-commit -v fuzzy-tip.patch |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
785 applying fuzzy-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
786 patching file a |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
787 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
788 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
789 $ cd .. |
5548
1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations
Patrick Mezard <pmezard@gmail.com>
parents:
5418
diff
changeset
|
790 |
1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations
Patrick Mezard <pmezard@gmail.com>
parents:
5418
diff
changeset
|
791 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
792 Test hunk touching empty files (issue906) |
5852
03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)
Patrick Mezard <pmezard@gmail.com>
parents:
5548
diff
changeset
|
793 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
794 $ hg init empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
795 $ cd empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
796 $ touch a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
797 $ touch b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
798 $ touch c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
799 $ echo d > d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
800 $ hg ci -Am init |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
801 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
802 adding b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
803 adding c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
804 adding d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
805 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
806 $ echo b > b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
807 $ hg mv b1 b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
808 $ echo c > c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
809 $ hg copy c1 c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
810 $ rm d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
811 $ touch d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
812 $ hg diff --git |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
813 diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
814 --- a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
815 +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
816 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
817 +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
818 diff --git a/b1 b/b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
819 rename from b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
820 rename to b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
821 --- a/b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
822 +++ b/b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
823 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
824 +b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
825 diff --git a/c1 b/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
826 --- a/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
827 +++ b/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
828 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
829 +c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
830 diff --git a/c1 b/c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
831 copy from c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
832 copy to c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
833 --- a/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
834 +++ b/c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
835 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
836 +c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
837 diff --git a/d b/d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
838 --- a/d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
839 +++ b/d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
840 @@ -1,1 +0,0 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
841 -d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
842 $ hg ci -m empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
843 $ hg export --git tip > empty.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
844 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
845 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
846 $ hg import empty.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
847 applying empty.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
848 $ for name in a b1 b2 c1 c2 d; do |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
849 > echo % $name file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
850 > test -f $name && cat $name |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
851 > done |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
852 % a file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
853 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
854 % b1 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
855 % b2 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
856 b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
857 % c1 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
858 c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
859 % c2 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
860 c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
861 % d file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
862 $ cd .. |
5852
03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)
Patrick Mezard <pmezard@gmail.com>
parents:
5548
diff
changeset
|
863 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
864 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
865 Test importing a patch ending with a binary file removal |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
866 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
867 $ hg init binaryremoval |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
868 $ cd binaryremoval |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
869 $ echo a > a |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39405
diff
changeset
|
870 $ "$PYTHON" -c "open('b', 'wb').write(b'a\x00b')" |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
871 $ hg ci -Am addall |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
872 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
873 adding b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
874 $ hg rm a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
875 $ hg rm b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
876 $ hg st |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
877 R a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
878 R b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
879 $ hg ci -m remove |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
880 $ hg export --git . > remove.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
881 $ cat remove.diff | grep git |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
882 diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
883 diff --git a/b b/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
884 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
885 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
886 $ hg import remove.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
887 applying remove.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
888 $ hg manifest |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
889 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
890 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
891 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
892 Issue927: test update+rename with common name |
6179
36ab165abbe2
patch: fix iterhunks() with trailing binary file removal
Patrick Mezard <pmezard@gmail.com>
parents:
6001
diff
changeset
|
893 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
894 $ hg init t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
895 $ cd t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
896 $ touch a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
897 $ hg ci -Am t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
898 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
899 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
900 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
901 Here, bfile.startswith(afile) |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
902 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
903 $ hg copy a a2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
904 $ hg ci -m copya |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
905 $ hg export --git tip > copy.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
906 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
907 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
908 $ hg import copy.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
909 applying copy.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
910 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
911 a should contain an 'a' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
912 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
913 $ cat a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
914 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
915 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
916 and a2 should have duplicated it |
6520
ba0b2dacc623
fix import with -p0
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6295
diff
changeset
|
917 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
918 $ cat a2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
919 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
920 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
921 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
922 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
923 test -p0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
924 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
925 $ hg init p0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
926 $ cd p0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
927 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
928 $ hg ci -Am t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
929 adding a |
17712
c4717f44c1f1
fancyopts: don't show a traceback on invalid integer values
Idan Kamara <idankk86@gmail.com>
parents:
16912
diff
changeset
|
930 $ hg import -p foo |
c4717f44c1f1
fancyopts: don't show a traceback on invalid integer values
Idan Kamara <idankk86@gmail.com>
parents:
16912
diff
changeset
|
931 abort: invalid value 'foo' for option -p, expected int |
c4717f44c1f1
fancyopts: don't show a traceback on invalid integer values
Idan Kamara <idankk86@gmail.com>
parents:
16912
diff
changeset
|
932 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
933 $ hg import -p0 - << EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
934 > foobar |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
935 > --- a Sat Apr 12 22:43:58 2008 -0400 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
936 > +++ a Sat Apr 12 22:44:05 2008 -0400 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
937 > @@ -1,1 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
938 > -a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
939 > +bb |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
940 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
941 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
942 $ hg status |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
943 $ cat a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
944 bb |
24259
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
945 |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
946 test --prefix |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
947 |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
948 $ mkdir -p dir/dir2 |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
949 $ echo b > dir/dir2/b |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
950 $ hg ci -Am b |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
951 adding dir/dir2/b |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
952 $ hg import -p2 --prefix dir - << EOF |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
953 > foobar |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
954 > --- drop1/drop2/dir2/b |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
955 > +++ drop1/drop2/dir2/b |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
956 > @@ -1,1 +1,1 @@ |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
957 > -b |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
958 > +cc |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
959 > EOF |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
960 applying patch from stdin |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
961 $ hg status |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
962 $ cat dir/dir2/b |
5ac8ce04baa2
cmdutil.tryimportone: allow importing relative patches into the working dir
Siddharth Agarwal <sid0@fb.com>
parents:
23749
diff
changeset
|
963 cc |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
964 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
965 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
966 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
967 test paths outside repo root |
6758
87c704ac92d4
Check that git patches only touch files under root
Brendan Cully <brendan@kublai.com>
parents:
6520
diff
changeset
|
968 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
969 $ mkdir outside |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
970 $ touch outside/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
971 $ hg init inside |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
972 $ cd inside |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
973 $ hg import - <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
974 > diff --git a/a b/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
975 > rename from ../outside/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
976 > rename to bar |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
977 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
978 applying patch from stdin |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35186
diff
changeset
|
979 abort: path contains illegal component: ../outside/foo |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11807
diff
changeset
|
980 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
981 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
982 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
983 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
984 test import with similarity and git and strip (issue295 et al.) |
7402
bffdab64dfbb
import: add similarity option (issue295)
Brendan Cully <brendan@kublai.com>
parents:
7247
diff
changeset
|
985 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
986 $ hg init sim |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
987 $ cd sim |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
988 $ echo 'this is a test' > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
989 $ hg ci -Ama |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
990 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
991 $ cat > ../rename.diff <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
992 > diff --git a/foo/a b/foo/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
993 > deleted file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
994 > --- a/foo/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
995 > +++ /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
996 > @@ -1,1 +0,0 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
997 > -this is a test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
998 > diff --git a/foo/b b/foo/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
999 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1000 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1001 > +++ b/foo/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1002 > @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1003 > +this is a test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1004 > +foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1005 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1006 $ hg import --no-commit -v -s 1 ../rename.diff -p2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1007 applying ../rename.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1008 patching file a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1009 patching file b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1010 adding b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1011 recording removal of a as rename to b (88% similar) |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
1012 applied to working directory |
35167
9fb2b0b41bec
test-largefiles: demonstrate problems with renaming and reverting a directory
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1013 $ echo 'mod b' > b |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1014 $ hg st -C |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1015 A b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1016 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1017 R a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1018 $ hg revert -a |
39405
cb70501d8b71
revert: fix the inconsistency of status msgs in --interactive mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
37815
diff
changeset
|
1019 forgetting b |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1020 undeleting a |
35167
9fb2b0b41bec
test-largefiles: demonstrate problems with renaming and reverting a directory
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1021 $ cat b |
9fb2b0b41bec
test-largefiles: demonstrate problems with renaming and reverting a directory
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1022 mod b |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1023 $ rm b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1024 $ hg import --no-commit -v -s 100 ../rename.diff -p2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1025 applying ../rename.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1026 patching file a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1027 patching file b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1028 adding b |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
1029 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1030 $ hg st -C |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1031 A b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1032 R a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1033 $ cd .. |
7971
6ea0318daf75
Fix issue1495, corner case of adding empty files via patching
Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
parents:
7402
diff
changeset
|
1034 |
6ea0318daf75
Fix issue1495, corner case of adding empty files via patching
Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
parents:
7402
diff
changeset
|
1035 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
1036 Issue1495: add empty file from the end of patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1037 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1038 $ hg init addemptyend |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1039 $ cd addemptyend |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1040 $ touch a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1041 $ hg addremove |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1042 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1043 $ hg ci -m "commit" |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1044 $ cat > a.patch <<EOF |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1045 > add a, b |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1046 > diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1047 > --- a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1048 > +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1049 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1050 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1051 > diff --git a/b b/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1052 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1053 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1054 $ hg import --no-commit a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1055 applying a.patch |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1056 |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1057 apply a good patch followed by an empty patch (mainly to ensure |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1058 that dirstate is *not* updated when import crashes) |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1059 $ hg update -q -C . |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1060 $ rm b |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1061 $ touch empty.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1062 $ hg import a.patch empty.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1063 applying a.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1064 applying empty.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1065 transaction abort! |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1066 rollback completed |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1067 abort: empty.patch: no diffs found |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1068 [255] |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1069 $ hg tip --template '{rev} {desc|firstline}\n' |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1070 0 commit |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1071 $ hg -q status |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
1072 M a |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1073 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1074 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1075 create file when source is not /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1076 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1077 $ cat > create.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1078 > diff -Naur proj-orig/foo proj-new/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1079 > --- proj-orig/foo 1969-12-31 16:00:00.000000000 -0800 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1080 > +++ proj-new/foo 2009-07-17 16:50:45.801368000 -0700 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1081 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1082 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1083 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1084 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1085 some people have patches like the following too |
9573
b8352a3617f3
patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com>
parents:
8523
diff
changeset
|
1086 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1087 $ cat > create2.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1088 > diff -Naur proj-orig/foo proj-new/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1089 > --- proj-orig/foo.orig 1969-12-31 16:00:00.000000000 -0800 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1090 > +++ proj-new/foo 2009-07-17 16:50:45.801368000 -0700 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1091 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1092 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1093 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1094 $ hg init oddcreate |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1095 $ cd oddcreate |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1096 $ hg import --no-commit ../create.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1097 applying ../create.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1098 $ cat foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1099 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1100 $ rm foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1101 $ hg revert foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1102 $ hg import --no-commit ../create2.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1103 applying ../create2.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1104 $ cat foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1105 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1106 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
1107 $ cd .. |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1108 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
1109 Issue1859: first line mistaken for email headers |
9576 | 1110 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1111 $ hg init emailconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1112 $ cd emailconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1113 $ cat > a.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1114 > module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1115 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1116 > description |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1117 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1118 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1119 > diff -r 000000000000 -r 9b4c1e343b55 test.txt |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1120 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1121 > +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1122 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1123 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1124 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1125 $ hg import -d '0 0' a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1126 applying a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1127 $ hg parents -v |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1128 changeset: 0:5a681217c0ad |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1129 tag: tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1130 user: test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1131 date: Thu Jan 01 00:00:00 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1132 files: a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1133 description: |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1134 module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1135 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1136 description |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1137 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1138 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1139 $ cd .. |
9573
b8352a3617f3
patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com>
parents:
8523
diff
changeset
|
1140 |
b8352a3617f3
patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com>
parents:
8523
diff
changeset
|
1141 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
1142 in commit message |
10729
7a5931c5f2dc
patch: enhance diff detection regexp, allow '--- ' in patch message
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10524
diff
changeset
|
1143 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1144 $ hg init commitconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1145 $ cd commitconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1146 $ cat > a.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1147 > module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1148 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1149 > --- description |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1150 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1151 > diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1152 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1153 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1154 > +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1155 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1156 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1157 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1158 > hg import -d '0 0' a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1159 > hg parents -v |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1160 > cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1161 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1162 > echo '% tricky header splitting' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1163 > cat > trickyheaders.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1164 > From: User A <user@a> |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1165 > Subject: [PATCH] from: tricky! |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1166 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1167 > # HG changeset patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1168 > # User User B |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1169 > # Date 1266264441 18000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1170 > # Branch stable |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1171 > # Node ID f2be6a1170ac83bf31cb4ae0bad00d7678115bc0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1172 > # Parent 0000000000000000000000000000000000000000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1173 > from: tricky! |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1174 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1175 > That is not a header. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1176 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1177 > diff -r 000000000000 -r f2be6a1170ac foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1178 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1179 > +++ b/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1180 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1181 > +foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1182 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1183 applying a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1184 changeset: 0:f34d9187897d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1185 tag: tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1186 user: test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1187 date: Thu Jan 01 00:00:00 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1188 files: a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1189 description: |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1190 module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1191 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1192 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1193 % tricky header splitting |
10501
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10384
diff
changeset
|
1194 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1195 $ hg init trickyheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1196 $ cd trickyheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1197 $ hg import -d '0 0' ../trickyheaders.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1198 applying ../trickyheaders.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1199 $ hg export --git tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1200 # HG changeset patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1201 # User User B |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1202 # Date 0 0 |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
17712
diff
changeset
|
1203 # Thu Jan 01 00:00:00 1970 +0000 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1204 # Node ID eb56ab91903632294ac504838508cb370c0901d2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1205 # Parent 0000000000000000000000000000000000000000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1206 from: tricky! |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1207 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1208 That is not a header. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1209 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1210 diff --git a/foo b/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1211 new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1212 --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1213 +++ b/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1214 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1215 +foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1216 $ cd .. |
10501
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10384
diff
changeset
|
1217 |
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10384
diff
changeset
|
1218 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
1219 Issue2102: hg export and hg import speak different languages |
10748
fb06e357e698
patch: more precise NoHunk, raised for every file (issue2102)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10745
diff
changeset
|
1220 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1221 $ hg init issue2102 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1222 $ cd issue2102 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1223 $ mkdir -p src/cmd/gc |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1224 $ touch src/cmd/gc/mksys.bash |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1225 $ hg ci -Am init |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1226 adding src/cmd/gc/mksys.bash |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1227 $ hg import - <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1228 > # HG changeset patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1229 > # User Rob Pike |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1230 > # Date 1216685449 25200 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1231 > # Node ID 03aa2b206f499ad6eb50e6e207b9e710d6409c98 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1232 > # Parent 93d10138ad8df586827ca90b4ddb5033e21a3a84 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1233 > help management of empty pkg and lib directories in perforce |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1234 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1235 > R=gri |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1236 > DELTA=4 (4 added, 0 deleted, 0 changed) |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1237 > OCL=13328 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1238 > CL=13328 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1239 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1240 > diff --git a/lib/place-holder b/lib/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1241 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1242 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1243 > +++ b/lib/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1244 > @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1245 > +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1246 > +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1247 > diff --git a/pkg/place-holder b/pkg/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1248 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1249 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1250 > +++ b/pkg/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1251 > @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1252 > +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1253 > +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1254 > diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1255 > old mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1256 > new mode 100755 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1257 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1258 applying patch from stdin |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1259 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1260 #if execbit |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1261 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1262 $ hg sum |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1263 parent: 1:d59915696727 tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1264 help management of empty pkg and lib directories in perforce |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1265 branch: default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1266 commit: (clean) |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1267 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25154
diff
changeset
|
1268 phases: 2 draft |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1269 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1270 $ hg diff --git -c tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1271 diff --git a/lib/place-holder b/lib/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1272 new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1273 --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1274 +++ b/lib/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1275 @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1276 +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1277 +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1278 diff --git a/pkg/place-holder b/pkg/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1279 new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1280 --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1281 +++ b/pkg/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1282 @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1283 +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1284 +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1285 diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1286 old mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1287 new mode 100755 |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1288 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1289 #else |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1290 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1291 $ hg sum |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1292 parent: 1:28f089cc9ccc tip |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1293 help management of empty pkg and lib directories in perforce |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1294 branch: default |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1295 commit: (clean) |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1296 update: (current) |
25397
0b6dee81ebb7
test-import: sync with 6084926366b9 for platforms without execbit
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1297 phases: 2 draft |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1298 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1299 $ hg diff --git -c tip |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1300 diff --git a/lib/place-holder b/lib/place-holder |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1301 new file mode 100644 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1302 --- /dev/null |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1303 +++ b/lib/place-holder |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1304 @@ -0,0 +1,2 @@ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1305 +perforce does not maintain empty directories. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1306 +this file helps. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1307 diff --git a/pkg/place-holder b/pkg/place-holder |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1308 new file mode 100644 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1309 --- /dev/null |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1310 +++ b/pkg/place-holder |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1311 @@ -0,0 +1,2 @@ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1312 +perforce does not maintain empty directories. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1313 +this file helps. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1314 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1315 /* The mode change for mksys.bash is missing here, because on platforms */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1316 /* that don't support execbits, mode changes in patches are ignored when */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1317 /* they are imported. This is obviously also the reason for why the hash */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1318 /* in the created changeset is different to the one you see above the */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1319 /* #else clause */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1320 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
1321 #endif |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1322 $ cd .. |
10748
fb06e357e698
patch: more precise NoHunk, raised for every file (issue2102)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10745
diff
changeset
|
1323 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1324 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1325 diff lines looking like headers |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1326 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1327 $ hg init difflineslikeheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1328 $ cd difflineslikeheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1329 $ echo a >a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1330 $ echo b >b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1331 $ echo c >c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1332 $ hg ci -Am1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1333 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1334 adding b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1335 adding c |
10883
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10775
diff
changeset
|
1336 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1337 $ echo "key: value" >>a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1338 $ echo "key: value" >>b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1339 $ echo "foo" >>c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1340 $ hg ci -m2 |
10883
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10775
diff
changeset
|
1341 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1342 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1343 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1344 $ hg diff --git -c1 >want |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1345 $ hg diff -c1 | hg import --no-commit - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1346 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1347 $ hg diff --git >have |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1348 $ diff want have |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
1349 $ cd .. |
10883
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10775
diff
changeset
|
1350 |
15462
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1351 import a unified diff with no lines of context (diff -U0) |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1352 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1353 $ hg init diffzero |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1354 $ cd diffzero |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1355 $ cat > f << EOF |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1356 > c2 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1357 > c4 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1358 > c5 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1359 > EOF |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1360 $ hg commit -Am0 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1361 adding f |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1362 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1363 $ hg import --no-commit - << EOF |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1364 > # HG changeset patch |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1365 > # User test |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1366 > # Date 0 0 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1367 > # Node ID f4974ab632f3dee767567b0576c0ec9a4508575c |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1368 > # Parent 8679a12a975b819fae5f7ad3853a2886d143d794 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1369 > 1 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1370 > diff -r 8679a12a975b -r f4974ab632f3 f |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1371 > --- a/f Thu Jan 01 00:00:00 1970 +0000 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1372 > +++ b/f Thu Jan 01 00:00:00 1970 +0000 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1373 > @@ -0,0 +1,1 @@ |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1374 > +c1 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1375 > @@ -1,0 +3,1 @@ |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1376 > +c3 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1377 > @@ -3,1 +4,0 @@ |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1378 > -c5 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1379 > EOF |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1380 applying patch from stdin |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1381 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1382 $ cat f |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1383 c1 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1384 c2 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1385 c3 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1386 c4 |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1387 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
1388 $ cd .. |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
1389 |
34964
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1390 commit message that looks like a diff header (issue1879) |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1391 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1392 $ hg init headerlikemsg |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1393 $ cd headerlikemsg |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1394 $ touch empty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1395 $ echo nonempty >> nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1396 $ hg ci -qAl - <<EOF |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1397 > blah blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1398 > diff blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1399 > blah blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1400 > EOF |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1401 $ hg --config diff.git=1 log -pv |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1402 changeset: 0:c6ef204ef767 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1403 tag: tip |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1404 user: test |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1405 date: Thu Jan 01 00:00:00 1970 +0000 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1406 files: empty nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1407 description: |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1408 blah blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1409 diff blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1410 blah blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1411 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1412 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1413 diff --git a/empty b/empty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1414 new file mode 100644 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1415 diff --git a/nonempty b/nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1416 new file mode 100644 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1417 --- /dev/null |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1418 +++ b/nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1419 @@ -0,0 +1,1 @@ |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1420 +nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1421 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1422 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1423 (without --git, empty file is lost, but commit message should be preserved) |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1424 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1425 $ hg init plain |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1426 $ hg export 0 | hg -R plain import - |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1427 applying patch from stdin |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1428 $ hg --config diff.git=1 -R plain log -pv |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1429 changeset: 0:60a2d231e71f |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1430 tag: tip |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1431 user: test |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1432 date: Thu Jan 01 00:00:00 1970 +0000 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1433 files: nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1434 description: |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1435 blah blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1436 diff blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1437 blah blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1438 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1439 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1440 diff --git a/nonempty b/nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1441 new file mode 100644 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1442 --- /dev/null |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1443 +++ b/nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1444 @@ -0,0 +1,1 @@ |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1445 +nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1446 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1447 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1448 (with --git, patch contents should be fully preserved) |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1449 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1450 $ hg init git |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1451 $ hg --config diff.git=1 export 0 | hg -R git import - |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1452 applying patch from stdin |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1453 $ hg --config diff.git=1 -R git log -pv |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1454 changeset: 0:c6ef204ef767 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1455 tag: tip |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1456 user: test |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1457 date: Thu Jan 01 00:00:00 1970 +0000 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1458 files: empty nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1459 description: |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1460 blah blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1461 diff blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1462 blah blah |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1463 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1464 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1465 diff --git a/empty b/empty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1466 new file mode 100644 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1467 diff --git a/nonempty b/nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1468 new file mode 100644 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1469 --- /dev/null |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1470 +++ b/nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1471 @@ -0,0 +1,1 @@ |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1472 +nonempty |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1473 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1474 |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1475 $ cd .. |
7ebf850d3166
patch: improve heuristics to not take the word "diff" as header (issue1879)
Yuya Nishihara <yuya@tcha.org>
parents:
34661
diff
changeset
|
1476 |
16650
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1477 no segfault while importing a unified diff which start line is zero but chunk |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1478 size is non-zero |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1479 |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1480 $ hg init startlinezero |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1481 $ cd startlinezero |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1482 $ echo foo > foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1483 $ hg commit -Amfoo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1484 adding foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1485 |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1486 $ hg import --no-commit - << EOF |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1487 > diff a/foo b/foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1488 > --- a/foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1489 > +++ b/foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1490 > @@ -0,1 +0,1 @@ |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1491 > foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1492 > EOF |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1493 applying patch from stdin |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1494 |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1495 $ cd .. |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1496 |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1497 Test corner case involving fuzz and skew |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1498 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1499 $ hg init morecornercases |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1500 $ cd morecornercases |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1501 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1502 $ cat > 01-no-context-beginning-of-file.diff <<EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1503 > diff --git a/a b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1504 > --- a/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1505 > +++ b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1506 > @@ -1,0 +1,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1507 > +line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1508 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1509 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1510 $ cat > 02-no-context-middle-of-file.diff <<EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1511 > diff --git a/a b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1512 > --- a/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1513 > +++ b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1514 > @@ -1,1 +1,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1515 > -2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1516 > +add some skew |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1517 > @@ -2,0 +2,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1518 > +line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1519 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1520 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1521 $ cat > 03-no-context-end-of-file.diff <<EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1522 > diff --git a/a b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1523 > --- a/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1524 > +++ b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1525 > @@ -10,0 +10,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1526 > +line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1527 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1528 |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1529 $ cat > 04-middle-of-file-completely-fuzzed.diff <<EOF |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1530 > diff --git a/a b/a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1531 > --- a/a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1532 > +++ b/a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1533 > @@ -1,1 +1,1 @@ |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1534 > -2 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1535 > +add some skew |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1536 > @@ -2,2 +2,3 @@ |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1537 > not matching, should fuzz |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1538 > ... a bit |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1539 > +line |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1540 > EOF |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1541 |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1542 $ cat > a <<EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1543 > 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1544 > 2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1545 > 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1546 > 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1547 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1548 $ hg ci -Am adda a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1549 $ for p in *.diff; do |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1550 > hg import -v --no-commit $p |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1551 > cat a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1552 > hg revert -aqC a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1553 > # patch -p1 < $p |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1554 > # cat a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1555 > # hg revert -aC a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1556 > done |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1557 applying 01-no-context-beginning-of-file.diff |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1558 patching file a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1559 applied to working directory |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1560 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1561 line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1562 2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1563 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1564 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1565 applying 02-no-context-middle-of-file.diff |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1566 patching file a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1567 Hunk #1 succeeded at 2 (offset 1 lines). |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1568 Hunk #2 succeeded at 4 (offset 1 lines). |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1569 applied to working directory |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1570 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1571 add some skew |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1572 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1573 line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1574 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1575 applying 03-no-context-end-of-file.diff |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1576 patching file a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1577 Hunk #1 succeeded at 5 (offset -6 lines). |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1578 applied to working directory |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1579 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1580 2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1581 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1582 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1583 line |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1584 applying 04-middle-of-file-completely-fuzzed.diff |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1585 patching file a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1586 Hunk #1 succeeded at 2 (offset 1 lines). |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1587 Hunk #2 succeeded at 5 with fuzz 2 (offset 1 lines). |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1588 applied to working directory |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1589 1 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1590 add some skew |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1591 3 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1592 4 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1593 line |
21553
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1594 $ cd .. |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1595 |
21553
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1596 Test partial application |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1597 ------------------------ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1598 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1599 prepare a stack of patches depending on each other |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1600 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1601 $ hg init partial |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1602 $ cd partial |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1603 $ cat << EOF > a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1604 > one |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1605 > two |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1606 > three |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1607 > four |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1608 > five |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1609 > six |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1610 > seven |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1611 > EOF |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1612 $ hg add a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1613 $ echo 'b' > b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1614 $ hg add b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1615 $ hg commit -m 'initial' -u Babar |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1616 $ cat << EOF > a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1617 > one |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1618 > two |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1619 > 3 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1620 > four |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1621 > five |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1622 > six |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1623 > seven |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1624 > EOF |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1625 $ hg commit -m 'three' -u Celeste |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1626 $ cat << EOF > a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1627 > one |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1628 > two |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1629 > 3 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1630 > 4 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1631 > five |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1632 > six |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1633 > seven |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1634 > EOF |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1635 $ hg commit -m 'four' -u Rataxes |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1636 $ cat << EOF > a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1637 > one |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1638 > two |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1639 > 3 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1640 > 4 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1641 > 5 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1642 > six |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1643 > seven |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1644 > EOF |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1645 $ echo bb >> b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1646 $ hg commit -m 'five' -u Arthur |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1647 $ echo 'Babar' > jungle |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1648 $ hg add jungle |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1649 $ hg ci -m 'jungle' -u Zephir |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1650 $ echo 'Celeste' >> jungle |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1651 $ hg ci -m 'extended jungle' -u Cornelius |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1652 $ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1653 @ extended jungle [Cornelius] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1654 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1655 o jungle [Zephir] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1656 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1657 o five [Arthur] 2: +2/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1658 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1659 o four [Rataxes] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1660 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1661 o three [Celeste] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1662 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1663 o initial [Babar] 2: +8/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1664 |
30811
cf1e15f91c90
templatekw: force noprefix=False to insure diffstat consistency (issue4755)
Matthieu Laneuville <mlaneuville@protonmail.com>
parents:
30332
diff
changeset
|
1665 Adding those config options should not change the output of diffstat. Bugfix #4755. |
cf1e15f91c90
templatekw: force noprefix=False to insure diffstat consistency (issue4755)
Matthieu Laneuville <mlaneuville@protonmail.com>
parents:
30332
diff
changeset
|
1666 |
cf1e15f91c90
templatekw: force noprefix=False to insure diffstat consistency (issue4755)
Matthieu Laneuville <mlaneuville@protonmail.com>
parents:
30332
diff
changeset
|
1667 $ hg log -r . --template '{diffstat}\n' |
cf1e15f91c90
templatekw: force noprefix=False to insure diffstat consistency (issue4755)
Matthieu Laneuville <mlaneuville@protonmail.com>
parents:
30332
diff
changeset
|
1668 1: +1/-0 |
cf1e15f91c90
templatekw: force noprefix=False to insure diffstat consistency (issue4755)
Matthieu Laneuville <mlaneuville@protonmail.com>
parents:
30332
diff
changeset
|
1669 $ hg log -r . --template '{diffstat}\n' --config diff.git=1 \ |
cf1e15f91c90
templatekw: force noprefix=False to insure diffstat consistency (issue4755)
Matthieu Laneuville <mlaneuville@protonmail.com>
parents:
30332
diff
changeset
|
1670 > --config diff.noprefix=1 |
cf1e15f91c90
templatekw: force noprefix=False to insure diffstat consistency (issue4755)
Matthieu Laneuville <mlaneuville@protonmail.com>
parents:
30332
diff
changeset
|
1671 1: +1/-0 |
21553
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1672 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1673 Importing with some success and some errors: |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1674 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1675 $ hg update --rev 'desc(initial)' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1676 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1677 $ hg export --rev 'desc(five)' | hg import --partial - |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1678 applying patch from stdin |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1679 patching file a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1680 Hunk #1 FAILED at 1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1681 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1682 patch applied partially |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1683 (fix the .rej files and run `hg commit --amend`) |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1684 [1] |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1685 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1686 $ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1687 @ five [Arthur] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1688 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1689 | o extended jungle [Cornelius] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1690 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1691 | o jungle [Zephir] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1692 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1693 | o five [Arthur] 2: +2/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1694 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1695 | o four [Rataxes] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1696 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1697 | o three [Celeste] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1698 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1699 o initial [Babar] 2: +8/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1700 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1701 $ hg export |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1702 # HG changeset patch |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1703 # User Arthur |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1704 # Date 0 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1705 # Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1706 # Node ID 26e6446bb2526e2be1037935f5fca2b2706f1509 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1707 # Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1708 five |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1709 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1710 diff -r 8e4f0351909e -r 26e6446bb252 b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1711 --- a/b Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1712 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1713 @@ -1,1 +1,2 @@ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1714 b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1715 +bb |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1716 $ hg status -c . |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1717 C a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1718 C b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1719 $ ls |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1720 a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1721 a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1722 b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1723 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1724 Importing with zero success: |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1725 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1726 $ hg update --rev 'desc(initial)' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1727 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1728 $ hg export --rev 'desc(four)' | hg import --partial - |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1729 applying patch from stdin |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1730 patching file a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1731 Hunk #1 FAILED at 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1732 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1733 patch applied partially |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1734 (fix the .rej files and run `hg commit --amend`) |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1735 [1] |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1736 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1737 $ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1738 @ four [Rataxes] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1739 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1740 | o five [Arthur] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1741 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1742 | o extended jungle [Cornelius] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1743 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1744 | o jungle [Zephir] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1745 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1746 | o five [Arthur] 2: +2/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1747 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1748 | o four [Rataxes] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1749 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1750 | o three [Celeste] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1751 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1752 o initial [Babar] 2: +8/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1753 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1754 $ hg export |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1755 # HG changeset patch |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1756 # User Rataxes |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1757 # Date 0 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1758 # Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1759 # Node ID cb9b1847a74d9ad52e93becaf14b98dbcc274e1e |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1760 # Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1761 four |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1762 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1763 $ hg status -c . |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1764 C a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1765 C b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1766 $ ls |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1767 a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1768 a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1769 b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1770 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1771 Importing with unknown file: |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1772 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1773 $ hg update --rev 'desc(initial)' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1774 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1775 $ hg export --rev 'desc("extended jungle")' | hg import --partial - |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1776 applying patch from stdin |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1777 unable to find 'jungle' for patching |
29900
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1778 (use '--prefix' to apply patch relative to the current directory) |
21553
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1779 1 out of 1 hunks FAILED -- saving rejects to file jungle.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1780 patch applied partially |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1781 (fix the .rej files and run `hg commit --amend`) |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1782 [1] |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1783 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1784 $ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1785 @ extended jungle [Cornelius] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1786 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1787 | o four [Rataxes] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1788 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1789 | o five [Arthur] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1790 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1791 | o extended jungle [Cornelius] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1792 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1793 | o jungle [Zephir] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1794 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1795 | o five [Arthur] 2: +2/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1796 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1797 | o four [Rataxes] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1798 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1799 | o three [Celeste] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1800 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1801 o initial [Babar] 2: +8/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1802 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1803 $ hg export |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1804 # HG changeset patch |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1805 # User Cornelius |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1806 # Date 0 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1807 # Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1808 # Node ID 1fb1f86bef43c5a75918178f8d23c29fb0a7398d |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1809 # Parent 8e4f0351909eae6b9cf68c2c076cb54c42b54b2e |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1810 extended jungle |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1811 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1812 $ hg status -c . |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1813 C a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1814 C b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1815 $ ls |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1816 a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1817 a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1818 b |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1819 jungle.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1820 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1821 Importing multiple failing patches: |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1822 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1823 $ hg update --rev 'desc(initial)' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1824 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1825 $ echo 'B' > b # just to make another commit |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1826 $ hg commit -m "a new base" |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1827 created new head |
22858
d7cedb32a8ab
test-import.t: use proper revset order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22278
diff
changeset
|
1828 $ hg export --rev 'desc("four") + desc("extended jungle")' | hg import --partial - |
21553
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1829 applying patch from stdin |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1830 patching file a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1831 Hunk #1 FAILED at 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1832 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1833 patch applied partially |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1834 (fix the .rej files and run `hg commit --amend`) |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1835 [1] |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1836 $ hg log -G --template '{desc|firstline} [{author}] {diffstat}\n' |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1837 @ four [Rataxes] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1838 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1839 o a new base [test] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1840 | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1841 | o extended jungle [Cornelius] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1842 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1843 | o four [Rataxes] 0: +0/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1844 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1845 | o five [Arthur] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1846 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1847 | o extended jungle [Cornelius] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1848 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1849 | o jungle [Zephir] 1: +1/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1850 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1851 | o five [Arthur] 2: +2/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1852 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1853 | o four [Rataxes] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1854 | | |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1855 | o three [Celeste] 1: +1/-1 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1856 |/ |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1857 o initial [Babar] 2: +8/-0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1858 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1859 $ hg export |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1860 # HG changeset patch |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1861 # User Rataxes |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1862 # Date 0 0 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1863 # Thu Jan 01 00:00:00 1970 +0000 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1864 # Node ID a9d7b6d0ffbb4eb12b7d5939250fcd42e8930a1d |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1865 # Parent f59f8d2e95a8ca5b1b4ca64320140da85f3b44fd |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1866 four |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1867 |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1868 $ hg status -c . |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1869 C a |
bee0e1cffdd3
import: add --partial flag to create a changeset despite failed hunks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21417
diff
changeset
|
1870 C b |
26561
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1871 |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1872 Importing some extra header |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1873 =========================== |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1874 |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1875 $ cat > $TESTTMP/parseextra.py <<EOF |
40369
ef6cab7930b3
py3: fix module imports in tests, as flagged by test-check-module-imports.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
39707
diff
changeset
|
1876 > import mercurial.cmdutil |
26561
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1877 > import mercurial.patch |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1878 > |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1879 > def processfoo(repo, data, extra, opts): |
37457
d83191e9749b
py3: byte-stringify test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
36024
diff
changeset
|
1880 > if b'foo' in data: |
d83191e9749b
py3: byte-stringify test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
36024
diff
changeset
|
1881 > extra[b'foo'] = data[b'foo'] |
26562
dd2f5e014806
import: allow processing of extra part header after import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26561
diff
changeset
|
1882 > def postimport(ctx): |
37457
d83191e9749b
py3: byte-stringify test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
36024
diff
changeset
|
1883 > if b'foo' in ctx.extra(): |
d83191e9749b
py3: byte-stringify test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
36024
diff
changeset
|
1884 > ctx.repo().ui.write(b'imported-foo: %s\n' % ctx.extra()[b'foo']) |
26561
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1885 > |
37457
d83191e9749b
py3: byte-stringify test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
36024
diff
changeset
|
1886 > mercurial.patch.patchheadermap.append((b'Foo', b'foo')) |
d83191e9749b
py3: byte-stringify test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
36024
diff
changeset
|
1887 > mercurial.cmdutil.extrapreimport.append(b'foo') |
d83191e9749b
py3: byte-stringify test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
36024
diff
changeset
|
1888 > mercurial.cmdutil.extrapreimportmap[b'foo'] = processfoo |
d83191e9749b
py3: byte-stringify test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
36024
diff
changeset
|
1889 > mercurial.cmdutil.extrapostimport.append(b'foo') |
d83191e9749b
py3: byte-stringify test-import.t
Yuya Nishihara <yuya@tcha.org>
parents:
36024
diff
changeset
|
1890 > mercurial.cmdutil.extrapostimportmap[b'foo'] = postimport |
26561
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1891 > EOF |
27054
fe458d078ed7
test-import: don't use printf to append an extension to $HGRCPATH
Matt Harbison <matt_harbison@yahoo.com>
parents:
26751
diff
changeset
|
1892 $ cat >> $HGRCPATH <<EOF |
fe458d078ed7
test-import: don't use printf to append an extension to $HGRCPATH
Matt Harbison <matt_harbison@yahoo.com>
parents:
26751
diff
changeset
|
1893 > [extensions] |
fe458d078ed7
test-import: don't use printf to append an extension to $HGRCPATH
Matt Harbison <matt_harbison@yahoo.com>
parents:
26751
diff
changeset
|
1894 > parseextra=$TESTTMP/parseextra.py |
fe458d078ed7
test-import: don't use printf to append an extension to $HGRCPATH
Matt Harbison <matt_harbison@yahoo.com>
parents:
26751
diff
changeset
|
1895 > EOF |
26561
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1896 $ hg up -C tip |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1897 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1898 $ cat > $TESTTMP/foo.patch <<EOF |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1899 > # HG changeset patch |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1900 > # User Rataxes |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1901 > # Date 0 0 |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1902 > # Thu Jan 01 00:00:00 1970 +0000 |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1903 > # Foo bar |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1904 > height |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1905 > |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1906 > --- a/a Thu Jan 01 00:00:00 1970 +0000 |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1907 > +++ b/a Wed Oct 07 09:17:44 2015 +0000 |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1908 > @@ -5,3 +5,4 @@ |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1909 > five |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1910 > six |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1911 > seven |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1912 > +heigt |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1913 > EOF |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1914 $ hg import $TESTTMP/foo.patch |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1915 applying $TESTTMP/foo.patch |
26562
dd2f5e014806
import: allow processing of extra part header after import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26561
diff
changeset
|
1916 imported-foo: bar |
26561
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1917 $ hg log --debug -r . | grep extra |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1918 extra: branch=default |
1f14920a892c
import: allow processing of extra part header during import
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25631
diff
changeset
|
1919 extra: foo=bar |
29900
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1920 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1921 Warn the user that paths are relative to the root of |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1922 repository when file not found for patching |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1923 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1924 $ mkdir filedir |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1925 $ echo "file1" >> filedir/file1 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1926 $ hg add filedir/file1 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1927 $ hg commit -m "file1" |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1928 $ cd filedir |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1929 $ hg import -p 2 - <<EOF |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1930 > # HG changeset patch |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1931 > # User test |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1932 > # Date 0 0 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1933 > file2 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1934 > |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1935 > diff --git a/filedir/file1 b/filedir/file1 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1936 > --- a/filedir/file1 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1937 > +++ b/filedir/file1 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1938 > @@ -1,1 +1,2 @@ |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1939 > file1 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1940 > +file2 |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1941 > EOF |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1942 applying patch from stdin |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1943 unable to find 'file1' for patching |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1944 (use '--prefix' to apply patch relative to the current directory) |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1945 1 out of 1 hunks FAILED -- saving rejects to file file1.rej |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1946 abort: patch failed to apply |
50f2966f86ca
import: report directory-relative paths in error messages (issue5224)
liscju <piotr.listkiewicz@gmail.com>
parents:
29485
diff
changeset
|
1947 [255] |
30078
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29900
diff
changeset
|
1948 |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29900
diff
changeset
|
1949 test import crash (issue5375) |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29900
diff
changeset
|
1950 $ cd .. |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29900
diff
changeset
|
1951 $ hg init repo |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29900
diff
changeset
|
1952 $ cd repo |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29900
diff
changeset
|
1953 $ printf "diff --git a/a b/b\nrename from a\nrename to b" | hg import - |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29900
diff
changeset
|
1954 applying patch from stdin |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29900
diff
changeset
|
1955 a not tracked! |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29900
diff
changeset
|
1956 abort: source file 'a' does not exist |
173bdb502503
import: abort instead of crashing when copy source does not exist (issue5375)
Ryan McElroy <rmcelroy@fb.com>
parents:
29900
diff
changeset
|
1957 [255] |
37573
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1958 |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1959 test immature end of hunk |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1960 |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1961 $ hg import - <<'EOF' |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1962 > diff --git a/foo b/foo |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1963 > --- a/foo |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1964 > --- b/foo |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1965 > @@ -0,0 +1,1 @@ |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1966 > EOF |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1967 applying patch from stdin |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1968 abort: bad hunk #1: incomplete hunk |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1969 [255] |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1970 |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1971 $ hg import - <<'EOF' |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1972 > diff --git a/foo b/foo |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1973 > --- a/foo |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1974 > --- b/foo |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1975 > @@ -0,0 +1,1 @@ |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1976 > \ No newline at end of file |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1977 > EOF |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1978 applying patch from stdin |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1979 abort: bad hunk #1: incomplete hunk |
49b82cdb5983
patch: error out if reached to EOF while reading hunk
Yuya Nishihara <yuya@tcha.org>
parents:
37467
diff
changeset
|
1980 [255] |