Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve recursion and fix various issues with unstowing / --dotfiles #107

Merged
merged 13 commits into from
Apr 7, 2024
Merged

improve recursion and fix various issues with unstowing / --dotfiles #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a070116
Fix Dockerfile by updating from jessie to bookworm
aspiers Apr 7, 2024
5e21f47
read_a_link(): clarify debug message when it's a real link
aspiers Apr 7, 2024
a7c251c
tidy up MANIFEST.SKIP
aspiers Apr 7, 2024
001b287
allow playground/ directory for testing stuff
aspiers Apr 7, 2024
06fdfc1
merge unstow_orig.t into unstow.t and fix unstowing logic
aspiers Apr 1, 2024
744ba65
unstow_link_node(): don't register conflicts when unstowing unowned l…
aspiers Apr 7, 2024
afa5007
dotfiles: switch {un,}stow_{contents,node}() recursion parameters
aspiers Apr 1, 2024
8ed799a
t/unstow.t: create a bunch of unowned files to make tests more robust
aspiers Apr 7, 2024
34421ba
stow_contents: fix bugs and corner cases with type mismatch conflicts
aspiers Apr 1, 2024
723ddcf
t/dotfiles.t: improve language in test names and assertion messages
aspiers Apr 7, 2024
93fc195
Fix unstowing with `--compat --dotfiles`
aspiers Apr 7, 2024
c0b8890
t/unstow.t: remove superfluous spaces
aspiers Apr 7, 2024
94ed916
t/unstow.t: move final set of tests into a subtest
aspiers Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
/bin/stow
/doc/stow.info
/doc/version.texi
tmp-testing-trees/
/playground/
tmp-testing-trees*/
_build/
autom4te.cache/
blib/
Expand Down
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ or to run the whole suite:
However currently there is an issue where this interferes with
`TEST_VERBOSE`.

If you want to create test files for experimentation, it is
recommended to put them in a subdirectory called `playground/` since
this will be automatically ignored by git and the build process,
avoiding any undesirable complications.

Translating Stow
----------------

Expand Down
1 change: 0 additions & 1 deletion MANIFEST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ t/stow.t
t/rc_options.t
t/testutil.pm
t/unstow.t
t/unstow_orig.t
tools/get-version
THANKS
TODO
Expand Down
16 changes: 7 additions & 9 deletions MANIFEST.SKIP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,14 @@
^doc/HOWTO-RELEASE$

# Avoid test files
tmp-testing-trees
.coveralls.yml
.github/workflows/
.travis.yml
tmp-testing-trees*
^.coveralls.yml
^.github/workflows/
^.travis.yml
^docker/
^[a-zA-Z]*-docker.sh
^playground/

# Avoid development config
.dir-locals.el
.dumbjump

# Avoid CI
.github/
^.dir-locals.el
^.dumbjump
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ DEFAULT_IGNORE_LIST = $(srcdir)/default-ignore-list
doc_deps = $(info_TEXINFOS) doc/version.texi $(DEFAULT_IGNORE_LIST)

TESTS_DIR = $(srcdir)/t
TESTS_OUT = tmp-testing-trees
TESTS_OUT = tmp-testing-trees tmp-testing-trees-compat
TESTS_ENVIRONMENT = $(PERL) -Ibin -Ilib -I$(TESTS_DIR)

# This is a kind of hack; TESTS needs to be set to ensure that the
Expand Down
5 changes: 2 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
# Build docker image: `docker build -t stowtest`
# Run tests: (from stow src directory)
# `docker run --rm -it -v $(pwd):$(pwd) -w $(pwd) stowtest`
FROM debian:jessie
RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
FROM debian:bookworm
RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq
RUN DEBIAN_FRONTEND=noninteractive \
apt-get update -qq && \
apt-get install -y -q \
autoconf \
bzip2 \
Expand Down
Loading
Loading