Skip to content

Commit 76cfe92

Browse files
authored
minor refactor on check-ignore (#10854)
1 parent 7945455 commit 76cfe92

File tree

5 files changed

+146
-81
lines changed

5 files changed

+146
-81
lines changed

dvc/commands/check_ignore.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,26 @@ def __init__(self, args):
1010
self.ignore_filter = self.repo.dvcignore
1111

1212
def _show_results(self, result):
13-
if not result.match and not self.args.non_matching:
13+
if not result.match and not self.args.details:
14+
return
15+
16+
if not result.patterns and not self.args.non_matching:
1417
return
1518

1619
if self.args.details:
17-
patterns = result.patterns
20+
patterns = result.patterns or ["::"]
1821
if not self.args.all:
1922
patterns = patterns[-1:]
2023

2124
for pattern in patterns:
2225
ui.write(pattern, result.file, sep="\t")
2326
else:
2427
ui.write(result.file)
28+
return bool(result.patterns)
2529

2630
def _check_one_file(self, target):
2731
result = self.ignore_filter.check_ignore(target)
28-
self._show_results(result)
29-
if result.match:
30-
return 0
31-
return 1
32+
return bool(self._show_results(result))
3233

3334
def _interactive_mode(self):
3435
ret = 1
@@ -39,14 +40,14 @@ def _interactive_mode(self):
3940
break
4041
if not target:
4142
break
42-
if not self._check_one_file(target):
43+
if self._check_one_file(target):
4344
ret = 0
4445
return ret
4546

4647
def _normal_mode(self):
4748
ret = 1
4849
for target in self.args.targets:
49-
if not self._check_one_file(target):
50+
if self._check_one_file(target):
5051
ret = 0
5152
return ret
5253

0 commit comments

Comments
 (0)