Skip to content

Commit

Permalink
Remove deprecated option cygwin-copy
Browse files Browse the repository at this point in the history
  • Loading branch information
TheLocehiliosan committed Dec 26, 2020
1 parent d45d53f commit df2ff5e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 18 deletions.
11 changes: 2 additions & 9 deletions test/test_alt_copy.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
import pytest


@pytest.mark.parametrize(
'cygwin',
[pytest.param(True, marks=pytest.mark.deprecated), False],
ids=['cygwin', 'no-cygwin'])
@pytest.mark.parametrize(
'setting, expect_link, pre_existing', [
(None, True, None),
Expand All @@ -26,14 +22,11 @@
@pytest.mark.usefixtures('ds1_copy')
def test_alt_copy(
runner, yadm_cmd, paths, tst_sys,
setting, expect_link, pre_existing,
cygwin):
setting, expect_link, pre_existing):
"""Test yadm.alt-copy"""

option = 'yadm.cygwin-copy' if cygwin else 'yadm.alt-copy'

if setting is not None:
os.system(' '.join(yadm_cmd('config', option, str(setting))))
os.system(' '.join(yadm_cmd('config', 'yadm.alt-copy', str(setting))))

expected_content = f'test_alt_copy##os.{tst_sys}'

Expand Down
3 changes: 0 additions & 3 deletions yadm
Original file line number Diff line number Diff line change
Expand Up @@ -514,9 +514,6 @@ function alt() {
local do_copy=0
[ "$(config --bool yadm.alt-copy)" == "true" ] && do_copy=1

# deprecated yadm.cygwin-copy option (to be removed)
[ "$(config --bool yadm.cygwin-copy)" == "true" ] && do_copy=1

cd_work "Alternates" || return

# determine all tracked files
Expand Down
6 changes: 0 additions & 6 deletions yadm.1
Original file line number Diff line number Diff line change
Expand Up @@ -372,12 +372,6 @@ The following is the full list of supported configurations:
If set to "true", alternate files will be copies instead of symbolic links.
This might be desirable, because some systems may not properly support
symlinks.

NOTE: The deprecated
.I yadm.cygwin-copy
option used by older versions of yadm has been replaced by
.IR yadm.alt-copy .
The old option will be removed in the next version of yadm.
.TP
.B yadm.auto-alt
Disable the automatic linking described in the section ALTERNATES. If disabled,
Expand Down

0 comments on commit df2ff5e

Please sign in to comment.