mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-11 03:14:15 +00:00
Code Activity

add config option workdir_compare

Browse Source
This commit is contained in:
deadc0de6
2021-11-01 21:49:05 +01:00
parent 1ee9f334ff
commit 43ab41bb1f
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dotdrop/dotdrop.py
View File

@@ -463,7 +463,7 @@ def cmd_compare(opts, tmp):
same = False same = False
cnt += 1 cnt += 1
if _workdir_enum(opts) > 0: if opts.compare_workdir and _workdir_enum(opts) > 0:
same = False same = False
LOG.log('\n{} dotfile(s) compared.'.format(cnt)) LOG.log('\n{} dotfile(s) compared.'.format(cnt))

6
dotdrop/settings.py
View File

@@ -47,6 +47,7 @@ class Settings(DictParser):
key_chmod_on_import = 'chmod_on_import' key_chmod_on_import = 'chmod_on_import'
key_check_version = 'check_version' key_check_version = 'check_version'
key_clear_workdir = 'clear_workdir' key_clear_workdir = 'clear_workdir'
key_compare_workdir = 'compare_workdir'
# import keys # import keys
key_import_actions = 'import_actions' key_import_actions = 'import_actions'
@@ -67,7 +68,8 @@ class Settings(DictParser):
template_dotfile_default=True, template_dotfile_default=True,
ignore_missing_in_dotdrop=False, ignore_missing_in_dotdrop=False,
force_chmod=False, chmod_on_import=False, force_chmod=False, chmod_on_import=False,
check_version=False, clear_workdir=False): check_version=False, clear_workdir=False,
compare_workdir=False):
self.backup = backup self.backup = backup
self.banner = banner self.banner = banner
self.create = create self.create = create
@@ -99,6 +101,7 @@ class Settings(DictParser):
self.chmod_on_import = chmod_on_import self.chmod_on_import = chmod_on_import
self.check_version = check_version self.check_version = check_version
self.clear_workdir = clear_workdir self.clear_workdir = clear_workdir
self.compare_workdir = compare_workdir
def _serialize_seq(self, name, dic): def _serialize_seq(self, name, dic):
"""serialize attribute 'name' into 'dic'""" """serialize attribute 'name' into 'dic'"""
@@ -127,6 +130,7 @@ class Settings(DictParser):
self.key_chmod_on_import: self.chmod_on_import, self.key_chmod_on_import: self.chmod_on_import,
self.key_check_version: self.check_version, self.key_check_version: self.check_version,
self.key_clear_workdir: self.clear_workdir, self.key_clear_workdir: self.clear_workdir,
self.key_compare_workdir: self.compare_workdir,
} }
self._serialize_seq(self.key_default_actions, dic) self._serialize_seq(self.key_default_actions, dic)
self._serialize_seq(self.key_import_actions, dic) self._serialize_seq(self.key_import_actions, dic)

1
tests-ng/workdir-compare.sh
View File

@@ -76,6 +76,7 @@ config:
create: true create: true
dotpath: dotfiles dotpath: dotfiles
workdir: ${tmpw} workdir: ${tmpw}
workdir_compare: true
dotfiles: dotfiles:
f_a: f_a:
dst: ${tmpd}/a dst: ${tmpd}/a