Mercurial > hg
annotate tests/test-import.t @ 20647:70d02abff434
histedit: clean up lock imports
We are alread importing the release function from lock, no need
to actually import the module too.
author | Olle Lundberg <geek@nerd.sh> |
---|---|
date | Wed, 05 Mar 2014 22:02:45 +0100 |
parents | 9e8298a324ac |
children | 308aaeb956e2 |
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 |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
26 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
27 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
28 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
29 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
30 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
31 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
32 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
33 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
|
34 $ hg --cwd 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
|
35 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
|
36 |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
17712
diff
changeset
|
37 message and committer and date should be same |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
38 |
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
|
39 $ 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
|
40 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
|
41 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
|
42 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
|
43 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
|
44 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
|
45 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
46 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
47 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
48 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
49 import exported patch with external patcher |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
50 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
51 $ cat > dummypatch.py <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
52 > print 'patching file a' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
53 > file('a', 'wb').write('line2\n') |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
54 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
55 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
56 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
57 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
58 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
59 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
60 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
61 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
|
62 $ hg --config ui.patch='python ../dummypatch.py' --cwd 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
|
63 applying ../exported-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
64 $ cat b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
65 line2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
66 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
67 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
68 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
69 import of plain diff should fail without message |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
70 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
71 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
72 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
73 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
74 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
75 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
76 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
77 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
|
78 $ hg --cwd b import ../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
|
79 applying ../diffed-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
80 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11807
diff
changeset
|
81 [255] |
11807
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 |
7247
c4461ea8b4c8
patch: fix patched files records in externalpatcher()
Patrick Mezard <pmezard@gmail.com>
parents:
6758
diff
changeset
|
84 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
85 import of plain diff should be ok with message |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
86 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
87 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
88 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
89 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
90 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
91 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
92 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
93 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
|
94 $ 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
|
95 applying ../diffed-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
96 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
97 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
98 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
99 import of plain diff with specific date and user |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
100 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
101 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
102 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
103 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
104 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
105 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
106 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
107 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
|
108 $ 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
|
109 applying ../diffed-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
110 $ hg -R b tip -pv |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
111 changeset: 1:ca68f19f3a40 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
112 tag: tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
113 user: user@nowhere.net |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
114 date: Thu Jan 01 00:00:01 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
115 files: a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
116 description: |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
117 patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
118 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
119 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
120 diff -r 80971e65b431 -r ca68f19f3a40 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
121 --- 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
|
122 +++ 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
|
123 @@ -1,1 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
124 line 1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
125 +line 2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
126 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
127 $ rm -r b |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
128 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
129 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
130 import of plain diff should be ok with --no-commit |
5953
e7f1be4bf40a
Permitting the import command to accept a --user option.
Jesse Glick <jesse.glick@sun.com>
parents:
5937
diff
changeset
|
131 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
132 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
133 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
134 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
135 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
136 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
137 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
138 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
|
139 $ hg --cwd b import --no-commit ../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
|
140 applying ../diffed-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
141 $ hg --cwd b diff --nodates |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
142 diff -r 80971e65b431 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
143 --- a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
144 +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
145 @@ -1,1 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
146 line 1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
147 +line 2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
148 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
149 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
150 |
12675
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
151 import of malformed plain diff should fail |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
152 |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
153 $ hg clone -r0 a b |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
154 adding changesets |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
155 adding manifests |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
156 adding file changes |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
157 added 1 changesets with 2 changes to 2 files |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
158 updating to branch default |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
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 $ 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
|
161 $ hg --cwd b import -mpatch ../broken.patch |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
162 applying ../broken.patch |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
163 abort: bad hunk #1 |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
164 [255] |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
165 $ rm -r b |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
166 |
c6cdc123f6e4
patch: fails immediately upon malformed hunk
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
167 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
168 hg -R repo import |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
169 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
|
170 used to hide a bug. |
5937
d8878742a924
Test case for hg import --no-commit
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5853
diff
changeset
|
171 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
172 $ mkdir dir |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
173 $ hg clone -r0 a dir/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
174 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
175 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
176 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
177 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
178 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
179 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
|
180 $ 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
|
181 $ 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
|
182 applying ../exported-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
183 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
184 $ rm -r dir |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
185 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
186 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
187 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
|
188 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
189 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
190 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
191 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
192 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
193 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
194 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
195 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
|
196 $ hg --cwd b import - < exported-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
197 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
198 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
199 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
200 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
201 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
|
202 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
203 $ hg init b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
204 $ 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
|
205 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
206 $ hg --cwd a id |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
207 1d4bd90af0e4 tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
208 $ hg --cwd b id |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
209 1d4bd90af0e4 tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
210 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
211 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
212 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
213 override commit message |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
214 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
215 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
216 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
217 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
218 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
219 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
220 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
221 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
|
222 $ 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
|
223 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
224 $ hg --cwd b tip | grep override |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
225 summary: override |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
226 $ 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
|
227 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
228 $ cat > mkmsg.py <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
229 > import email.Message, sys |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
230 > 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
|
231 > patch = open(sys.argv[1], 'rb').read() |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
232 > msg.set_payload('email commit message\n' + patch) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
233 > msg['Subject'] = 'email patch' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
234 > msg['From'] = 'email patcher' |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
235 > file(sys.argv[2], 'wb').write(msg.as_string()) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
236 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
237 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
238 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
239 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
|
240 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
241 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
242 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
243 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
244 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
245 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
246 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
247 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
248 $ python mkmsg.py diffed-tip.patch msg.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
249 $ hg --cwd b import ../msg.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
250 applying ../msg.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
251 $ hg --cwd b tip | grep email |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
252 user: email patcher |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
253 summary: email patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
254 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
255 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
256 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
257 plain diff in email, no subject, message body |
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 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
260 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
261 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
262 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
263 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
264 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
265 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
|
266 $ grep -v '^Subject:' msg.patch | hg --cwd b import - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
267 applying patch from stdin |
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 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
|
272 |
11807
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 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
278 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
279 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
|
280 $ grep -v '^email ' msg.patch | hg --cwd b import - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
281 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
282 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
283 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
284 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
285 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
|
286 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
287 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
288 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
289 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
290 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
291 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
292 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
293 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
|
294 $ 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
|
295 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
296 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11807
diff
changeset
|
297 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
298 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
299 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
300 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
301 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
|
302 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
303 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
304 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
305 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
306 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
307 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
308 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
309 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
310 $ python mkmsg.py exported-tip.patch msg.patch |
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
311 $ cat msg.patch | hg --cwd b import - |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
312 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
313 $ hg --cwd b tip | grep second |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
314 summary: second change |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
315 $ rm -r b |
2513
f22e3e8fd457
import: added tests, fixed bugs found by tests and asak.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
316 |
11807
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 subject: duplicate detection, removal of [PATCH] |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
319 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
|
320 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
321 $ cat > mkmsg2.py <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
322 > import email.Message, sys |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
323 > 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
|
324 > patch = open(sys.argv[1], 'rb').read() |
2852843947da
tests: do not export several times the same patch/diff in test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13446
diff
changeset
|
325 > msg.set_payload('email patch\n\nnext line\n---\n' + patch) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
326 > msg['Subject'] = '[PATCH] email patch' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
327 > msg['From'] = 'email patcher' |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
328 > file(sys.argv[2], 'wb').write(msg.as_string()) |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
329 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
330 |
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 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
|
333 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
334 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
335 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
336 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
337 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
338 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
339 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
340 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15522
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
341 $ python mkmsg2.py diffed-tip.patch msg.patch |
cf0f3cb8a332
tests: don't use stdout redirection for test data
Mads Kiilerich <mads@kiilerich.com>
parents:
15462
diff
changeset
|
342 $ cat msg.patch | hg --cwd b import - |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
343 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
344 $ hg --cwd b tip --template '{desc}\n' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
345 email patch |
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 next line |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
348 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
349 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
350 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
351 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
|
352 patches and rollback |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
353 |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
354 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
|
355 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
|
356 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
357 $ echo line 3 >> a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
358 $ hg --cwd a ci -m'third change' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
359 $ hg --cwd a export -o '../patch%R' 1 2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
360 $ hg clone -qr0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
361 $ hg --cwd b parents --template 'parent: {rev}\n' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
362 parent: 0 |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
363 $ hg --cwd b import -v ../patch1 ../patch2 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
364 applying ../patch1 |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
365 patching file a |
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
366 a |
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
367 created 1d4bd90af0e4 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
368 applying ../patch2 |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
369 patching file a |
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
370 a |
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
371 created 6d019af21222 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
372 $ hg --cwd b rollback |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
373 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
|
374 working directory now based on revision 0 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
375 $ 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
|
376 parent: 0 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
377 $ rm -r b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
378 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
379 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
380 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
|
381 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
382 $ echo line 2 >> a/d1/d2/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
383 $ 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
|
384 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
385 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
|
386 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
387 $ hg clone -r0 a b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
388 adding changesets |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
389 adding manifests |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
390 adding file changes |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
391 added 1 changesets with 2 changes to 2 files |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
392 updating to branch default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
393 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
|
394 $ 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
|
395 $ 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
|
396 $ dir=`pwd` |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
397 $ 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
|
398 $ 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
|
399 applying ../../../subdir-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
400 $ cd "$dir" |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
401 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
402 message should be 'subdir change' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
403 committer should be 'someoneelse' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
404 |
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
|
405 $ 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
|
406 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
|
407 tag: tip |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
408 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
|
409 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
|
410 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
|
411 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
412 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
413 should be empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
414 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
415 $ hg --cwd b status |
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 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
418 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
|
419 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
420 $ hg init fuzzy |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
421 $ cd fuzzy |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
422 $ echo line1 > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
423 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
424 $ echo line3 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
425 $ hg ci -Am adda |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
426 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
427 $ echo line1 > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
428 $ echo line2 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
429 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
430 $ echo line3 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
431 $ 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
|
432 $ hg export tip > fuzzy-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
433 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
434 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
|
435 $ echo line1 > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
436 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
437 $ echo line1 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
438 $ echo line0 >> a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
439 $ hg ci -m brancha |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
440 created new head |
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
|
441 $ 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
|
442 applying fuzzy-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
443 patching file a |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
444 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
|
445 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
446 $ hg revert -a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
447 reverting a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
448 |
12913
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
449 |
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
450 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
|
451 |
12945
99f7dc8def34
test-import: workaround for missing newline is no longer needed
Mads Kiilerich <mads@kiilerich.com>
parents:
12914
diff
changeset
|
452 $ 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
|
453 change (no-eol) |
12913
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
454 |
0e0a52bd58f9
import: --no-commit should update .hg/last-message.txt
Steve Borho <steve@borho.org>
parents:
12847
diff
changeset
|
455 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
456 test fuzziness with eol=auto |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
457 |
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
|
458 $ 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
|
459 applying fuzzy-tip.patch |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
460 patching file a |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
461 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
|
462 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
463 $ cd .. |
5548
1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations
Patrick Mezard <pmezard@gmail.com>
parents:
5418
diff
changeset
|
464 |
1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations
Patrick Mezard <pmezard@gmail.com>
parents:
5418
diff
changeset
|
465 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
466 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
|
467 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
468 $ hg init empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
469 $ cd empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
470 $ touch a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
471 $ touch b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
472 $ touch c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
473 $ echo d > d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
474 $ hg ci -Am init |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
475 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
476 adding b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
477 adding c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
478 adding d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
479 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
480 $ echo b > b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
481 $ hg mv b1 b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
482 $ echo c > c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
483 $ hg copy c1 c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
484 $ rm d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
485 $ touch d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
486 $ hg diff --git |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
487 diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
488 --- a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
489 +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
490 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
491 +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
492 diff --git a/b1 b/b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
493 rename from b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
494 rename to b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
495 --- a/b1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
496 +++ b/b2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
497 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
498 +b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
499 diff --git a/c1 b/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
500 --- a/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
501 +++ b/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
502 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
503 +c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
504 diff --git a/c1 b/c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
505 copy from c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
506 copy to c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
507 --- a/c1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
508 +++ b/c2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
509 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
510 +c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
511 diff --git a/d b/d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
512 --- a/d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
513 +++ b/d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
514 @@ -1,1 +0,0 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
515 -d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
516 $ hg ci -m empty |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
517 $ hg export --git tip > empty.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
518 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
519 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
|
520 $ hg import empty.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
521 applying empty.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
522 $ 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
|
523 > echo % $name file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
524 > test -f $name && cat $name |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
525 > done |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
526 % a file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
527 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
528 % b1 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
529 % b2 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
530 b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
531 % c1 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
532 c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
533 % c2 file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
534 c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
535 % d file |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
536 $ cd .. |
5852
03ce5a919ae3
patch: handle empty vs no file in git patches (issue906)
Patrick Mezard <pmezard@gmail.com>
parents:
5548
diff
changeset
|
537 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
538 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
539 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
|
540 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
541 $ hg init binaryremoval |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
542 $ cd binaryremoval |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
543 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
544 $ python -c "file('b', 'wb').write('a\x00b')" |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
545 $ hg ci -Am addall |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
546 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
547 adding b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
548 $ hg rm a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
549 $ hg rm b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
550 $ hg st |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
551 R a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
552 R b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
553 $ hg ci -m remove |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
554 $ hg export --git . > remove.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
555 $ cat remove.diff | grep git |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
556 diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
557 diff --git a/b b/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
558 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
559 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
|
560 $ hg import remove.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
561 applying remove.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
562 $ hg manifest |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
563 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
564 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
565 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
566 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
|
567 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
568 $ hg init t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
569 $ cd t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
570 $ touch a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
571 $ hg ci -Am t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
572 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
573 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
574 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
575 Here, bfile.startswith(afile) |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
576 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
577 $ hg copy a a2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
578 $ hg ci -m copya |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
579 $ hg export --git tip > copy.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
580 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
581 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
|
582 $ hg import copy.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
583 applying copy.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
584 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
585 a should contain an 'a' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
586 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
587 $ cat a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
588 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
589 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
590 and a2 should have duplicated it |
6520
ba0b2dacc623
fix import with -p0
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6295
diff
changeset
|
591 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
592 $ cat a2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
593 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
594 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
595 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
596 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
597 test -p0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
598 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
599 $ hg init p0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
600 $ cd p0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
601 $ echo a > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
602 $ hg ci -Am t |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
603 adding a |
17712
c4717f44c1f1
fancyopts: don't show a traceback on invalid integer values
Idan Kamara <idankk86@gmail.com>
parents:
16912
diff
changeset
|
604 $ hg import -p foo |
c4717f44c1f1
fancyopts: don't show a traceback on invalid integer values
Idan Kamara <idankk86@gmail.com>
parents:
16912
diff
changeset
|
605 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
|
606 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
607 $ hg import -p0 - << EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
608 > foobar |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
609 > --- a Sat Apr 12 22:43:58 2008 -0400 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
610 > +++ a Sat Apr 12 22:44:05 2008 -0400 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
611 > @@ -1,1 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
612 > -a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
613 > +bb |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
614 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
615 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
616 $ hg status |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
617 $ cat a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
618 bb |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
619 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
620 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
621 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
622 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
|
623 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
624 $ mkdir outside |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
625 $ touch outside/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
626 $ hg init inside |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
627 $ cd inside |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
628 $ hg import - <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
629 > diff --git a/a b/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
630 > rename from ../outside/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
631 > rename to bar |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
632 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
633 applying patch from stdin |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
634 abort: path contains illegal component: ../outside/foo (glob) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11807
diff
changeset
|
635 [255] |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
636 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
637 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
638 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
639 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
|
640 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
641 $ hg init sim |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
642 $ cd sim |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
643 $ echo 'this is a test' > a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
644 $ hg ci -Ama |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
645 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
646 $ cat > ../rename.diff <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
647 > diff --git a/foo/a b/foo/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
648 > deleted file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
649 > --- a/foo/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
650 > +++ /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
651 > @@ -1,1 +0,0 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
652 > -this is a test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
653 > diff --git a/foo/b b/foo/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
654 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
655 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
656 > +++ b/foo/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
657 > @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
658 > +this is a test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
659 > +foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
660 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
661 $ 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
|
662 applying ../rename.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
663 patching file a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
664 patching file b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
665 adding b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
666 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
|
667 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
668 $ hg st -C |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
669 A b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
670 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
671 R a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
672 $ hg revert -a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
673 undeleting a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
674 forgetting b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
675 $ rm b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
676 $ 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
|
677 applying ../rename.diff |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
678 patching file a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
679 patching file b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
680 adding b |
15194
0705f2ac79d6
import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca>
parents:
14452
diff
changeset
|
681 applied to working directory |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
682 $ hg st -C |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
683 A b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
684 R a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
685 $ cd .. |
7971
6ea0318daf75
Fix issue1495, corner case of adding empty files via patching
Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
parents:
7402
diff
changeset
|
686 |
6ea0318daf75
Fix issue1495, corner case of adding empty files via patching
Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
parents:
7402
diff
changeset
|
687 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
688 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
|
689 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
690 $ hg init addemptyend |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
691 $ cd addemptyend |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
692 $ touch a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
693 $ hg addremove |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
694 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
695 $ hg ci -m "commit" |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
696 $ cat > a.patch <<EOF |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
697 > add a, b |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
698 > diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
699 > --- a/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
700 > +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
701 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
702 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
703 > diff --git a/b b/b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
704 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
705 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
706 $ hg import --no-commit a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
707 applying a.patch |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
708 |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
709 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
|
710 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
|
711 $ hg update -q -C . |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
712 $ rm b |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
713 $ touch empty.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
714 $ hg import a.patch empty.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
715 applying a.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
716 applying empty.patch |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
717 transaction abort! |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
718 rollback completed |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
719 abort: empty.patch: no diffs found |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
720 [255] |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
721 $ 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
|
722 0 commit |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
723 $ hg -q status |
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15194
diff
changeset
|
724 M a |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
725 $ cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
726 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
727 create file when source is not /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
728 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
729 $ cat > create.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
730 > diff -Naur proj-orig/foo proj-new/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
731 > --- 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
|
732 > +++ 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
|
733 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
734 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
735 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
736 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
737 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
|
738 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
739 $ cat > create2.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
740 > diff -Naur proj-orig/foo proj-new/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
741 > --- 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
|
742 > +++ 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
|
743 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
744 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
745 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
746 $ hg init oddcreate |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
747 $ cd oddcreate |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
748 $ hg import --no-commit ../create.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
749 applying ../create.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
750 $ cat foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
751 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
752 $ rm foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
753 $ hg revert foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
754 $ hg import --no-commit ../create2.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
755 applying ../create2.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
756 $ cat foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
757 a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
758 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
759 $ cd .. |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
760 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
761 Issue1859: first line mistaken for email headers |
9576 | 762 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
763 $ hg init emailconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
764 $ cd emailconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
765 $ cat > a.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
766 > module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
767 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
768 > description |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
769 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
770 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
771 > diff -r 000000000000 -r 9b4c1e343b55 test.txt |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
772 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
773 > +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
774 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
775 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
776 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
777 $ hg import -d '0 0' a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
778 applying a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
779 $ hg parents -v |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
780 changeset: 0:5a681217c0ad |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
781 tag: tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
782 user: test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
783 date: Thu Jan 01 00:00:00 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
784 files: a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
785 description: |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
786 module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
787 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
788 description |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
789 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
790 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
791 $ cd .. |
9573
b8352a3617f3
patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com>
parents:
8523
diff
changeset
|
792 |
b8352a3617f3
patch: do not swallow header-like patch first line (issue1859)
Patrick Mezard <pmezard@gmail.com>
parents:
8523
diff
changeset
|
793 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
794 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
|
795 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
796 $ hg init commitconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
797 $ cd commitconfusion |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
798 $ cat > a.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
799 > module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
800 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
801 > --- description |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
802 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
803 > diff --git a/a b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
804 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
805 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
806 > +++ b/a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
807 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
808 > +a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
809 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
810 > hg import -d '0 0' a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
811 > hg parents -v |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
812 > cd .. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
813 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
814 > echo '% tricky header splitting' |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
815 > cat > trickyheaders.patch <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
816 > From: User A <user@a> |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
817 > Subject: [PATCH] from: tricky! |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
818 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
819 > # HG changeset patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
820 > # User User B |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
821 > # Date 1266264441 18000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
822 > # Branch stable |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
823 > # Node ID f2be6a1170ac83bf31cb4ae0bad00d7678115bc0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
824 > # Parent 0000000000000000000000000000000000000000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
825 > from: tricky! |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
826 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
827 > That is not a header. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
828 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
829 > diff -r 000000000000 -r f2be6a1170ac foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
830 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
831 > +++ b/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
832 > @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
833 > +foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
834 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
835 applying a.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
836 changeset: 0:f34d9187897d |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
837 tag: tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
838 user: test |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
839 date: Thu Jan 01 00:00:00 1970 +0000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
840 files: a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
841 description: |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
842 module: summary |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
843 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
844 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
845 % tricky header splitting |
10501
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10384
diff
changeset
|
846 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
847 $ hg init trickyheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
848 $ cd trickyheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
849 $ hg import -d '0 0' ../trickyheaders.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
850 applying ../trickyheaders.patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
851 $ hg export --git tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
852 # HG changeset patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
853 # User User B |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
854 # 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
|
855 # Thu Jan 01 00:00:00 1970 +0000 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
856 # Node ID eb56ab91903632294ac504838508cb370c0901d2 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
857 # Parent 0000000000000000000000000000000000000000 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
858 from: tricky! |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
859 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
860 That is not a header. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
861 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
862 diff --git a/foo b/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
863 new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
864 --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
865 +++ b/foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
866 @@ -0,0 +1,1 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
867 +foo |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
868 $ cd .. |
10501
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10384
diff
changeset
|
869 |
a27af7229850
import: if in doubt, consume stream until start of diff
Brendan Cully <brendan@kublai.com>
parents:
10384
diff
changeset
|
870 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12366
diff
changeset
|
871 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
|
872 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
873 $ hg init issue2102 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
874 $ cd issue2102 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
875 $ mkdir -p src/cmd/gc |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
876 $ touch src/cmd/gc/mksys.bash |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
877 $ hg ci -Am init |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
878 adding src/cmd/gc/mksys.bash |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
879 $ hg import - <<EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
880 > # HG changeset patch |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
881 > # User Rob Pike |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
882 > # Date 1216685449 25200 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
883 > # Node ID 03aa2b206f499ad6eb50e6e207b9e710d6409c98 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
884 > # Parent 93d10138ad8df586827ca90b4ddb5033e21a3a84 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
885 > 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
|
886 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
887 > R=gri |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
888 > DELTA=4 (4 added, 0 deleted, 0 changed) |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
889 > OCL=13328 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
890 > CL=13328 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
891 > |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
892 > 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
|
893 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
894 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
895 > +++ b/lib/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
896 > @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
897 > +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
898 > +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
899 > 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
|
900 > new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
901 > --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
902 > +++ b/pkg/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
903 > @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
904 > +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
905 > +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
906 > 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
|
907 > old mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
908 > new mode 100755 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
909 > EOF |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
910 applying patch from stdin |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
911 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
912 #if execbit |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
913 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
914 $ hg sum |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
915 parent: 1:d59915696727 tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
916 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
|
917 branch: default |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
918 commit: (clean) |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
919 update: (current) |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
920 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
921 $ hg diff --git -c tip |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
922 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
|
923 new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
924 --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
925 +++ b/lib/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
926 @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
927 +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
928 +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
929 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
|
930 new file mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
931 --- /dev/null |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
932 +++ b/pkg/place-holder |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
933 @@ -0,0 +1,2 @@ |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
934 +perforce does not maintain empty directories. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
935 +this file helps. |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
936 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
|
937 old mode 100644 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
938 new mode 100755 |
16889
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
939 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
940 #else |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
941 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
942 $ hg sum |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
943 parent: 1:28f089cc9ccc tip |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
944 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
|
945 branch: default |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
946 commit: (clean) |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
947 update: (current) |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
948 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
949 $ hg diff --git -c tip |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
950 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
|
951 new file mode 100644 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
952 --- /dev/null |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
953 +++ b/lib/place-holder |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
954 @@ -0,0 +1,2 @@ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
955 +perforce does not maintain empty directories. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
956 +this file helps. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
957 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
|
958 new file mode 100644 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
959 --- /dev/null |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
960 +++ b/pkg/place-holder |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
961 @@ -0,0 +1,2 @@ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
962 +perforce does not maintain empty directories. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
963 +this file helps. |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
964 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
965 /* 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
|
966 /* 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
|
967 /* 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
|
968 /* 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
|
969 /* #else clause */ |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
970 |
0074c2babb13
test-import: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
16888
diff
changeset
|
971 #endif |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
972 $ cd .. |
10748
fb06e357e698
patch: more precise NoHunk, raised for every file (issue2102)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10745
diff
changeset
|
973 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
974 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
975 diff lines looking like headers |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
976 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
977 $ hg init difflineslikeheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
978 $ cd difflineslikeheaders |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
979 $ echo a >a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
980 $ echo b >b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
981 $ echo c >c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
982 $ hg ci -Am1 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
983 adding a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
984 adding b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
985 adding c |
10883
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10775
diff
changeset
|
986 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
987 $ echo "key: value" >>a |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
988 $ echo "key: value" >>b |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
989 $ echo "foo" >>c |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
990 $ hg ci -m2 |
10883
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10775
diff
changeset
|
991 |
11807
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
992 $ hg up -C 0 |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
993 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
|
994 $ hg diff --git -c1 >want |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
995 $ hg diff -c1 | hg import --no-commit - |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
996 applying patch from stdin |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
997 $ hg diff --git >have |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
998 $ diff want have |
887e9f487b7a
tests: unify test-import
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11407
diff
changeset
|
999 $ cd .. |
10883
196908117c27
patch: don't look for headers in diff lines
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
10775
diff
changeset
|
1000 |
15462
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1001 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
|
1002 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1003 $ 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
|
1004 $ cd diffzero |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1005 $ 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
|
1006 > c2 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1007 > c4 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1008 > c5 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1009 > EOF |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1010 $ 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
|
1011 adding f |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1012 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1013 $ 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
|
1014 > # 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
|
1015 > # User test |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1016 > # 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
|
1017 > # 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
|
1018 > # Parent 8679a12a975b819fae5f7ad3853a2886d143d794 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1019 > 1 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1020 > 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
|
1021 > --- 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
|
1022 > +++ 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
|
1023 > @@ -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
|
1024 > +c1 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1025 > @@ -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
|
1026 > +c3 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1027 > @@ -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
|
1028 > -c5 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1029 > EOF |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1030 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
|
1031 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1032 $ cat f |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1033 c1 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1034 c2 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1035 c3 |
2b1ec74c961f
mdiff/patch: fix bad hunk handling for unified diffs with zero context
Nicolas Venegas <nvenegas@atlassian.com>
parents:
15327
diff
changeset
|
1036 c4 |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1037 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
1038 $ cd .. |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
1039 |
16650
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1040 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
|
1041 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
|
1042 |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1043 $ hg init startlinezero |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1044 $ cd startlinezero |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1045 $ echo foo > foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1046 $ hg commit -Amfoo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1047 adding foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1048 |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1049 $ 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
|
1050 > 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
|
1051 > --- a/foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1052 > +++ b/foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1053 > @@ -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
|
1054 > foo |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1055 > EOF |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1056 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
|
1057 |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1058 $ cd .. |
fcb97d9a26cd
patch: fix segfault against unified diffs which start line is zero
Yuya Nishihara <yuya@tcha.org>
parents:
16124
diff
changeset
|
1059 |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1060 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
|
1061 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1062 $ hg init morecornercases |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1063 $ cd morecornercases |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1064 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1065 $ 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
|
1066 > 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
|
1067 > --- a/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1068 > +++ b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1069 > @@ -1,0 +1,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1070 > +line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1071 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1072 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1073 $ 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
|
1074 > 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
|
1075 > --- a/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1076 > +++ b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1077 > @@ -1,1 +1,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1078 > -2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1079 > +add some skew |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1080 > @@ -2,0 +2,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1081 > +line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1082 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1083 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1084 $ 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
|
1085 > 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
|
1086 > --- a/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1087 > +++ b/a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1088 > @@ -10,0 +10,1 @@ |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1089 > +line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1090 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1091 |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1092 $ 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
|
1093 > 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
|
1094 > --- a/a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1095 > +++ b/a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1096 > @@ -1,1 +1,1 @@ |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1097 > -2 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1098 > +add some skew |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1099 > @@ -2,2 +2,3 @@ |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1100 > not matching, should fuzz |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1101 > ... a bit |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1102 > +line |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1103 > EOF |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1104 |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1105 $ cat > a <<EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1106 > 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1107 > 2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1108 > 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1109 > 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1110 > EOF |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1111 $ hg ci -Am adda a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1112 $ for p in *.diff; do |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1113 > 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
|
1114 > cat a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1115 > hg revert -aqC a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1116 > # patch -p1 < $p |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1117 > # cat a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1118 > # hg revert -aC a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1119 > done |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1120 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
|
1121 patching file a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1122 applied to working directory |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1123 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1124 line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1125 2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1126 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1127 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1128 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
|
1129 patching file a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1130 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
|
1131 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
|
1132 applied to working directory |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1133 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1134 add some skew |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1135 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1136 line |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1137 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1138 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
|
1139 patching file a |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1140 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
|
1141 applied to working directory |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1142 1 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1143 2 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1144 3 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1145 4 |
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1146 line |
16124
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1147 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
|
1148 patching file a |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1149 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
|
1150 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
|
1151 applied to working directory |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1152 1 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1153 add some skew |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1154 3 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1155 4 |
0e0060bf2f44
patch: fuzz more aggressively to match patch(1) behaviour
Patrick Mezard <patrick@mezard.eu>
parents:
16123
diff
changeset
|
1156 line |
16123
b0c7525f826d
patch: fix fuzzing of hunks without previous lines (issue3264)
Patrick Mezard <patrick@mezard.eu>
parents:
16112
diff
changeset
|
1157 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16889
diff
changeset
|
1158 $ cd .. |