mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-06 04:58:05 +00:00
Code Activity

fix cmpignore for #137

Browse Source
This commit is contained in:
deadc0de6
2019-05-19 19:43:07 +02:00
parent 5cb18932a5
commit 9f94f14b87
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dotdrop/comparator.py
View File

@@ -66,14 +66,14 @@ class Comparator:
ret = []
comp = filecmp.dircmp(left, right)
# handle files only in deployed file
# handle files only in deployed dir
for i in comp.left_only:
if utils.must_ignore([os.path.join(left, i)],
ignore, debug=self.debug):
continue
ret.append('=> \"{}\" does not exist on local\n'.format(i))
# handle files only in dotpath file
# handle files only in dotpath dir
for i in comp.right_only:
if utils.must_ignore([os.path.join(right, i)],
ignore, debug=self.debug):
@@ -85,6 +85,9 @@ class Comparator:
for i in funny:
lfile = os.path.join(left, i)
rfile = os.path.join(right, i)
if utils.must_ignore([lfile, rfile],
ignore, debug=self.debug):
continue
short = os.path.basename(lfile)
# file vs dir
ret.append('=> different type: \"{}\"\n'.format(short))
@@ -96,6 +99,9 @@ class Comparator:
for i in funny:
lfile = os.path.join(left, i)
rfile = os.path.join(right, i)
if utils.must_ignore([lfile, rfile],
ignore, debug=self.debug):
continue
diff = self._diff(lfile, rfile, header=True)
ret.append(diff)