Commit Graph

287 Commits

Author SHA1 Message Date
Tim Byrne f3249e00b5
Ensure base directories for alternates before creation 2019-10-12 18:22:02 -05:00
Tim Byrne 6d5467951a
Properly handle missing "." in alternate conditions 2019-10-12 09:59:03 -05:00
Tim Byrne 4ea3ed9e2a
Allow storing alternates elsewhere (#90)
This change allows alternates to be stored in "$YADM_DIR/alt". The
correct path within the work tree will be symlinked.

Storing alternates within the work tree is still allowed. Both locations
will be considered when choosing an appropriate alternate file.
2019-10-12 09:59:02 -05:00
Tim Byrne aeb6a54ad7
Add `source` to templates (#163)
A new variable is exposed to templates, which holds the filename of the
template source. The primary use case is to be able to include a warning
message within the template. For example:

  # Do not edit. This file auto-generated from {{ yadm.source }}.
2019-10-11 07:23:52 -05:00
Tim Byrne 0c7aec6dd7
Clarify xfails are for deprecated features 2019-10-11 07:22:38 -05:00
Tim Byrne 3a192db420
Remove symlinks before processing a template 2019-10-11 07:20:03 -05:00
Tim Byrne 117541fd21
Reorder descriptions of options 2019-10-09 18:47:45 -05:00
Tim Byrne 574945f010
Change yadm.cygwin-copy to yadm.alt-copy
This removes the constraint of only allowing the copy option on Cygwin
systems. Now any system can configure this option.
2019-10-09 18:47:42 -05:00
Tim Byrne b2ef6d2e09
Merge pull request #102 from rasa/rasa-add-mingw-msys-support 2019-10-09 07:48:56 -05:00
Tim Byrne e51166b7e8
Improve clone testing 2019-10-08 17:28:56 -05:00
Tim Byrne f3bde37f78
Support `-b <branch>` when cloning (#133) 2019-10-08 17:28:53 -05:00
Tim Byrne 6a3199ceea
Support DISTRO in alternates (#72) 2019-10-06 16:35:47 -05:00
Tim Byrne 4f6b0f09cd
Remove unnecessary formatting 2019-10-05 12:01:48 -05:00
Tim Byrne 444622a658
Support `else` statements in builtin templates 2019-10-05 11:43:48 -05:00
Tim Byrne 81134c8edb
Update documentation
* XDG Base Directory Specification
* New alternates processing
2019-10-04 22:40:09 -05:00
Tim Byrne e999929818
Change builtin templates to resemble jinja 2019-10-02 15:16:41 -05:00
Tim Byrne 234055190b
Move min-similarity-lines to new section
This is the correct place for a newer version of pylint.
2019-10-02 15:16:10 -05:00
Tim Byrne b411f9d74f
Split out processing of stale links 2019-10-02 15:16:10 -05:00
Tim Byrne 0438e383e5
Unify the way alternate file strings are matched 2019-10-02 15:16:10 -05:00
Tim Byrne c8a9165293
Remove warnings from tests
These warnings are related to bugs which are fully fixed.
2019-10-02 15:16:10 -05:00
Tim Byrne 3ba17f41fd
Fix a known bug with hidden private files 2019-10-02 15:16:10 -05:00
Tim Byrne 36212cb752
Add new alternates processing the cygwin copy testing 2019-10-02 15:16:09 -05:00
Tim Byrne eeba216cfe
Mark deprecated tests 2019-10-02 15:16:09 -05:00
Tim Byrne d2afab6846
Fix newly discovered linting errors 2019-10-02 15:16:09 -05:00
Tim Byrne 2508378617
Upgrade yadm testbed
* Update software in Dockerfile
* Add j2cli
* Bump supported versions of linters
2019-10-02 15:16:09 -05:00
Tim Byrne cfda485b34
Implement future alternate processing 2019-10-02 15:16:02 -05:00
Tim Byrne f3ae31f1c2
Separate alternate linking code from other operations 2019-09-27 08:40:32 -05:00
Tim Byrne e4e956fe21
Split discovery of alternates test data into a testable function 2019-09-27 08:40:32 -05:00
Tim Byrne c29292d02b
Split out processing of alt (past/future) 2019-09-27 08:40:31 -05:00
Tim Byrne 289b8e0c6c
Remove unnecessary continuation backslashes 2019-09-27 08:40:31 -05:00
Tim Byrne cec8778578
Align continuation backslashes 2019-09-27 08:40:31 -05:00
Tim Byrne 48fc6b0db7
Support XDG base directory specification
2019-09-27 08:40:31 -05:00
Tim Byrne f0ad40376d
Create YADM_HOOKS variable for hooks dir 2019-08-06 08:19:01 -05:00
Tim Byrne bd71ec8932
Merge pull request #162 from DWagenk/feat_dwagenk_use_GIT_PROGRAMM_env_var 2019-07-29 08:04:29 -05:00
Tim Byrne a399c35e4e
Add quoting 2019-07-29 08:00:09 -05:00
Daniel Wagenknecht b404a87a89
Replace direkt calls to git with $GIT_PROGRAM
Some calls to git ignored the yadm.gpg-program configuration option
and called the first git found in $PATH instead. Make them adhere to
the configured git program by replacing the call with $GIT_PROGRAM.
2019-07-16 21:45:14 +02:00
Tim Byrne 6df8509999
Add vim to testbed image
Having an editor within a testhost/scripthost is useful.
2019-04-16 08:04:53 -05:00
Tim Byrne 4613c1d0c4
Merge pull request #114 from bb010g/patch-1 2019-04-12 07:57:35 -05:00
Tim Byrne d87a6502af
Factor out some branches in utils:create_alt_files() 2019-04-12 07:54:23 -05:00
Tim Byrne 7bc8f02d68
Add tests for jinja includes 2019-04-12 07:54:23 -05:00
Tim Byrne d245f633bf
Remove invalid linked alternates (#65) 2019-04-10 09:23:34 -05:00
Tim Byrne a2cc970dd6
Remove unnecessary Git invocations
`git ls-files` was being called multiple times during the processing of
alternates. This is now run once, and kept in an array.
2019-04-09 07:53:27 -05:00
Tim Byrne 093fc24b1b
Test that links are removed for invalid alternates (#65) 2019-04-05 08:58:59 -05:00
Tim Byrne 2375a0955b
Standardize sort order
Prevent localizations from interfering with sorting order.
2019-04-05 08:58:30 -05:00
Tim Byrne 0c6be5e398
Fix bug with alternate linked directories
Previously the tracked files were sorted, and then the files and their
parent directories were considered for possible alternates. Depending on
the length of directories and names of files, inconsistencies would
occur because the directory separator (/) would be part of the sorting.

To fix this, a unique list of tracked files and their parent directories
are sorted into a single list which is processed.
2019-04-05 08:58:30 -05:00
Tim Byrne fb1181c8a9
Add tests for directory alternates
While this feature was added back in version 1.05, tests were never
added for it. These tests have identified bugs in the directory
2019-04-05 08:58:22 -05:00
Tim Byrne 2aa1710214
Remove superfluous `;` in comments 2019-03-24 17:22:11 -05:00
Tim Byrne 58edf313aa
Process .yadm/encrypt in sorted order 2019-03-24 17:05:11 -05:00
Tim Byrne 2848ca2d1d
Update contributing guide with website info (#146) 2019-03-24 15:48:35 -05:00
Tim Byrne 282b772ce5
Add yamllint to testenv
Also organize pip install command so software can be added/removed
2019-03-24 14:27:21 -05:00