diff options
author | Connor Brewster <cbrewster@hey.com> | 2023-09-17T11·52-0500 |
---|---|---|
committer | Connor Brewster <cbrewster@hey.com> | 2023-09-17T13·34+0000 |
commit | 84aa07a736b4327400bc2183e670cf29bb0304df (patch) | |
tree | 8c1f8a1403626fffd6ef30dc9636db98576abb2e /tvix/nar-bridge/testdata/popdirectories.nar | |
parent | 5841047c38fdd9eb822151e8ce6142da90aa4849 (diff) |
fix(tvix/nar-bridge): Fix directory stack tracking r/6602
Previously, nar-bridge, had a couple of bugs with tracking the current directory when traversing a NAR file. The included test case looks like: ``` / (dir) /test (dir) /test/tested (file) /tested (file) ``` Previously, we would do a string prefix match between the current node and the top of the directory stack to determine if the node is in the directory. In this case `/test` is a substring of `/tested`; however, `/tested` is not in the `/test` directory. The fix is to append a `/` to the directory name when doing the prefix match, so `/test/` is not a prefix of `/tested`. Additionally, when popping the stack, we need to continuously pop the stack until the new node is in the directory at the top of the stack (stopping before we pop the root directory) Example: ``` / (dir) /a (dir) /a/b (dir) /a/b/c (file) /z (file) ``` Previously, `z` would end up in directory `/a` because we only the pop the stack once. The included test case requires both of these issues to be fixed for it to pass, so I think it is sufficient. Change-Id: I22f601babf04d39d85535ba7ad585d3970757211 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9348 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de> Autosubmit: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/nar-bridge/testdata/popdirectories.nar')
-rw-r--r-- | tvix/nar-bridge/testdata/popdirectories.nar | bin | 0 -> 600 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tvix/nar-bridge/testdata/popdirectories.nar b/tvix/nar-bridge/testdata/popdirectories.nar
new file mode 100644
index 000000000000..74313aca529f
--- /dev/null
+++ b/tvix/nar-bridge/testdata/popdirectories.nar
Binary files differ |