Show More
@@ -387,7 +387,7 b' def reposetup(ui, repo):' | |||||
387 | return eol.match |
|
387 | return eol.match | |
388 |
|
388 | |||
389 | def _hgcleardirstate(self): |
|
389 | def _hgcleardirstate(self): | |
390 |
self._eolmatch = self.loadeol([None |
|
390 | self._eolmatch = self.loadeol([None]) | |
391 | if not self._eolmatch: |
|
391 | if not self._eolmatch: | |
392 | self._eolmatch = util.never |
|
392 | self._eolmatch = util.never | |
393 | return |
|
393 | return |
@@ -21,9 +21,8 b' setup repository' | |||||
21 | adding .hgeol |
|
21 | adding .hgeol | |
22 | adding a.txt |
|
22 | adding a.txt | |
23 |
|
23 | |||
24 |
Test commit of removed .hgeol |
|
24 | Test commit of removed .hgeol and how it immediately makes the automatic | |
25 | (causing "filtering a.txt through tolf") after being removed ... but actually |
|
25 | changes explicit and committable. | |
26 | it is just confusing use of tip revision. |
|
|||
27 |
|
26 | |||
28 | $ cd .. |
|
27 | $ cd .. | |
29 | $ hg clone repo repo-2 |
|
28 | $ hg clone repo repo-2 | |
@@ -41,7 +40,7 b' it is just confusing use of tip revision' | |||||
41 | $ hg remove .hgeol |
|
40 | $ hg remove .hgeol | |
42 | $ touch a.txt * # ensure consistent st dirtyness checks, ignoring dirstate timing |
|
41 | $ touch a.txt * # ensure consistent st dirtyness checks, ignoring dirstate timing | |
43 | $ hg st -v --debug |
|
42 | $ hg st -v --debug | |
44 | filtering a.txt through tolf |
|
43 | M a.txt | |
45 | R .hgeol |
|
44 | R .hgeol | |
46 | $ hg commit -m 'remove eol' |
|
45 | $ hg commit -m 'remove eol' | |
47 | $ hg exp |
|
46 | $ hg exp | |
@@ -49,16 +48,26 b' it is just confusing use of tip revision' | |||||
49 | # User test |
|
48 | # User test | |
50 | # Date 0 0 |
|
49 | # Date 0 0 | |
51 | # Thu Jan 01 00:00:00 1970 +0000 |
|
50 | # Thu Jan 01 00:00:00 1970 +0000 | |
52 | # Node ID c60b96c20c7de8c821127b548c34e5b170bcf9fe |
|
51 | # Node ID 3c20c2d90333b6ecdc8f7aa8f9b73223c7c7a608 | |
53 | # Parent 90f94e2cf4e24628afddd641688dfe4cd476d6e4 |
|
52 | # Parent 90f94e2cf4e24628afddd641688dfe4cd476d6e4 | |
54 | remove eol |
|
53 | remove eol | |
55 |
|
54 | |||
56 |
diff -r 90f94e2cf4e2 -r |
|
55 | diff -r 90f94e2cf4e2 -r 3c20c2d90333 .hgeol | |
57 | --- a/.hgeol Thu Jan 01 00:00:00 1970 +0000 |
|
56 | --- a/.hgeol Thu Jan 01 00:00:00 1970 +0000 | |
58 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
57 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
59 | @@ -1,2 +0,0 @@ |
|
58 | @@ -1,2 +0,0 @@ | |
60 | -[patterns] |
|
59 | -[patterns] | |
61 | -**.txt = native |
|
60 | -**.txt = native | |
|
61 | diff -r 90f94e2cf4e2 -r 3c20c2d90333 a.txt | |||
|
62 | --- a/a.txt Thu Jan 01 00:00:00 1970 +0000 | |||
|
63 | +++ b/a.txt Thu Jan 01 00:00:00 1970 +0000 | |||
|
64 | @@ -1,3 +1,3 @@ | |||
|
65 | -first | |||
|
66 | -second | |||
|
67 | -third | |||
|
68 | +first\r (esc) | |||
|
69 | +second\r (esc) | |||
|
70 | +third\r (esc) | |||
62 | $ hg push --quiet |
|
71 | $ hg push --quiet | |
63 | $ cd .. |
|
72 | $ cd .. | |
64 |
|
73 | |||
@@ -75,7 +84,7 b' the source repo:' | |||||
75 | updating to branch default |
|
84 | updating to branch default | |
76 | resolving manifests |
|
85 | resolving manifests | |
77 | branchmerge: False, force: False, partial: False |
|
86 | branchmerge: False, force: False, partial: False | |
78 |
ancestor: 000000000000, local: 000000000000+, remote: |
|
87 | ancestor: 000000000000, local: 000000000000+, remote: 3c20c2d90333 | |
79 | calling hook preupdate.eol: hgext.eol.preupdate |
|
88 | calling hook preupdate.eol: hgext.eol.preupdate | |
80 | a.txt: remote created -> g |
|
89 | a.txt: remote created -> g | |
81 | getting a.txt |
|
90 | getting a.txt | |
@@ -83,9 +92,9 b' the source repo:' | |||||
83 | $ cd repo-3 |
|
92 | $ cd repo-3 | |
84 |
|
93 | |||
85 | $ cat a.txt |
|
94 | $ cat a.txt | |
86 | first |
|
95 | first\r (esc) | |
87 | second |
|
96 | second\r (esc) | |
88 | third |
|
97 | third\r (esc) | |
89 |
|
98 | |||
90 | Test clone of revision with .hgeol |
|
99 | Test clone of revision with .hgeol | |
91 |
|
100 |
General Comments 0
You need to be logged in to leave comments.
Login now