# HG changeset patch
# User Mads Kiilerich <m...@kiilerich.com>
# Date 1570925707 -7200
# Sun Oct 13 02:15:07 2019 +0200
# Node ID 950c89a71e9837dc81da80ed34eee9b602a808d9
# Parent 844fa54a1ffbc052fbcd76f103b3db6b02a84690
eol: fix update - don't use and apply removed .hgeol patterns
'hg up -C' to revisions with different .hgeol patterns could leave dirty
changes in the working directory. That could make deployment of new .hgeol
filters tricky: they would "occasionally" apply also in branches where they
shouldn't.
Fixed by dropping all old patterns before applying new ones.
diff --git a/hgext/eol.py b/hgext/eol.py
--- a/hgext/eol.py
+++ b/hgext/eol.py
@@ -221,6 +221,12 @@ class eolfile(object):
self.match = match.match(root, b'', [], include, exclude)
def copytoui(self, ui):
+ newpatterns = set(pattern for pattern, key, m in self.patterns)
+ for section in (b'decode', b'encode'):
+ for oldpattern, _filter in ui.configitems(section):
+ if oldpattern not in newpatterns:
+ if ui.configsource(section, oldpattern) == b'eol':
+ ui.setconfig(section, oldpattern, b'!', b'eol')
for pattern, key, m in self.patterns:
try:
ui.setconfig(b'decode', pattern, self._decode[key], b'eol')
diff --git a/tests/test-eol-update.t b/tests/test-eol-update.t
--- a/tests/test-eol-update.t
+++ b/tests/test-eol-update.t
@@ -120,12 +120,6 @@ Test EOL update
first
-second
third
- diff --git a/f b/f
- --- a/f
- +++ b/f
- @@ -1,1 +1,1 @@
- -f\r (esc)
- +f
$ dotest CRLF
% hg clone repo repo-CRLF
@@ -159,12 +153,6 @@ Test EOL update
first
-second
third
- diff --git a/f b/f
- --- a/f
- +++ b/f
- @@ -1,1 +1,1 @@
- -f\r (esc)
- +f
Test in repo using eol extension, while keeping an eye on how filters are
applied:
@@ -177,8 +165,8 @@ applied:
> eol =
> EOF
-Update to revision 0 which has no .hgeol . Unfortunately, it uses the filter
-from tip ... which evidently is wrong:
+Update to revision 0 which has no .hgeol, shouldn't use any filters, and
+obviously should leave things as tidy as they were before the clean update.
$ hg up -c -r 0 -v --debug
resolving manifests
@@ -193,22 +181,8 @@ from tip ... which evidently is wrong:
filtering a.txt through tolf
f: remote created -> g
getting f
- filtering f through tolf
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st
- M f
- $ touch .hgeol * # ensure consistent dirtyness checks ignoring dirstate
- $ hg up -C -r 0 -v --debug
- eol: detected change in .hgeol
- filtering .hgeol through isbinary
- filtering a.txt through tolf
- resolving manifests
- branchmerge: False, force: True, partial: False
- ancestor: 15cbdf8ca3db+, local: 15cbdf8ca3db+, remote: 15cbdf8ca3db
- calling hook preupdate.eol: hgext.eol.preupdate
- f: remote is newer -> g
- getting f
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch b
marked working directory as branch b
@@ -250,9 +224,9 @@ Merge changes that apply a filter to f:
-f\r (esc)
+f
-Abort the merge with up -C to revision 0 ... but notice how .hgeol changes are
-not detected correctly: f is filtered with tolf even though there is no filter
-for f in revision 0, and it thus ends up with working directory changes.
+Abort the merge with up -C to revision 0.
+Note that files are filtered correctly for revision 0: f is not filtered, a.txt
+is filtered with tolf, and everything is left tidy.
$ touch .hgeol * # ensure consistent dirtyness checks ignoring dirstate
$ hg up -C -r 0 -v --debug
@@ -269,7 +243,6 @@ for f in revision 0, and it thus ends up
filtering a.txt through tolf
f: remote is newer -> g
getting f
- filtering f through tolf
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ touch .hgeol *
@@ -277,16 +250,9 @@ for f in revision 0, and it thus ends up
eol: detected change in .hgeol
filtering .hgeol through isbinary
filtering a.txt through tolf
- M f
$ hg diff
- diff --git a/f b/f
- --- a/f
- +++ b/f
- @@ -1,1 +1,1 @@
- -f\r (esc)
- +f
-Workaround: Update again - this will read the right .hgeol:
+Things were clean, and updating again will not change anything:
$ touch .hgeol *
$ hg up -C -r 0 -v --debug
@@ -297,9 +263,7 @@ Workaround: Update again - this will rea
branchmerge: False, force: True, partial: False
ancestor: 15cbdf8ca3db+, local: 15cbdf8ca3db+, remote: 15cbdf8ca3db
calling hook preupdate.eol: hgext.eol.preupdate
- f: remote is newer -> g
- getting f
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ touch .hgeol *
$ hg st --debug
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
