diff -Nru solvespace-3.0.0+git1793-2cd0ee4/debian/changelog solvespace-3.0.0+git1798-df3ef2a/debian/changelog --- solvespace-3.0.0+git1793-2cd0ee4/debian/changelog 2021-10-17 17:39:28.000000000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/debian/changelog 2021-11-07 18:00:11.000000000 +0000 @@ -1,8 +1,24 @@ -solvespace (3.0.0+git1793-2cd0ee4-1ppa1~focal1) focal; urgency=medium +solvespace (3.0.0+git1798-df3ef2a-1ppa1~focal1) focal; urgency=medium * Automated backport upload; no source changes. - -- Alexander Pozdnyakov Sun, 17 Oct 2021 17:39:28 +0000 + -- Alexander Pozdnyakov Sun, 07 Nov 2021 18:00:11 +0000 + +solvespace (3.0.0+git1798-df3ef2a-1) unstable; urgency=medium + + * Compile + * URL: https://github.com/solvespace/solvespace.git + * Branch: master + * Commit: df3ef2ab0e805b3500803607aa33e8152f11b048 + * Date: 1636070934 + * git changelog: + * df3ef2a - GUI: Flexible vertical space above the toolbar + * eb17248 - CI: Replace edge releases with links to artifacts + * 2a722c1 - add gdk.h for GDK_WINDOWING_ defines + * 267c002 - modify the spaceware code to also work on wayland + * a45e84a - + safe height gcode parameter + + -- Alexander Pozdnyakov Fri, 05 Nov 2021 17:38:01 +0000 solvespace (3.0.0+git1793-2cd0ee4-1) unstable; urgency=medium diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/FETCH_HEAD solvespace-3.0.0+git1798-df3ef2a/.git/FETCH_HEAD --- solvespace-3.0.0+git1793-2cd0ee4/.git/FETCH_HEAD 2021-10-11 19:03:41.222333000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/FETCH_HEAD 2021-11-05 17:27:03.517049600 +0000 @@ -1,9 +1,8 @@ -2cd0ee4b3352c8fb68921399790d0545ad9b26bf branch 'master' of https://github.com/solvespace/solvespace +df3ef2ab0e805b3500803607aa33e8152f11b048 branch 'master' of https://github.com/solvespace/solvespace b1d87bf284b32e875c8edba592113e691ea10bcd not-for-merge branch '2.x' of https://github.com/solvespace/solvespace aa29dbfbfdde6e9497befdc8e4209223add8305c not-for-merge branch 'eigen_over_master' of https://github.com/solvespace/solvespace 4d7145a763e5c4198b7a348dbbd2f93ab701b8bf not-for-merge branch 'emscripten' of https://github.com/solvespace/solvespace 4e823477a6b9f3b1e953a4ebda18cfe91101e254 not-for-merge branch 'fix-macos-leak' of https://github.com/solvespace/solvespace -a02330a700db16a7efdba50a35bec8370cf7b6c0 not-for-merge branch 'readme-badges' of https://github.com/solvespace/solvespace b7a605c44cbc3bbe5d396c88ebe9c8cdf3161f90 not-for-merge branch 'single-window' of https://github.com/solvespace/solvespace 7e64c405dd3ae0322c115ced6e910e349583c85f not-for-merge branch 'solver' of https://github.com/solvespace/solvespace 0e0b0252e23dd5bd4ae82ababcc54c44aee036d6 not-for-merge branch 'version3' of https://github.com/solvespace/solvespace diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/hooks/fsmonitor-watchman.sample solvespace-3.0.0+git1798-df3ef2a/.git/hooks/fsmonitor-watchman.sample --- solvespace-3.0.0+git1793-2cd0ee4/.git/hooks/fsmonitor-watchman.sample 2020-11-26 17:57:47.296268500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/hooks/fsmonitor-watchman.sample 2021-11-03 19:07:46.065955200 +0000 @@ -8,166 +8,102 @@ # (https://facebook.github.io/watchman/) with git to speed up detecting # new and modified files. # -# The hook is passed a version (currently 2) and last update token -# formatted as a string and outputs to stdout a new update token and -# all files that have been modified since the update token. Paths must -# be relative to the root of the working tree and separated by a single NUL. +# The hook is passed a version (currently 1) and a time in nanoseconds +# formatted as a string and outputs to stdout all files that have been +# modified since the given time. Paths must be relative to the root of +# the working tree and separated by a single NUL. # # To enable this hook, rename this file to "query-watchman" and set # 'git config core.fsmonitor .git/hooks/query-watchman' # -my ($version, $last_update_token) = @ARGV; - -# Uncomment for debugging -# print STDERR "$0 $version $last_update_token\n"; +my ($version, $time) = @ARGV; # Check the hook interface version -if ($version ne 2) { + +if ($version == 1) { + # convert nanoseconds to seconds + # subtract one second to make sure watchman will return all changes + $time = int ($time / 1000000000) - 1; +} else { die "Unsupported query-fsmonitor hook version '$version'.\n" . "Falling back to scanning...\n"; } -my $git_work_tree = get_working_dir(); +my $git_work_tree; +if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $git_work_tree = Win32::GetCwd(); + $git_work_tree =~ tr/\\/\//; +} else { + require Cwd; + $git_work_tree = Cwd::cwd(); +} my $retry = 1; -my $json_pkg; -eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; -} or do { - require JSON::PP; - $json_pkg = "JSON::PP"; -}; - launch_watchman(); sub launch_watchman { - my $o = watchman_query(); - if (is_work_tree_watched($o)) { - output_result($o->{clock}, @{$o->{files}}); - } -} - -sub output_result { - my ($clockid, @files) = @_; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # binmode $fh, ":utf8"; - # print $fh "$clockid\n@files\n"; - # close $fh; - binmode STDOUT, ":utf8"; - print $clockid; - print "\0"; - local $, = "\0"; - print @files; -} - -sub watchman_clock { - my $response = qx/watchman clock "$git_work_tree"/; - die "Failed to get clock id on '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - return $json_pkg->new->utf8->decode($response); -} - -sub watchman_query { my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; # In the query expression below we're asking for names of files that - # changed since $last_update_token but not from the .git folder. + # changed since $time but were not transient (ie created after + # $time but no longer exist). # # To accomplish this, we're using the "since" generator to use the # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - if (substr($last_update_token, 0, 1) eq "c") { - $last_update_token = "\"$last_update_token\""; - } + # output to file names only. + my $query = <<" END"; ["query", "$git_work_tree", { - "since": $last_update_token, - "fields": ["name"], - "expression": ["not", ["dirname", ".git"]] + "since": $time, + "fields": ["name"] }] END - # Uncomment for debugging the watchman query - # open (my $fh, ">", ".git/watchman-query.json"); - # print $fh $query; - # close $fh; - print CHLD_IN $query; close CHLD_IN; my $response = do {local $/; }; - # Uncomment for debugging the watch response - # open ($fh, ">", ".git/watchman-response.json"); - # print $fh $response; - # close $fh; - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; + "Falling back to scanning...\n" if $response eq ""; die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; + "Falling back to scanning...\n" unless $response =~ /^\{/; - return $json_pkg->new->utf8->decode($response); -} + my $json_pkg; + eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; + } or do { + require JSON::PP; + $json_pkg = "JSON::PP"; + }; + + my $o = $json_pkg->new->utf8->decode($response); -sub is_work_tree_watched { - my ($output) = @_; - my $error = $output->{error}; - if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { + print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; $retry--; - my $response = qx/watchman watch "$git_work_tree"/; + qx/watchman watch "$git_work_tree"/; die "Failed to make watchman watch '$git_work_tree'.\n" . "Falling back to scanning...\n" if $? != 0; - $output = $json_pkg->new->utf8->decode($response); - $error = $output->{error}; - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # close $fh; # Watchman will always return all files on the first query so # return the fast "everything is dirty" flag to git and do the # Watchman query just to get it over with now so we won't pay # the cost in git to look up each individual file. - my $o = watchman_clock(); - $error = $output->{error}; - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - output_result($o->{clock}, ("/")); - $last_update_token = $o->{clock}; - + print "/\0"; eval { launch_watchman() }; - return 0; + exit 0; } - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - return 1; -} + die "Watchman: $o->{error}.\n" . + "Falling back to scanning...\n" if $o->{error}; -sub get_working_dir { - my $working_dir; - if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $working_dir = Win32::GetCwd(); - $working_dir =~ tr/\\/\//; - } else { - require Cwd; - $working_dir = Cwd::cwd(); - } - - return $working_dir; + binmode STDOUT, ":utf8"; + local $, = "\0"; + print @{$o->{files}}; } diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/hooks/pre-commit.sample solvespace-3.0.0+git1798-df3ef2a/.git/hooks/pre-commit.sample --- solvespace-3.0.0+git1793-2cd0ee4/.git/hooks/pre-commit.sample 2020-11-26 17:57:47.296268500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/hooks/pre-commit.sample 2021-11-03 19:07:46.065955200 +0000 @@ -16,7 +16,7 @@ fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --type=bool hooks.allownonascii) +allownonascii=$(git config --bool hooks.allownonascii) # Redirect output to stderr. exec 1>&2 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/hooks/update.sample solvespace-3.0.0+git1798-df3ef2a/.git/hooks/update.sample --- solvespace-3.0.0+git1793-2cd0ee4/.git/hooks/update.sample 2020-11-26 17:57:47.296268500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/hooks/update.sample 2021-11-03 19:07:46.065955200 +0000 @@ -43,11 +43,11 @@ fi # --- Config -allowunannotated=$(git config --type=bool hooks.allowunannotated) -allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) -denycreatebranch=$(git config --type=bool hooks.denycreatebranch) -allowdeletetag=$(git config --type=bool hooks.allowdeletetag) -allowmodifytag=$(git config --type=bool hooks.allowmodifytag) +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) # check for no description projectdesc=$(sed -e '1q' "$GIT_DIR/description") Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/index and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/index differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/info/refs solvespace-3.0.0+git1798-df3ef2a/.git/info/refs --- solvespace-3.0.0+git1793-2cd0ee4/.git/info/refs 2021-08-08 05:38:25.419336000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/info/refs 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -1b8e1dec652eef7916a94b6c9db404457dacb0db refs/heads/master -b1d87bf284b32e875c8edba592113e691ea10bcd refs/remotes/origin/2.x -1b8e1dec652eef7916a94b6c9db404457dacb0db refs/remotes/origin/HEAD -aa29dbfbfdde6e9497befdc8e4209223add8305c refs/remotes/origin/eigen_over_master -4d7145a763e5c4198b7a348dbbd2f93ab701b8bf refs/remotes/origin/emscripten -4e823477a6b9f3b1e953a4ebda18cfe91101e254 refs/remotes/origin/fix-macos-leak -1b8e1dec652eef7916a94b6c9db404457dacb0db refs/remotes/origin/master -a02330a700db16a7efdba50a35bec8370cf7b6c0 refs/remotes/origin/readme-badges -b7a605c44cbc3bbe5d396c88ebe9c8cdf3161f90 refs/remotes/origin/single-window -7e64c405dd3ae0322c115ced6e910e349583c85f refs/remotes/origin/solver -945c1e74fc8dec29231cee7b4097e43fd5e383d6 refs/remotes/origin/swap-vertical-horizontal-constraints -0e0b0252e23dd5bd4ae82ababcc54c44aee036d6 refs/remotes/origin/version3 -9e34d310d1a87f1348fa7d596940cf4c37693688 refs/remotes/origin/wip -68ca7e82a538594f7b2a572139acfe03b32b0344 refs/remotes/origin/wip-intersection -bdd2be60412914ad434e132b41a3b41230257d0a refs/tags/edge -37fd44ae288e339a86b155f596e7a88473037a38 refs/tags/v2.0 -defeb6411a748a783337edc3cc8a201ab14da780 refs/tags/v2.0^{} -d5ec13e9e6268d7df979fa883f4441e068fc9d64 refs/tags/v2.1 -dce906465d9a4b6bcc062d1ecdb5a50a6c81ea0d refs/tags/v2.1^{} -2eb2217d8394837792934f317d7025737c0fef01 refs/tags/v2.1.rc1 -1e2f1996335120c9d707d1b15f2fe2f56521d30b refs/tags/v2.1.rc1^{} -736771922053597bd6e9ab465b329e8ec66b1415 refs/tags/v2.2 -c4ad073d1b3d3fcd81b34cbe5f2352547b14213f refs/tags/v2.2^{} -8a566b0fce62282446aa07bd5e9691054350f06e refs/tags/v2.3 -7c1ca460769fc8cbef26d296338d4bbc6f2ef6d0 refs/tags/v2.3^{} -0e0b0252e23dd5bd4ae82ababcc54c44aee036d6 refs/tags/v3.0 -ee8e2202fe4de3ce6347b5596edc6080f288576a refs/tags/v3.0.rc1 -bcb8cd2c03259f382cd15d6a4497b3fa7a8ebba6 refs/tags/v3.0.rc1^{} -36719c62345ec1dd35400aa8e4fd7ecda3f6140e refs/tags/v3.0.rc2 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/logs/HEAD solvespace-3.0.0+git1798-df3ef2a/.git/logs/HEAD --- solvespace-3.0.0+git1793-2cd0ee4/.git/logs/HEAD 2021-10-11 19:03:41.308999800 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/logs/HEAD 2021-11-05 17:27:03.697049000 +0000 @@ -1,22 +1,2 @@ -e15ccdd477693e2e8b140572d9a8d5fd114cc474 e74e2024658ff6c6ce8e239932d95149eb174e45 Alexander Pozdnyakov 1621024135 +0300 pull: Fast-forward -e74e2024658ff6c6ce8e239932d95149eb174e45 b5fb1dd4297fa5271dc7f54910380a30fa3aff48 Alexander Pozdnyakov 1621284797 +0300 pull: Fast-forward -b5fb1dd4297fa5271dc7f54910380a30fa3aff48 4ee869906540343522db76f1ed170e74f3dbed8c Alexander Pozdnyakov 1622827377 +0300 pull: Fast-forward -4ee869906540343522db76f1ed170e74f3dbed8c 4308dc136b03d6727da96ec75cc7ae27d169040a Alexander Pozdnyakov 1624827345 +0300 pull: Fast-forward -4308dc136b03d6727da96ec75cc7ae27d169040a 37de36425770880032bd281efe069a1c0b8daea9 Alexander Pozdnyakov 1625001580 +0300 pull: Fast-forward -37de36425770880032bd281efe069a1c0b8daea9 ddb76324afb99376c1bf5cccec2db7cb06a023dc Alexander Pozdnyakov 1625198953 +0300 pull: Fast-forward -ddb76324afb99376c1bf5cccec2db7cb06a023dc 37da0f334188de5f3d046f7a7df16ec6b5503c2f Alexander Pozdnyakov 1625593428 +0300 pull: Fast-forward -37da0f334188de5f3d046f7a7df16ec6b5503c2f a97b77c1e552c89aee873562694e7ac733056094 Alexander Pozdnyakov 1626562061 +0300 pull: Fast-forward -a97b77c1e552c89aee873562694e7ac733056094 f6bb0a2d35ba6c67a72170413207d0f28bac216d Alexander Pozdnyakov 1627584540 +0300 pull: Fast-forward -f6bb0a2d35ba6c67a72170413207d0f28bac216d 1b8e1dec652eef7916a94b6c9db404457dacb0db Alexander Pozdnyakov 1627922248 +0300 pull: Fast-forward -1b8e1dec652eef7916a94b6c9db404457dacb0db 56719415dea4de7af750227653362f4c8cad78f8 alex 1628450949 +0000 pull: Fast-forward -56719415dea4de7af750227653362f4c8cad78f8 645febfcd6f02bde834147c9af7eeea8577a1bc5 alex 1629057913 +0000 pull: Fast-forward -645febfcd6f02bde834147c9af7eeea8577a1bc5 3e595002fe701fe024581d43b299e4f5696277ce alex 1629147102 +0000 pull: Fast-forward -3e595002fe701fe024581d43b299e4f5696277ce 5edb2eebf69050c9ae10ca424c55c65bfb106aa0 alex 1629233966 +0000 pull: Fast-forward -5edb2eebf69050c9ae10ca424c55c65bfb106aa0 0a3504c30a005c53e4f0cb6c8fa608482b90f0e9 alex 1629399148 +0000 pull: Fast-forward -0a3504c30a005c53e4f0cb6c8fa608482b90f0e9 f47cf65f41442760cfb6120f5b897043d55a0def alex 1629754157 +0000 pull: Fast-forward -f47cf65f41442760cfb6120f5b897043d55a0def 7e823df94a449cb542599d4d7f880b4a28b043da alex 1629952573 +0000 pull: Fast-forward -7e823df94a449cb542599d4d7f880b4a28b043da 4bf9df23854ed01e1340c6d4d4f7702cbec4479a alex 1630177307 +0000 pull: Fast-forward -4bf9df23854ed01e1340c6d4d4f7702cbec4479a 0eab7f783b37fe1601cf7e493e1ec0a0e619a038 alex 1630608547 +0000 pull: Fast-forward -0eab7f783b37fe1601cf7e493e1ec0a0e619a038 6bc63e92b0d908aa751ae06063b2ec00fec4cc57 alex 1630792323 +0000 pull: Fast-forward -6bc63e92b0d908aa751ae06063b2ec00fec4cc57 bb1938903b1d4ff7de78d11e13919490f19657fa alex 1632774921 +0000 pull: Fast-forward -bb1938903b1d4ff7de78d11e13919490f19657fa 2cd0ee4b3352c8fb68921399790d0545ad9b26bf alex 1633979021 +0000 pull: Fast-forward +0000000000000000000000000000000000000000 eb17248bd5180ad7b121c20f2c6f775ecfcfaad4 alex 1635966539 +0000 clone: from https://github.com/solvespace/solvespace.git +eb17248bd5180ad7b121c20f2c6f775ecfcfaad4 df3ef2ab0e805b3500803607aa33e8152f11b048 alex 1636133223 +0000 pull: Fast-forward diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/logs/refs/heads/master solvespace-3.0.0+git1798-df3ef2a/.git/logs/refs/heads/master --- solvespace-3.0.0+git1793-2cd0ee4/.git/logs/refs/heads/master 2021-10-11 19:03:41.312333000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/logs/refs/heads/master 2021-11-05 17:27:03.697049000 +0000 @@ -1,22 +1,2 @@ -e15ccdd477693e2e8b140572d9a8d5fd114cc474 e74e2024658ff6c6ce8e239932d95149eb174e45 Alexander Pozdnyakov 1621024135 +0300 pull: Fast-forward -e74e2024658ff6c6ce8e239932d95149eb174e45 b5fb1dd4297fa5271dc7f54910380a30fa3aff48 Alexander Pozdnyakov 1621284797 +0300 pull: Fast-forward -b5fb1dd4297fa5271dc7f54910380a30fa3aff48 4ee869906540343522db76f1ed170e74f3dbed8c Alexander Pozdnyakov 1622827377 +0300 pull: Fast-forward -4ee869906540343522db76f1ed170e74f3dbed8c 4308dc136b03d6727da96ec75cc7ae27d169040a Alexander Pozdnyakov 1624827345 +0300 pull: Fast-forward -4308dc136b03d6727da96ec75cc7ae27d169040a 37de36425770880032bd281efe069a1c0b8daea9 Alexander Pozdnyakov 1625001580 +0300 pull: Fast-forward -37de36425770880032bd281efe069a1c0b8daea9 ddb76324afb99376c1bf5cccec2db7cb06a023dc Alexander Pozdnyakov 1625198953 +0300 pull: Fast-forward -ddb76324afb99376c1bf5cccec2db7cb06a023dc 37da0f334188de5f3d046f7a7df16ec6b5503c2f Alexander Pozdnyakov 1625593428 +0300 pull: Fast-forward -37da0f334188de5f3d046f7a7df16ec6b5503c2f a97b77c1e552c89aee873562694e7ac733056094 Alexander Pozdnyakov 1626562061 +0300 pull: Fast-forward -a97b77c1e552c89aee873562694e7ac733056094 f6bb0a2d35ba6c67a72170413207d0f28bac216d Alexander Pozdnyakov 1627584540 +0300 pull: Fast-forward -f6bb0a2d35ba6c67a72170413207d0f28bac216d 1b8e1dec652eef7916a94b6c9db404457dacb0db Alexander Pozdnyakov 1627922248 +0300 pull: Fast-forward -1b8e1dec652eef7916a94b6c9db404457dacb0db 56719415dea4de7af750227653362f4c8cad78f8 alex 1628450949 +0000 pull: Fast-forward -56719415dea4de7af750227653362f4c8cad78f8 645febfcd6f02bde834147c9af7eeea8577a1bc5 alex 1629057913 +0000 pull: Fast-forward -645febfcd6f02bde834147c9af7eeea8577a1bc5 3e595002fe701fe024581d43b299e4f5696277ce alex 1629147102 +0000 pull: Fast-forward -3e595002fe701fe024581d43b299e4f5696277ce 5edb2eebf69050c9ae10ca424c55c65bfb106aa0 alex 1629233966 +0000 pull: Fast-forward -5edb2eebf69050c9ae10ca424c55c65bfb106aa0 0a3504c30a005c53e4f0cb6c8fa608482b90f0e9 alex 1629399148 +0000 pull: Fast-forward -0a3504c30a005c53e4f0cb6c8fa608482b90f0e9 f47cf65f41442760cfb6120f5b897043d55a0def alex 1629754157 +0000 pull: Fast-forward -f47cf65f41442760cfb6120f5b897043d55a0def 7e823df94a449cb542599d4d7f880b4a28b043da alex 1629952573 +0000 pull: Fast-forward -7e823df94a449cb542599d4d7f880b4a28b043da 4bf9df23854ed01e1340c6d4d4f7702cbec4479a alex 1630177307 +0000 pull: Fast-forward -4bf9df23854ed01e1340c6d4d4f7702cbec4479a 0eab7f783b37fe1601cf7e493e1ec0a0e619a038 alex 1630608547 +0000 pull: Fast-forward -0eab7f783b37fe1601cf7e493e1ec0a0e619a038 6bc63e92b0d908aa751ae06063b2ec00fec4cc57 alex 1630792323 +0000 pull: Fast-forward -6bc63e92b0d908aa751ae06063b2ec00fec4cc57 bb1938903b1d4ff7de78d11e13919490f19657fa alex 1632774921 +0000 pull: Fast-forward -bb1938903b1d4ff7de78d11e13919490f19657fa 2cd0ee4b3352c8fb68921399790d0545ad9b26bf alex 1633979021 +0000 pull: Fast-forward +0000000000000000000000000000000000000000 eb17248bd5180ad7b121c20f2c6f775ecfcfaad4 alex 1635966539 +0000 clone: from https://github.com/solvespace/solvespace.git +eb17248bd5180ad7b121c20f2c6f775ecfcfaad4 df3ef2ab0e805b3500803607aa33e8152f11b048 alex 1636133223 +0000 pull: Fast-forward diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/logs/refs/remotes/origin/fix-macos-leak solvespace-3.0.0+git1798-df3ef2a/.git/logs/refs/remotes/origin/fix-macos-leak --- solvespace-3.0.0+git1793-2cd0ee4/.git/logs/refs/remotes/origin/fix-macos-leak 2021-08-08 05:38:23.176002700 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/logs/refs/remotes/origin/fix-macos-leak 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 4e823477a6b9f3b1e953a4ebda18cfe91101e254 Alexander Pozdnyakov 1624571262 +0300 pull: storing head diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/logs/refs/remotes/origin/HEAD solvespace-3.0.0+git1798-df3ef2a/.git/logs/refs/remotes/origin/HEAD --- solvespace-3.0.0+git1793-2cd0ee4/.git/logs/refs/remotes/origin/HEAD 2021-08-08 05:38:23.236003000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/logs/refs/remotes/origin/HEAD 2021-11-03 19:08:59.505634300 +0000 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 eb17248bd5180ad7b121c20f2c6f775ecfcfaad4 alex 1635966539 +0000 clone: from https://github.com/solvespace/solvespace.git diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/logs/refs/remotes/origin/master solvespace-3.0.0+git1798-df3ef2a/.git/logs/refs/remotes/origin/master --- solvespace-3.0.0+git1793-2cd0ee4/.git/logs/refs/remotes/origin/master 2021-10-11 19:03:41.205666300 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/logs/refs/remotes/origin/master 2021-11-05 17:27:03.517049600 +0000 @@ -1,22 +1 @@ -e15ccdd477693e2e8b140572d9a8d5fd114cc474 e74e2024658ff6c6ce8e239932d95149eb174e45 Alexander Pozdnyakov 1621024135 +0300 pull: fast-forward -e74e2024658ff6c6ce8e239932d95149eb174e45 b5fb1dd4297fa5271dc7f54910380a30fa3aff48 Alexander Pozdnyakov 1621284797 +0300 pull: fast-forward -b5fb1dd4297fa5271dc7f54910380a30fa3aff48 4ee869906540343522db76f1ed170e74f3dbed8c Alexander Pozdnyakov 1622827377 +0300 pull: fast-forward -4ee869906540343522db76f1ed170e74f3dbed8c 4308dc136b03d6727da96ec75cc7ae27d169040a Alexander Pozdnyakov 1624827345 +0300 pull: fast-forward -4308dc136b03d6727da96ec75cc7ae27d169040a 37de36425770880032bd281efe069a1c0b8daea9 Alexander Pozdnyakov 1625001580 +0300 pull: fast-forward -37de36425770880032bd281efe069a1c0b8daea9 ddb76324afb99376c1bf5cccec2db7cb06a023dc Alexander Pozdnyakov 1625198953 +0300 pull: fast-forward -ddb76324afb99376c1bf5cccec2db7cb06a023dc 37da0f334188de5f3d046f7a7df16ec6b5503c2f Alexander Pozdnyakov 1625593428 +0300 pull: fast-forward -37da0f334188de5f3d046f7a7df16ec6b5503c2f a97b77c1e552c89aee873562694e7ac733056094 Alexander Pozdnyakov 1626562061 +0300 pull: fast-forward -a97b77c1e552c89aee873562694e7ac733056094 f6bb0a2d35ba6c67a72170413207d0f28bac216d Alexander Pozdnyakov 1627584540 +0300 pull: fast-forward -f6bb0a2d35ba6c67a72170413207d0f28bac216d 1b8e1dec652eef7916a94b6c9db404457dacb0db Alexander Pozdnyakov 1627922248 +0300 pull: fast-forward -1b8e1dec652eef7916a94b6c9db404457dacb0db 56719415dea4de7af750227653362f4c8cad78f8 alex 1628450948 +0000 pull: fast-forward -56719415dea4de7af750227653362f4c8cad78f8 645febfcd6f02bde834147c9af7eeea8577a1bc5 alex 1629057913 +0000 pull: fast-forward -645febfcd6f02bde834147c9af7eeea8577a1bc5 3e595002fe701fe024581d43b299e4f5696277ce alex 1629147102 +0000 pull: fast-forward -3e595002fe701fe024581d43b299e4f5696277ce 5edb2eebf69050c9ae10ca424c55c65bfb106aa0 alex 1629233966 +0000 pull: fast-forward -5edb2eebf69050c9ae10ca424c55c65bfb106aa0 0a3504c30a005c53e4f0cb6c8fa608482b90f0e9 alex 1629399148 +0000 pull: fast-forward -0a3504c30a005c53e4f0cb6c8fa608482b90f0e9 f47cf65f41442760cfb6120f5b897043d55a0def alex 1629754157 +0000 pull: fast-forward -f47cf65f41442760cfb6120f5b897043d55a0def 7e823df94a449cb542599d4d7f880b4a28b043da alex 1629952573 +0000 pull: fast-forward -7e823df94a449cb542599d4d7f880b4a28b043da 4bf9df23854ed01e1340c6d4d4f7702cbec4479a alex 1630177307 +0000 pull: fast-forward -4bf9df23854ed01e1340c6d4d4f7702cbec4479a 0eab7f783b37fe1601cf7e493e1ec0a0e619a038 alex 1630608547 +0000 pull: fast-forward -0eab7f783b37fe1601cf7e493e1ec0a0e619a038 6bc63e92b0d908aa751ae06063b2ec00fec4cc57 alex 1630792323 +0000 pull: fast-forward -6bc63e92b0d908aa751ae06063b2ec00fec4cc57 bb1938903b1d4ff7de78d11e13919490f19657fa alex 1632774920 +0000 pull: fast-forward -bb1938903b1d4ff7de78d11e13919490f19657fa 2cd0ee4b3352c8fb68921399790d0545ad9b26bf alex 1633979021 +0000 pull: fast-forward +eb17248bd5180ad7b121c20f2c6f775ecfcfaad4 df3ef2ab0e805b3500803607aa33e8152f11b048 alex 1636133223 +0000 pull: fast-forward diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/hooks/fsmonitor-watchman.sample solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/hooks/fsmonitor-watchman.sample --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/hooks/fsmonitor-watchman.sample 2020-11-26 17:58:13.036189300 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/hooks/fsmonitor-watchman.sample 2021-11-03 19:08:59.605634000 +0000 @@ -8,166 +8,102 @@ # (https://facebook.github.io/watchman/) with git to speed up detecting # new and modified files. # -# The hook is passed a version (currently 2) and last update token -# formatted as a string and outputs to stdout a new update token and -# all files that have been modified since the update token. Paths must -# be relative to the root of the working tree and separated by a single NUL. +# The hook is passed a version (currently 1) and a time in nanoseconds +# formatted as a string and outputs to stdout all files that have been +# modified since the given time. Paths must be relative to the root of +# the working tree and separated by a single NUL. # # To enable this hook, rename this file to "query-watchman" and set # 'git config core.fsmonitor .git/hooks/query-watchman' # -my ($version, $last_update_token) = @ARGV; - -# Uncomment for debugging -# print STDERR "$0 $version $last_update_token\n"; +my ($version, $time) = @ARGV; # Check the hook interface version -if ($version ne 2) { + +if ($version == 1) { + # convert nanoseconds to seconds + # subtract one second to make sure watchman will return all changes + $time = int ($time / 1000000000) - 1; +} else { die "Unsupported query-fsmonitor hook version '$version'.\n" . "Falling back to scanning...\n"; } -my $git_work_tree = get_working_dir(); +my $git_work_tree; +if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $git_work_tree = Win32::GetCwd(); + $git_work_tree =~ tr/\\/\//; +} else { + require Cwd; + $git_work_tree = Cwd::cwd(); +} my $retry = 1; -my $json_pkg; -eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; -} or do { - require JSON::PP; - $json_pkg = "JSON::PP"; -}; - launch_watchman(); sub launch_watchman { - my $o = watchman_query(); - if (is_work_tree_watched($o)) { - output_result($o->{clock}, @{$o->{files}}); - } -} - -sub output_result { - my ($clockid, @files) = @_; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # binmode $fh, ":utf8"; - # print $fh "$clockid\n@files\n"; - # close $fh; - binmode STDOUT, ":utf8"; - print $clockid; - print "\0"; - local $, = "\0"; - print @files; -} - -sub watchman_clock { - my $response = qx/watchman clock "$git_work_tree"/; - die "Failed to get clock id on '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - return $json_pkg->new->utf8->decode($response); -} - -sub watchman_query { my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; # In the query expression below we're asking for names of files that - # changed since $last_update_token but not from the .git folder. + # changed since $time but were not transient (ie created after + # $time but no longer exist). # # To accomplish this, we're using the "since" generator to use the # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - if (substr($last_update_token, 0, 1) eq "c") { - $last_update_token = "\"$last_update_token\""; - } + # output to file names only. + my $query = <<" END"; ["query", "$git_work_tree", { - "since": $last_update_token, - "fields": ["name"], - "expression": ["not", ["dirname", ".git"]] + "since": $time, + "fields": ["name"] }] END - # Uncomment for debugging the watchman query - # open (my $fh, ">", ".git/watchman-query.json"); - # print $fh $query; - # close $fh; - print CHLD_IN $query; close CHLD_IN; my $response = do {local $/; }; - # Uncomment for debugging the watch response - # open ($fh, ">", ".git/watchman-response.json"); - # print $fh $response; - # close $fh; - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; + "Falling back to scanning...\n" if $response eq ""; die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; + "Falling back to scanning...\n" unless $response =~ /^\{/; - return $json_pkg->new->utf8->decode($response); -} + my $json_pkg; + eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; + } or do { + require JSON::PP; + $json_pkg = "JSON::PP"; + }; + + my $o = $json_pkg->new->utf8->decode($response); -sub is_work_tree_watched { - my ($output) = @_; - my $error = $output->{error}; - if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { + print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; $retry--; - my $response = qx/watchman watch "$git_work_tree"/; + qx/watchman watch "$git_work_tree"/; die "Failed to make watchman watch '$git_work_tree'.\n" . "Falling back to scanning...\n" if $? != 0; - $output = $json_pkg->new->utf8->decode($response); - $error = $output->{error}; - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # close $fh; # Watchman will always return all files on the first query so # return the fast "everything is dirty" flag to git and do the # Watchman query just to get it over with now so we won't pay # the cost in git to look up each individual file. - my $o = watchman_clock(); - $error = $output->{error}; - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - output_result($o->{clock}, ("/")); - $last_update_token = $o->{clock}; - + print "/\0"; eval { launch_watchman() }; - return 0; + exit 0; } - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - return 1; -} + die "Watchman: $o->{error}.\n" . + "Falling back to scanning...\n" if $o->{error}; -sub get_working_dir { - my $working_dir; - if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $working_dir = Win32::GetCwd(); - $working_dir =~ tr/\\/\//; - } else { - require Cwd; - $working_dir = Cwd::cwd(); - } - - return $working_dir; + binmode STDOUT, ":utf8"; + local $, = "\0"; + print @{$o->{files}}; } diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/hooks/pre-commit.sample solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/hooks/pre-commit.sample --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/hooks/pre-commit.sample 2020-11-26 17:58:13.036189300 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/hooks/pre-commit.sample 2021-11-03 19:08:59.605634000 +0000 @@ -16,7 +16,7 @@ fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --type=bool hooks.allownonascii) +allownonascii=$(git config --bool hooks.allownonascii) # Redirect output to stderr. exec 1>&2 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/hooks/update.sample solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/hooks/update.sample --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/hooks/update.sample 2020-11-26 17:58:13.036189300 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/hooks/update.sample 2021-11-03 19:08:59.605634000 +0000 @@ -43,11 +43,11 @@ fi # --- Config -allowunannotated=$(git config --type=bool hooks.allowunannotated) -allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) -denycreatebranch=$(git config --type=bool hooks.denycreatebranch) -allowdeletetag=$(git config --type=bool hooks.allowdeletetag) -allowmodifytag=$(git config --type=bool hooks.allowmodifytag) +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) # check for no description projectdesc=$(sed -e '1q' "$GIT_DIR/description") Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/index and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/index differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/logs/HEAD solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/logs/HEAD --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/logs/HEAD 2020-11-26 17:58:19.392169700 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/logs/HEAD 2021-11-03 19:09:15.475564500 +0000 @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 0b7b7b709d9299565db603f878214656ef5e9ddf Alexander Pozdnyakov 1606413497 +0300 clone: from https://github.com/solvespace/libdxfrw.git -0b7b7b709d9299565db603f878214656ef5e9ddf 0b7b7b709d9299565db603f878214656ef5e9ddf Alexander Pozdnyakov 1606413499 +0300 checkout: moving from master to 0b7b7b709d9299565db603f878214656ef5e9ddf +0000000000000000000000000000000000000000 0b7b7b709d9299565db603f878214656ef5e9ddf alex 1635966543 +0000 clone: from https://github.com/solvespace/libdxfrw.git +0b7b7b709d9299565db603f878214656ef5e9ddf 0b7b7b709d9299565db603f878214656ef5e9ddf alex 1635966555 +0000 checkout: moving from master to 0b7b7b709d9299565db603f878214656ef5e9ddf diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/logs/refs/heads/master solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/logs/refs/heads/master --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/logs/refs/heads/master 2020-11-26 17:58:17.340176000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/logs/refs/heads/master 2021-11-03 19:09:03.835615400 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 0b7b7b709d9299565db603f878214656ef5e9ddf Alexander Pozdnyakov 1606413497 +0300 clone: from https://github.com/solvespace/libdxfrw.git +0000000000000000000000000000000000000000 0b7b7b709d9299565db603f878214656ef5e9ddf alex 1635966543 +0000 clone: from https://github.com/solvespace/libdxfrw.git diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/logs/refs/remotes/origin/HEAD solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/logs/refs/remotes/origin/HEAD --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/logs/refs/remotes/origin/HEAD 2020-11-26 17:58:17.340176000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/logs/refs/remotes/origin/HEAD 2021-11-03 19:09:03.825615400 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 0b7b7b709d9299565db603f878214656ef5e9ddf Alexander Pozdnyakov 1606413497 +0300 clone: from https://github.com/solvespace/libdxfrw.git +0000000000000000000000000000000000000000 0b7b7b709d9299565db603f878214656ef5e9ddf alex 1635966543 +0000 clone: from https://github.com/solvespace/libdxfrw.git Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/objects/pack/pack-30d304848aafe65c8dff507059f7f28f7bc21575.idx and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/objects/pack/pack-30d304848aafe65c8dff507059f7f28f7bc21575.idx differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/objects/pack/pack-30d304848aafe65c8dff507059f7f28f7bc21575.pack and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/objects/pack/pack-30d304848aafe65c8dff507059f7f28f7bc21575.pack differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/objects/pack/pack-a04de1213fe141acbcf130e45fc67b76577536a6.idx and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/objects/pack/pack-a04de1213fe141acbcf130e45fc67b76577536a6.idx differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/libdxfrw/objects/pack/pack-a04de1213fe141acbcf130e45fc67b76577536a6.pack and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/libdxfrw/objects/pack/pack-a04de1213fe141acbcf130e45fc67b76577536a6.pack differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/FETCH_HEAD solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/FETCH_HEAD --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/FETCH_HEAD 2021-04-04 11:10:25.879958900 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/FETCH_HEAD 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -5f596056c97928b443d7fe229e445dd6ac17847b not-for-merge branch 'dev' of https://github.com/microsoft/mimalloc -ef8e5d18a65f653bbef9cf57694aff37d2e85b9d not-for-merge branch 'dev-atomic' of https://github.com/microsoft/mimalloc -2f5fbffaa7049f7ef881eefb74e73337b7d44255 not-for-merge branch 'dev-debug' of https://github.com/microsoft/mimalloc -04f1c3b1e23677ce03bd16137e73089abd552175 not-for-merge branch 'dev-exp-tls' of https://github.com/microsoft/mimalloc -4e643b6d3178e0ea2a093b7e14fe621631a91e4b not-for-merge branch 'dev-slice' of https://github.com/microsoft/mimalloc -feb0699bcb3f81cb14964ff8e3d92788241b1cd0 not-for-merge branch 'dev-win' of https://github.com/microsoft/mimalloc -15220c684331d1c486550d7a6b1736e0a1773816 not-for-merge branch 'master' of https://github.com/microsoft/mimalloc diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/hooks/fsmonitor-watchman.sample solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/hooks/fsmonitor-watchman.sample --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/hooks/fsmonitor-watchman.sample 2020-11-26 17:58:17.356176000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/hooks/fsmonitor-watchman.sample 2021-11-03 19:09:03.835615400 +0000 @@ -8,166 +8,102 @@ # (https://facebook.github.io/watchman/) with git to speed up detecting # new and modified files. # -# The hook is passed a version (currently 2) and last update token -# formatted as a string and outputs to stdout a new update token and -# all files that have been modified since the update token. Paths must -# be relative to the root of the working tree and separated by a single NUL. +# The hook is passed a version (currently 1) and a time in nanoseconds +# formatted as a string and outputs to stdout all files that have been +# modified since the given time. Paths must be relative to the root of +# the working tree and separated by a single NUL. # # To enable this hook, rename this file to "query-watchman" and set # 'git config core.fsmonitor .git/hooks/query-watchman' # -my ($version, $last_update_token) = @ARGV; - -# Uncomment for debugging -# print STDERR "$0 $version $last_update_token\n"; +my ($version, $time) = @ARGV; # Check the hook interface version -if ($version ne 2) { + +if ($version == 1) { + # convert nanoseconds to seconds + # subtract one second to make sure watchman will return all changes + $time = int ($time / 1000000000) - 1; +} else { die "Unsupported query-fsmonitor hook version '$version'.\n" . "Falling back to scanning...\n"; } -my $git_work_tree = get_working_dir(); +my $git_work_tree; +if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $git_work_tree = Win32::GetCwd(); + $git_work_tree =~ tr/\\/\//; +} else { + require Cwd; + $git_work_tree = Cwd::cwd(); +} my $retry = 1; -my $json_pkg; -eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; -} or do { - require JSON::PP; - $json_pkg = "JSON::PP"; -}; - launch_watchman(); sub launch_watchman { - my $o = watchman_query(); - if (is_work_tree_watched($o)) { - output_result($o->{clock}, @{$o->{files}}); - } -} - -sub output_result { - my ($clockid, @files) = @_; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # binmode $fh, ":utf8"; - # print $fh "$clockid\n@files\n"; - # close $fh; - binmode STDOUT, ":utf8"; - print $clockid; - print "\0"; - local $, = "\0"; - print @files; -} - -sub watchman_clock { - my $response = qx/watchman clock "$git_work_tree"/; - die "Failed to get clock id on '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - return $json_pkg->new->utf8->decode($response); -} - -sub watchman_query { my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; # In the query expression below we're asking for names of files that - # changed since $last_update_token but not from the .git folder. + # changed since $time but were not transient (ie created after + # $time but no longer exist). # # To accomplish this, we're using the "since" generator to use the # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - if (substr($last_update_token, 0, 1) eq "c") { - $last_update_token = "\"$last_update_token\""; - } + # output to file names only. + my $query = <<" END"; ["query", "$git_work_tree", { - "since": $last_update_token, - "fields": ["name"], - "expression": ["not", ["dirname", ".git"]] + "since": $time, + "fields": ["name"] }] END - # Uncomment for debugging the watchman query - # open (my $fh, ">", ".git/watchman-query.json"); - # print $fh $query; - # close $fh; - print CHLD_IN $query; close CHLD_IN; my $response = do {local $/; }; - # Uncomment for debugging the watch response - # open ($fh, ">", ".git/watchman-response.json"); - # print $fh $response; - # close $fh; - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; + "Falling back to scanning...\n" if $response eq ""; die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; + "Falling back to scanning...\n" unless $response =~ /^\{/; - return $json_pkg->new->utf8->decode($response); -} + my $json_pkg; + eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; + } or do { + require JSON::PP; + $json_pkg = "JSON::PP"; + }; + + my $o = $json_pkg->new->utf8->decode($response); -sub is_work_tree_watched { - my ($output) = @_; - my $error = $output->{error}; - if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { + print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; $retry--; - my $response = qx/watchman watch "$git_work_tree"/; + qx/watchman watch "$git_work_tree"/; die "Failed to make watchman watch '$git_work_tree'.\n" . "Falling back to scanning...\n" if $? != 0; - $output = $json_pkg->new->utf8->decode($response); - $error = $output->{error}; - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # close $fh; # Watchman will always return all files on the first query so # return the fast "everything is dirty" flag to git and do the # Watchman query just to get it over with now so we won't pay # the cost in git to look up each individual file. - my $o = watchman_clock(); - $error = $output->{error}; - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - output_result($o->{clock}, ("/")); - $last_update_token = $o->{clock}; - + print "/\0"; eval { launch_watchman() }; - return 0; + exit 0; } - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - return 1; -} + die "Watchman: $o->{error}.\n" . + "Falling back to scanning...\n" if $o->{error}; -sub get_working_dir { - my $working_dir; - if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $working_dir = Win32::GetCwd(); - $working_dir =~ tr/\\/\//; - } else { - require Cwd; - $working_dir = Cwd::cwd(); - } - - return $working_dir; + binmode STDOUT, ":utf8"; + local $, = "\0"; + print @{$o->{files}}; } diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/hooks/pre-commit.sample solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/hooks/pre-commit.sample --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/hooks/pre-commit.sample 2020-11-26 17:58:17.356176000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/hooks/pre-commit.sample 2021-11-03 19:09:03.835615400 +0000 @@ -16,7 +16,7 @@ fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --type=bool hooks.allownonascii) +allownonascii=$(git config --bool hooks.allownonascii) # Redirect output to stderr. exec 1>&2 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/hooks/update.sample solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/hooks/update.sample --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/hooks/update.sample 2020-11-26 17:58:17.356176000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/hooks/update.sample 2021-11-03 19:09:03.835615400 +0000 @@ -43,11 +43,11 @@ fi # --- Config -allowunannotated=$(git config --type=bool hooks.allowunannotated) -allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) -denycreatebranch=$(git config --type=bool hooks.denycreatebranch) -allowdeletetag=$(git config --type=bool hooks.allowdeletetag) -allowmodifytag=$(git config --type=bool hooks.allowmodifytag) +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) # check for no description projectdesc=$(sed -e '1q' "$GIT_DIR/description") Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/index and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/index differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/HEAD solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/HEAD --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/HEAD 2021-04-04 11:10:26.251958100 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/HEAD 2021-11-03 19:09:15.515564400 +0000 @@ -1,4 +1,2 @@ -0000000000000000000000000000000000000000 13a4030619edada133e1a3c06c6287ad5a9c74c1 Alexander Pozdnyakov 1606413499 +0300 clone: from https://github.com/microsoft/mimalloc -13a4030619edada133e1a3c06c6287ad5a9c74c1 a9686d6ecf00e4467e772f7c0b4ef76a15f325f6 Alexander Pozdnyakov 1606413499 +0300 checkout: moving from master to a9686d6ecf00e4467e772f7c0b4ef76a15f325f6 -a9686d6ecf00e4467e772f7c0b4ef76a15f325f6 27627843648ef84aee1621976f25bee5946e6bda Alexander Pozdnyakov 1613826250 +0300 checkout: moving from a9686d6ecf00e4467e772f7c0b4ef76a15f325f6 to 27627843648ef84aee1621976f25bee5946e6bda -27627843648ef84aee1621976f25bee5946e6bda 4e643b6d3178e0ea2a093b7e14fe621631a91e4b Alexander Pozdnyakov 1617534626 +0300 checkout: moving from 27627843648ef84aee1621976f25bee5946e6bda to 4e643b6d3178e0ea2a093b7e14fe621631a91e4b +0000000000000000000000000000000000000000 076f815cece59e0a0ee08237c8fbba75465452b6 alex 1635966555 +0000 clone: from https://github.com/microsoft/mimalloc +076f815cece59e0a0ee08237c8fbba75465452b6 4e643b6d3178e0ea2a093b7e14fe621631a91e4b alex 1635966555 +0000 checkout: moving from master to 4e643b6d3178e0ea2a093b7e14fe621631a91e4b diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/refs/heads/master solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/refs/heads/master --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/refs/heads/master 2020-11-26 17:58:19.344169900 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/refs/heads/master 2021-11-03 19:09:15.425564800 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 13a4030619edada133e1a3c06c6287ad5a9c74c1 Alexander Pozdnyakov 1606413499 +0300 clone: from https://github.com/microsoft/mimalloc +0000000000000000000000000000000000000000 076f815cece59e0a0ee08237c8fbba75465452b6 alex 1635966555 +0000 clone: from https://github.com/microsoft/mimalloc diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/dev solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/dev --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/dev 2021-04-04 11:10:25.879958900 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/dev 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -ca13e9cd59aea912f1eae6b6c5dee5e79dd11b2e 331491e1e80da8f99321c9261b17463f3b32ade5 Alexander Pozdnyakov 1613826250 +0300 pull: fast-forward -331491e1e80da8f99321c9261b17463f3b32ade5 5f596056c97928b443d7fe229e445dd6ac17847b Alexander Pozdnyakov 1617534625 +0300 pull: fast-forward diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/dev-slice solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/dev-slice --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/dev-slice 2021-04-04 11:10:25.879958900 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/dev-slice 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -ad058291953dbe00d7a7d7f786d17f7f4c563033 1b22da3c283ec02987ed1051a6b9d4358b4dd52a Alexander Pozdnyakov 1613826250 +0300 pull: fast-forward -1b22da3c283ec02987ed1051a6b9d4358b4dd52a 4e643b6d3178e0ea2a093b7e14fe621631a91e4b Alexander Pozdnyakov 1617534625 +0300 pull: fast-forward diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/HEAD solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/HEAD --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/HEAD 2020-11-26 17:58:19.344169900 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/HEAD 2021-11-03 19:09:15.425564800 +0000 @@ -1 +1 @@ -0000000000000000000000000000000000000000 13a4030619edada133e1a3c06c6287ad5a9c74c1 Alexander Pozdnyakov 1606413499 +0300 clone: from https://github.com/microsoft/mimalloc +0000000000000000000000000000000000000000 076f815cece59e0a0ee08237c8fbba75465452b6 alex 1635966555 +0000 clone: from https://github.com/microsoft/mimalloc diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/master solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/master --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/master 2021-02-20 13:04:10.160619500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/logs/refs/remotes/origin/master 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -13a4030619edada133e1a3c06c6287ad5a9c74c1 15220c684331d1c486550d7a6b1736e0a1773816 Alexander Pozdnyakov 1613826250 +0300 pull: fast-forward Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/08/3abce80a743a02f2a93eecc68e90235986e1fa and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/08/3abce80a743a02f2a93eecc68e90235986e1fa differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/0b/677bdbeb85bfef048bb1c8998cab0f45e349e5 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/0b/677bdbeb85bfef048bb1c8998cab0f45e349e5 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/0f/2759b03e1910f313e9333b34578051e00e15f2 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/0f/2759b03e1910f313e9333b34578051e00e15f2 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/0f/4fa38972d93878c0f2898abe5af16d15412bc5 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/0f/4fa38972d93878c0f2898abe5af16d15412bc5 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/11/3ba0fda3385cb1d6f3309140f96070fd09dc55 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/11/3ba0fda3385cb1d6f3309140f96070fd09dc55 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/15/aa956884579b65aee9d72427d21a3070b0a634 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/15/aa956884579b65aee9d72427d21a3070b0a634 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/18/105596c2d51d154b0084864184a5ff740b3484 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/18/105596c2d51d154b0084864184a5ff740b3484 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/21/c9d6387da6089c4e1f819ebe5c351def0386d7 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/21/c9d6387da6089c4e1f819ebe5c351def0386d7 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/23/82bc77e28937eb9384deb57df94f9ff18e1a4b and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/23/82bc77e28937eb9384deb57df94f9ff18e1a4b differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/24/902c4a760d5d518293d14b3b360d86a29fc5f9 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/24/902c4a760d5d518293d14b3b360d86a29fc5f9 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/2d/e26b7847bbc098016ee76a9f42b22aa4764c70 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/2d/e26b7847bbc098016ee76a9f42b22aa4764c70 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/32/28bb685fccba397c8d50d9411fe23be297ce44 solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/32/28bb685fccba397c8d50d9411fe23be297ce44 --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/32/28bb685fccba397c8d50d9411fe23be297ce44 2021-04-04 11:10:25.787959000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/32/28bb685fccba397c8d50d9411fe23be297ce44 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -xKJD1Dgz%4ٺ䆎H^z-8:J}DWZ<k3UڄPT!Y-uK;43'D!!gx>ojp+5~2_R_AXRxse8?[vu|~]/W(a H 8'V+ \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/3a/268c79a1720c475f84db185df2c23b5474dd98 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/3a/268c79a1720c475f84db185df2c23b5474dd98 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/40/71f65c941833a6ae1e5b1f81dc83df369bf489 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/40/71f65c941833a6ae1e5b1f81dc83df369bf489 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/42/a0f5356f75b2134a6765a3874c233264c9462c and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/42/a0f5356f75b2134a6765a3874c233264c9462c differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/43/a0c93a6e0f4b495c2666af2578937a1c02b252 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/43/a0c93a6e0f4b495c2666af2578937a1c02b252 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/43/ba54505de6feb4f64564071d78c8e2ad9f70c2 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/43/ba54505de6feb4f64564071d78c8e2ad9f70c2 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/46/a55a555d37cc3062aa8c8913b2df7e5516db41 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/46/a55a555d37cc3062aa8c8913b2df7e5516db41 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/47/050371a1eb935a1571c1e17c3b142402ccc24e solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/47/050371a1eb935a1571c1e17c3b142402ccc24e --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/47/050371a1eb935a1571c1e17c3b142402ccc24e 2021-04-04 11:10:25.787959000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/47/050371a1eb935a1571c1e17c3b142402ccc24e 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -xKjD!E3v' -MARKbFm5\΅yʺ5h)hBDlRHe >hGG**ĝ``'%a@ѣ)ZERdiGA|5qizOR|EP|0j@-Ccޠ?Q \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/4a/cdb34ebf19f0d01e7e89940e4423a8583eee12 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/4a/cdb34ebf19f0d01e7e89940e4423a8583eee12 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/4e/643b6d3178e0ea2a093b7e14fe621631a91e4b and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/4e/643b6d3178e0ea2a093b7e14fe621631a91e4b differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/55/738d9a7b2bddee639221f6f3220bdffb3befca and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/55/738d9a7b2bddee639221f6f3220bdffb3befca differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/5a/6ed2155e89474c3bb83541a4e710f0aefcf7c0 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/5a/6ed2155e89474c3bb83541a4e710f0aefcf7c0 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/5e/00ddde082022359040166741ffa1efb44b28c2 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/5e/00ddde082022359040166741ffa1efb44b28c2 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/5f/596056c97928b443d7fe229e445dd6ac17847b solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/5f/596056c97928b443d7fe229e445dd6ac17847b --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/5f/596056c97928b443d7fe229e445dd6ac17847b 2021-04-04 11:10:25.787959000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/5f/596056c97928b443d7fe229e445dd6ac17847b 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -xKj1D)$>=B^f [XF׷|,^Ԏ q}]vmhxl3j2Zv1R$QݨK D][NNO9EEqm.D~I( &g¢Qk5i8?[u?~7L_<FJ/vc.ˣTnaןz\EW \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/65/2c0bb28f785f852e9345ac4159a3eccab5ad7d and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/65/2c0bb28f785f852e9345ac4159a3eccab5ad7d differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/6b/edd1f717994b0b270278dd4b8c3ddc7689ee3c and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/6b/edd1f717994b0b270278dd4b8c3ddc7689ee3c differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/6e/229f9fc6261a35c0354cd91d9093e907d37158 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/6e/229f9fc6261a35c0354cd91d9093e907d37158 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/71/ac98ab089fc5380335486eb449578fd6cf20c0 solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/71/ac98ab089fc5380335486eb449578fd6cf20c0 --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/71/ac98ab089fc5380335486eb449578fd6cf20c0 2021-04-04 11:10:25.787959000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/71/ac98ab089fc5380335486eb449578fd6cf20c0 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -xj1DS+.IVX SkXƒ⿷f99iBfІh=zQ*t E(*.9UV{RLDbQfg -\1ݱ9[jG_ brm&PJF:;KO*vTzy˩0WӒs B/]B \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/71/af78c82b287a7d9d9be97eca155109aeed0d1b and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/71/af78c82b287a7d9d9be97eca155109aeed0d1b differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/75/da19df2ae53000943a005aa16d423eb1e9b171 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/75/da19df2ae53000943a005aa16d423eb1e9b171 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/77/d2bf7303f4476dfa916db901e97b21b01c04f5 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/77/d2bf7303f4476dfa916db901e97b21b01c04f5 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/79/62420697ce2435e75f67bd3d2357f38183d201 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/79/62420697ce2435e75f67bd3d2357f38183d201 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/7f/cd6a49e1da8042685b3c22a196148369037a03 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/7f/cd6a49e1da8042685b3c22a196148369037a03 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/89/0b79a63e57a9dee98aabb6ed826d4b81bdb5c8 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/89/0b79a63e57a9dee98aabb6ed826d4b81bdb5c8 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/8c/d74e41c2b072be5d3929990188913b0e46a288 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/8c/d74e41c2b072be5d3929990188913b0e46a288 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/8f/69e7095dfc6967b6864f32bed956227fd04e8b solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/8f/69e7095dfc6967b6864f32bed956227fd04e8b --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/8f/69e7095dfc6967b6864f32bed956227fd04e8b 2021-04-04 11:10:25.787959000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/8f/69e7095dfc6967b6864f32bed956227fd04e8b 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -x=NC1}R?ϖJA k" |DZOhAD\8W7kS4MЙ$0R N'cƅlKq|CrUL8%ZB *=xK7iRV;~u>s?^A{mPD3Dz4?[!S -"?'_[_ \ No newline at end of file diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/93/17256a4f3c76d4ce70741a357e5aadcda58529 solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/93/17256a4f3c76d4ce70741a357e5aadcda58529 --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/93/17256a4f3c76d4ce70741a357e5aadcda58529 2021-04-04 11:10:25.787959000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/93/17256a4f3c76d4ce70741a357e5aadcda58529 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -xKj1)q R8W ZRV@#}~OeZ: EB0,1Ѡ/HK/$uF )`s(VhZub#>}h _^pj5e~ގ2(])nӊn?u xXI \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/99/7acefa63344c99f2a85bf4f792a630b01752df and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/99/7acefa63344c99f2a85bf4f792a630b01752df differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/9f/3c29c6424fb2a67c007434a7bbd0e371d89ca0 solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/9f/3c29c6424fb2a67c007434a7bbd0e371d89ca0 --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/9f/3c29c6424fb2a67c007434a7bbd0e371d89ca0 2021-04-04 11:10:25.787959000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/9f/3c29c6424fb2a67c007434a7bbd0e371d89ca0 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -xAN!E]sJf=n(N\EQ8LЌϭ2:4xC#=R0m3:HDu.s@CmA,ۊN⺆cNլ=Ƶu SMvxMkގ3z̪-4p֨4RۏRNL|{pZDƢ|Β8KUJmB4kM^z82 NG׼ p7ZQK|ͽڔ2Z&bpZD,c  /{i 8zYz;489_vbX \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/e8/d2bfa571a62602635330c8bd65b6870bd427a2 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/e8/d2bfa571a62602635330c8bd65b6870bd427a2 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/eb/e5a6d1b1a7cb648c7687513b6050c7e9195f51 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/eb/e5a6d1b1a7cb648c7687513b6050c7e9195f51 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/ec/b73d6cf3228a4f46193b5b5caeb4ed9f5ecb74 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/ec/b73d6cf3228a4f46193b5b5caeb4ed9f5ecb74 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/ed/3a09acc7d18f75206100b5b292e0cb1a4c231a and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/ed/3a09acc7d18f75206100b5b292e0cb1a4c231a differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/f3/8b305e4fb3ee27eb02ecfd003c0893e9f84565 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/f3/8b305e4fb3ee27eb02ecfd003c0893e9f84565 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/f6/97622fe8626f69ca633a01a1607e1ff2d16948 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/f6/97622fe8626f69ca633a01a1607e1ff2d16948 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/f7/08e75ad42c5cf353e0bb2f71a9a5d89208ea89 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/f7/08e75ad42c5cf353e0bb2f71a9a5d89208ea89 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/fa/1b16c334f8b9810eec9fc48eb900640e11e91e and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/fa/1b16c334f8b9810eec9fc48eb900640e11e91e differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/fa/e4ecaa9d2410ce47ed896897820fce7d816776 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/fa/e4ecaa9d2410ce47ed896897820fce7d816776 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/pack/pack-8e605569d845bfaf806149709519027fdf2d0be7.idx and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/pack/pack-8e605569d845bfaf806149709519027fdf2d0be7.idx differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/pack/pack-8e605569d845bfaf806149709519027fdf2d0be7.pack and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/pack/pack-8e605569d845bfaf806149709519027fdf2d0be7.pack differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/pack/pack-91e58f477de89a099920e4ee8602a118be905073.idx and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/pack/pack-91e58f477de89a099920e4ee8602a118be905073.idx differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/pack/pack-91e58f477de89a099920e4ee8602a118be905073.pack and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/pack/pack-91e58f477de89a099920e4ee8602a118be905073.pack differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/pack/pack-e16ec55a80638e0f3c5d9474512a1164f8a4cd06.idx and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/pack/pack-e16ec55a80638e0f3c5d9474512a1164f8a4cd06.idx differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/objects/pack/pack-e16ec55a80638e0f3c5d9474512a1164f8a4cd06.pack and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/objects/pack/pack-e16ec55a80638e0f3c5d9474512a1164f8a4cd06.pack differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/packed-refs solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/packed-refs --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/packed-refs 2020-11-26 17:58:19.344169900 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/packed-refs 2021-11-03 19:09:15.425564800 +0000 @@ -1,11 +1,11 @@ # pack-refs with: peeled fully-peeled sorted -ca13e9cd59aea912f1eae6b6c5dee5e79dd11b2e refs/remotes/origin/dev +32ee13f41eafb7de541438279100c28ed9df437f refs/remotes/origin/dev ef8e5d18a65f653bbef9cf57694aff37d2e85b9d refs/remotes/origin/dev-atomic 2f5fbffaa7049f7ef881eefb74e73337b7d44255 refs/remotes/origin/dev-debug 04f1c3b1e23677ce03bd16137e73089abd552175 refs/remotes/origin/dev-exp-tls -ad058291953dbe00d7a7d7f786d17f7f4c563033 refs/remotes/origin/dev-slice +f3ffa663f107b02f423c0038536cf10732493aa2 refs/remotes/origin/dev-slice feb0699bcb3f81cb14964ff8e3d92788241b1cd0 refs/remotes/origin/dev-win -13a4030619edada133e1a3c06c6287ad5a9c74c1 refs/remotes/origin/master +076f815cece59e0a0ee08237c8fbba75465452b6 refs/remotes/origin/master f280f14e3115b0f5ff56fc60a959ed8e1295cc85 refs/tags/M3 a9686d6ecf00e4467e772f7c0b4ef76a15f325f6 refs/tags/list 1125271c2756ee1db1303918816fea35e08b3405 refs/tags/show @@ -55,4 +55,16 @@ ^6adb919085d9177cca7491cbb5ecec9dcb69c0a2 bce8ae6fc539b2cc44add3dd63a5820f25d7f825 refs/tags/v1.6.7 ^13a4030619edada133e1a3c06c6287ad5a9c74c1 +b7f1deee674ab4fa960e276d519d06d41f400a43 refs/tags/v1.7.0 +^92ead2d88061dde1264800b389b744ac1b79cf39 +c314b39293264d53924345168f41606b0c31d417 refs/tags/v1.7.1 +^985f313b35bc709aaa15d0f01867f857923c2ca6 +3b953c4248b592bf051a35a0b03b66bcb6606c33 refs/tags/v1.7.2 +^752594e76423526e108413731518a26e3322b9ca +33507fb5fb5281aa1b35e6b022247af915045e7c refs/tags/v2.0.0 +^27627843648ef84aee1621976f25bee5946e6bda +8e35ccc43be293a9bfd6e63da310a79c235d25d9 refs/tags/v2.0.1 +^dc6bce256d4f3ce87761f9337977dff3d8b1776c +7bc514e76436bb074e761161269e11933c93558d refs/tags/v2.0.2 +^b3b0fb58326a96beea1f4872bc1489d1d9fda7e0 99141497ee6922a375106797bf2061fa94967df7 refs/tags/win-m4 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/heads/master solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/heads/master --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/heads/master 2020-11-26 17:58:19.344169900 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/heads/master 2021-11-03 19:09:15.425564800 +0000 @@ -1 +1 @@ -13a4030619edada133e1a3c06c6287ad5a9c74c1 +076f815cece59e0a0ee08237c8fbba75465452b6 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/remotes/origin/dev solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/remotes/origin/dev --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/remotes/origin/dev 2021-04-04 11:10:25.879958900 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/remotes/origin/dev 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -5f596056c97928b443d7fe229e445dd6ac17847b diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/remotes/origin/dev-slice solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/remotes/origin/dev-slice --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/remotes/origin/dev-slice 2021-04-04 11:10:25.879958900 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/remotes/origin/dev-slice 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -4e643b6d3178e0ea2a093b7e14fe621631a91e4b diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/remotes/origin/master solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/remotes/origin/master --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/remotes/origin/master 2021-02-20 13:04:10.160619500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/remotes/origin/master 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -15220c684331d1c486550d7a6b1736e0a1773816 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/tags/v1.7.0 solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/tags/v1.7.0 --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/tags/v1.7.0 2021-02-20 13:04:10.172619600 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/tags/v1.7.0 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -b7f1deee674ab4fa960e276d519d06d41f400a43 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/tags/v2.0.0 solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/tags/v2.0.0 --- solvespace-3.0.0+git1793-2cd0ee4/.git/modules/extlib/mimalloc/refs/tags/v2.0.0 2021-02-20 13:04:10.172619600 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/modules/extlib/mimalloc/refs/tags/v2.0.0 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -33507fb5fb5281aa1b35e6b022247af915045e7c Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/01/9c2af08d03f174dcd6abbd01fbe86bceef6329 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/01/9c2af08d03f174dcd6abbd01fbe86bceef6329 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/02/aababbc266bd4cd2d352acd3f751301bb11552 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/02/aababbc266bd4cd2d352acd3f751301bb11552 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/07/00653afa79e64e580e40b4337d80af74aa6181 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/07/00653afa79e64e580e40b4337d80af74aa6181 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/07/9a77a7dbda27c18dd3fbdbdd13fcb78a1e21a2 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/07/9a77a7dbda27c18dd3fbdbdd13fcb78a1e21a2 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/0a/3504c30a005c53e4f0cb6c8fa608482b90f0e9 solvespace-3.0.0+git1798-df3ef2a/.git/objects/0a/3504c30a005c53e4f0cb6c8fa608482b90f0e9 --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/0a/3504c30a005c53e4f0cb6c8fa608482b90f0e9 2021-08-19 18:52:28.156020600 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/0a/3504c30a005c53e4f0cb6c8fa608482b90f0e9 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -x5J1E]WQ~%"20API*tci0r=pm\Tdf8FcFtZicKIy-г3AcV z3G^ll8q]kx1H-Н;,!SEFU ->O0$׭PT# j^~k ebxnevs-Pw/9^ \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/0d/3b975cf41c97a2fb581f670b7f94868600cce9 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/0d/3b975cf41c97a2fb581f670b7f94868600cce9 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/0e/ab7f783b37fe1601cf7e493e1ec0a0e619a038 solvespace-3.0.0+git1798-df3ef2a/.git/objects/0e/ab7f783b37fe1601cf7e493e1ec0a0e619a038 --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/0e/ab7f783b37fe1601cf7e493e1ec0a0e619a038 2021-09-02 18:49:07.479795700 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/0e/ab7f783b37fe1601cf7e493e1ec0a0e619a038 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -xKn D)ze EQ§Ql@ONj dYOR暑@XHNq.(ag!rQ}$Ѕ9yF& 9y*}- e׍3Ԓ_<c.;.}?)1q964 flGhԬa/wz { =6@m|1-g= . }?8r \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/0f/1a9ff254eb87ee70db20dc274820a1239b2826 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/0f/1a9ff254eb87ee70db20dc274820a1239b2826 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/0f/5a9e6a0b60e45d424f19ea26cc3b06bbff4429 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/0f/5a9e6a0b60e45d424f19ea26cc3b06bbff4429 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/11/aa4201dad385347bbc96d4992d1dcdf03a544c and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/11/aa4201dad385347bbc96d4992d1dcdf03a544c differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/16/12f51ed477ba2f8b0c6283eed6cc51ae91efa2 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/16/12f51ed477ba2f8b0c6283eed6cc51ae91efa2 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/17/e04dce005cb5e88d0c6a6e556491d3fa551b24 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/17/e04dce005cb5e88d0c6a6e556491d3fa551b24 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/18/b72df763affd5e510bb04d86dd7fe16150b8f1 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/18/b72df763affd5e510bb04d86dd7fe16150b8f1 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/19/6cc7b974b018988a060b4354d85608e06f6df5 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/19/6cc7b974b018988a060b4354d85608e06f6df5 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/1b/032077fa40880367867bc7e3532bdeada89238 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/1b/032077fa40880367867bc7e3532bdeada89238 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/1c/b1a1b8f9c94e2f25ce76548ddf41a97229543e and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/1c/b1a1b8f9c94e2f25ce76548ddf41a97229543e differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/1f/c336425e043737f6e33dba7f9f77372ac6b829 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/1f/c336425e043737f6e33dba7f9f77372ac6b829 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/1f/cbdedabf6dd70bf952974343c6f22749264055 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/1f/cbdedabf6dd70bf952974343c6f22749264055 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/21/2977126a3791f91812ed4d885e447d997f3204 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/21/2977126a3791f91812ed4d885e447d997f3204 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/22/553827b1a29a61c3af40ae87d9f54b6d8e1579 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/22/553827b1a29a61c3af40ae87d9f54b6d8e1579 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/24/9a54291d1989a334a1109cde6cf134744ebc7a and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/24/9a54291d1989a334a1109cde6cf134744ebc7a differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/25/a6c1cf3d24c1e818c9131e62d114b5df5168a1 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/25/a6c1cf3d24c1e818c9131e62d114b5df5168a1 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/26/53bcf6eb8e67b55ea8b99a0138a0fa30df20bb and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/26/53bcf6eb8e67b55ea8b99a0138a0fa30df20bb differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/29/a4359103ef842dabb8c757649106af48dfaf09 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/29/a4359103ef842dabb8c757649106af48dfaf09 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/2c/d0ee4b3352c8fb68921399790d0545ad9b26bf solvespace-3.0.0+git1798-df3ef2a/.git/objects/2c/d0ee4b3352c8fb68921399790d0545ad9b26bf --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/2c/d0ee4b3352c8fb68921399790d0545ad9b26bf 2021-10-11 19:03:41.088999700 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/2c/d0ee4b3352c8fb68921399790d0545ad9b26bf 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -xeKj0D)z?`0,@Z[2!@v+E8˜V%&,5R`6hlȬؚNW(5<@ Q!^\o\up/T\Jz _wJS.tck5R+.L26 :4*P:}U~ *+Lgp׺Tw׶uV> \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/2e/b9534ffa2deb4dac3631a022915c9c2c726b5b and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/2e/b9534ffa2deb4dac3631a022915c9c2c726b5b differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/2f/b6119de8814179feaeae44194c2c8f8d3f65a7 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/2f/b6119de8814179feaeae44194c2c8f8d3f65a7 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/2f/bd8df149ffef6e0bb70d77d388d1ccd9b503af and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/2f/bd8df149ffef6e0bb70d77d388d1ccd9b503af differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/31/5653122706b7ee4d0c3ee1f61255027c44663e and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/31/5653122706b7ee4d0c3ee1f61255027c44663e differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/31/a709e2c8c24f58c210d17b2ac1a849568ad725 solvespace-3.0.0+git1798-df3ef2a/.git/objects/31/a709e2c8c24f58c210d17b2ac1a849568ad725 --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/31/a709e2c8c24f58c210d17b2ac1a849568ad725 2021-08-28 19:01:47.331645300 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/31/a709e2c8c24f58c210d17b2ac1a849568ad725 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -xmKJiCK$  ( -/3mdݴM`h FY6%:R}, -&TdM)U#Մ`hؖm]=2flY R - ,j d1Aumhh? RP+,_kAIY4s USU>rIZɷϢio_S&elKa)GA-*\8 -v ~ -P@׸usdc6Q85"'hUݏqɋfNPRhZ0rEG39̀Cm]˴'[z{+@?$f5~$[7ѷ}MyYfWһDMFn{|U~,XR -ⶪZ?K6?h*ŽQ^5lkD -HR B9`IAUA"ʖ'MOʓ7ik -dFL#qɯ45 qN% \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/33/94a8af2beb332b68c7a38ac8f4d4bbba08301c and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/33/94a8af2beb332b68c7a38ac8f4d4bbba08301c differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/34/74b51918b6ed0ce13c4d1690dd6ed22e0b88dc and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/34/74b51918b6ed0ce13c4d1690dd6ed22e0b88dc differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/34/8a8e667fc03f9494f6d2186e857220d017ec17 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/34/8a8e667fc03f9494f6d2186e857220d017ec17 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/37/3e6ea2895b45aff6b46b6af51be36df82965e5 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/37/3e6ea2895b45aff6b46b6af51be36df82965e5 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/37/4be6488174a9af065d27b36f304ea863ebacf6 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/37/4be6488174a9af065d27b36f304ea863ebacf6 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/38/5d8d767ca8f7dec3113646ccdfccc768fd05aa and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/38/5d8d767ca8f7dec3113646ccdfccc768fd05aa differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/38/e1bcf7ae91b750e33418c68b2b291b5144ad05 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/38/e1bcf7ae91b750e33418c68b2b291b5144ad05 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/3e/595002fe701fe024581d43b299e4f5696277ce and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/3e/595002fe701fe024581d43b299e4f5696277ce differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/3f/538dc4fc09e4c08aeadbd4cbe8d0b017a40e5a and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/3f/538dc4fc09e4c08aeadbd4cbe8d0b017a40e5a differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/41/e3668f891093a859af92e0634d5e320a550725 solvespace-3.0.0+git1798-df3ef2a/.git/objects/41/e3668f891093a859af92e0634d5e320a550725 --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/41/e3668f891093a859af92e0634d5e320a550725 2021-08-16 20:51:42.096069000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/41/e3668f891093a859af92e0634d5e320a550725 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -x=On 왯XCZl EU~^bd,%Ze53;;cɗA0bNQ!k8uZ8Q7J$ zw UQ;4m8g*IaFbjcw-v!Jܲ ;O`WJH!8RF)ihW0>/f^rb\^3u5c] ]}PS)tfĤ 0v y7pc]#XÄ[\}HNȏY|m؃|{{z+L1 -`{WwtPva AtZkhMv`1ͯ&u^n \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/43/49eb36e4940a8f48b2140be7d92e7d377457b6 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/43/49eb36e4940a8f48b2140be7d92e7d377457b6 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/43/fd0d5737b340cb1c8f1ebc585129eae6a7a493 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/43/fd0d5737b340cb1c8f1ebc585129eae6a7a493 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/45/123fa625d16cf6d3cd7f8900c87de77e01c32d and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/45/123fa625d16cf6d3cd7f8900c87de77e01c32d differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/4a/5ccb57ffa454b5437c86d06035281bace7acd1 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/4a/5ccb57ffa454b5437c86d06035281bace7acd1 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/4a/fa8101736f0aa883a1fbb13fb82f771f532188 solvespace-3.0.0+git1798-df3ef2a/.git/objects/4a/fa8101736f0aa883a1fbb13fb82f771f532188 --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/4a/fa8101736f0aa883a1fbb13fb82f771f532188 2021-09-27 20:35:20.659441500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/4a/fa8101736f0aa883a1fbb13fb82f771f532188 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -x}An D)jj "}Ug p~P˦.kFz -K-"0X̤mTf&D71x9AErqDbAB28KB.{Qι}j^YTOqR>E\S5")KknQ|oiՇ{t.l[SfrM{cN \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/4b/f9df23854ed01e1340c6d4d4f7702cbec4479a and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/4b/f9df23854ed01e1340c6d4d4f7702cbec4479a differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/4d/b3e90b81e75b828f615ddc8e8ab01925d093e9 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/4d/b3e90b81e75b828f615ddc8e8ab01925d093e9 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/51/fe8ba10cf9578e0c4498140f963ed0f73d0988 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/51/fe8ba10cf9578e0c4498140f963ed0f73d0988 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/53/0e0404d6172f64cf49bf3b4cf50df6ad686322 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/53/0e0404d6172f64cf49bf3b4cf50df6ad686322 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/53/7d6dffbf4c544a725460069c7a61710b7cf299 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/53/7d6dffbf4c544a725460069c7a61710b7cf299 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/56/719415dea4de7af750227653362f4c8cad78f8 solvespace-3.0.0+git1798-df3ef2a/.git/objects/56/719415dea4de7af750227653362f4c8cad78f8 --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/56/719415dea4de7af750227653362f4c8cad78f8 2021-08-08 19:29:08.862343500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/56/719415dea4de7af750227653362f4c8cad78f8 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -xmj0{S쭇$FrdˆPr(*6%#U)z݁ofy d(!Bk5VwBWԝkR;٢a:mԈ^ս4흑\F9m w镆3𱒝FNl󌕍 Vo`lK=𥇩]S=V5cU i.# vRee f$Ciig  xՄ L%h#6fzA!_ۋ* P(N.,()f)u -w=*P(/N//fеU)zE6%Ki. \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/a2/c430ed7d19b508a8db11396f0dce9faf8c897c and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/a2/c430ed7d19b508a8db11396f0dce9faf8c897c differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/a2/df9ca81f944a2e76365d34c6e6e2cf2f6e94e3 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/a2/df9ca81f944a2e76365d34c6e6e2cf2f6e94e3 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/a6/4595795e3b6264beebd1d162bd63a7354438c5 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/a6/4595795e3b6264beebd1d162bd63a7354438c5 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/a6/d0230ba50fabf4100d9a59ab95eae5498cd416 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/a6/d0230ba50fabf4100d9a59ab95eae5498cd416 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/ac/e4ddd839576003f246f1b7d20ce9eae3988ef3 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/ac/e4ddd839576003f246f1b7d20ce9eae3988ef3 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/ad/e8c0fc8c4953949ffad17ae2db003947ecae46 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/ad/e8c0fc8c4953949ffad17ae2db003947ecae46 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/b2/7dc02a68fe977bea4b5cd7cf88edfd24e85814 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/b2/7dc02a68fe977bea4b5cd7cf88edfd24e85814 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/b3/c409475b8fc136d16b023b80eb0f612cb7c29a and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/b3/c409475b8fc136d16b023b80eb0f612cb7c29a differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/b4/e87540d8897bf3c722be26b1f271679348615c and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/b4/e87540d8897bf3c722be26b1f271679348615c differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/b6/3c9b526845d8b76c2fb59e6982d192c4664fdb and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/b6/3c9b526845d8b76c2fb59e6982d192c4664fdb differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/b6/5a0be3d68610f87b062787b6606ef4609641cd solvespace-3.0.0+git1798-df3ef2a/.git/objects/b6/5a0be3d68610f87b062787b6606ef4609641cd --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/b6/5a0be3d68610f87b062787b6606ef4609641cd 2021-08-15 20:05:13.132730500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/b6/5a0be3d68610f87b062787b6606ef4609641cd 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -xeAo {W̭8KQ^C5* pMjޛoJ|ji=ٟbF!gRMAK>ZRiC38TƫBtV[-k^l #L.m`X;x] PoP[6hd D~w.vPom Q^^ua1o&9WvxY0]9t` /2uڱ8U \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/b6/f1f57ff6f578acd8561d83231788a527e9bd86 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/b6/f1f57ff6f578acd8561d83231788a527e9bd86 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/b6/f8960569faa9b272a8ac2962d8c360663d9ec3 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/b6/f8960569faa9b272a8ac2962d8c360663d9ec3 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/b8/7987922f4a43f5ad2351b6c3973559c3cb9565 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/b8/7987922f4a43f5ad2351b6c3973559c3cb9565 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/b9/157cb0d6d2e05ed872a71279cf33591151bbce and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/b9/157cb0d6d2e05ed872a71279cf33591151bbce differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/ba/d35784f56f6baea1b6048b973b42c32423fcb7 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/ba/d35784f56f6baea1b6048b973b42c32423fcb7 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/ba/e48438fae53ed99f5b3d39f72031a3173f2b03 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/ba/e48438fae53ed99f5b3d39f72031a3173f2b03 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/bb/1938903b1d4ff7de78d11e13919490f19657fa and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/bb/1938903b1d4ff7de78d11e13919490f19657fa differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/bc/c77b117db44f98ca178e8849eb3dbe2832ee3a and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/bc/c77b117db44f98ca178e8849eb3dbe2832ee3a differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/bd/217d4dce6db6d5b8cceb68676bdacadae129cd and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/bd/217d4dce6db6d5b8cceb68676bdacadae129cd differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/be/4b13ac81c271f785c5e53c5e26a960be2fcbb6 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/be/4b13ac81c271f785c5e53c5e26a960be2fcbb6 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/bf/7ac957110c3dde3e8d94ff55609a6f63ffc146 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/bf/7ac957110c3dde3e8d94ff55609a6f63ffc146 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/bf/adc87264fd6edd84ea12813af78bb4f361a0ff and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/bf/adc87264fd6edd84ea12813af78bb4f361a0ff differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/c1/9bd8cc99dbecfaa9fec5dfe2c455b8856dbddb solvespace-3.0.0+git1798-df3ef2a/.git/objects/c1/9bd8cc99dbecfaa9fec5dfe2c455b8856dbddb --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/c1/9bd8cc99dbecfaa9fec5dfe2c455b8856dbddb 2021-08-15 20:05:13.132730500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/c1/9bd8cc99dbecfaa9fec5dfe2c455b8856dbddb 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -xMKj0D)z?Ĵd- I.O+6,#K} dUŃz)m< Vz5!%fV'd(blkᴅ -f@F8$ B )`[]sϜUo12kNGLZn(Nۮ{/w,з?hk“Ϫ Cxb.r_~zR-} >Wqu~ \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/de/41f83b228a7d7f1c4aa220be463abf060e3022 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/de/41f83b228a7d7f1c4aa220be463abf060e3022 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/de/82270f1a67721d41e84c819ea9b68bf4c441fb and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/de/82270f1a67721d41e84c819ea9b68bf4c441fb differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/df/3ef2ab0e805b3500803607aa33e8152f11b048 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/df/3ef2ab0e805b3500803607aa33e8152f11b048 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/df/9a65bfca2820968312f75d9210a73f221e94f2 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/df/9a65bfca2820968312f75d9210a73f221e94f2 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/e1/3b04d1d069bcb948719830f37a6e18cb77dce6 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/e1/3b04d1d069bcb948719830f37a6e18cb77dce6 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/e1/77867617faa4e0ea852c9a1047ee8b9a64d265 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/e1/77867617faa4e0ea852c9a1047ee8b9a64d265 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/e1/b0784b31c157922be8a618a4247b26a9fd642d and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/e1/b0784b31c157922be8a618a4247b26a9fd642d differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/e2/6f14bcff5bc03012cca48697b148a8f7213148 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/e2/6f14bcff5bc03012cca48697b148a8f7213148 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/e3/9dcbee926c3a844a317b8251d11b6c9a3e3a04 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/e3/9dcbee926c3a844a317b8251d11b6c9a3e3a04 differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/e8/6eb659854f7ccbd0154f11d4c0412153e300de solvespace-3.0.0+git1798-df3ef2a/.git/objects/e8/6eb659854f7ccbd0154f11d4c0412153e300de --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/e8/6eb659854f7ccbd0154f11d4c0412153e300de 2021-08-16 20:51:42.096069000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/e8/6eb659854f7ccbd0154f11d4c0412153e300de 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -x=An s+ -X Cxh8R~.ɩK}(uc0(_AD(Dw9)ޖH-L{1x1f3@Aj9+0EBprn>Zq-)ܹˣ[}isVho"h<{~K]yP?[봯?ׯB/J«C8}K`DʆH F`1&䳇mmi V7`H \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/ec/8f82ebbe60d046a9c2da9ae1c96efe0d3a5e48 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/ec/8f82ebbe60d046a9c2da9ae1c96efe0d3a5e48 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/ed/8e0289986329f88fbf65af0c8908498686f582 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/ed/8e0289986329f88fbf65af0c8908498686f582 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/f0/70dceb347de879ec5de14f61ebb4bef4d939d1 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/f0/70dceb347de879ec5de14f61ebb4bef4d939d1 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/f4/7cf65f41442760cfb6120f5b897043d55a0def and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/f4/7cf65f41442760cfb6120f5b897043d55a0def differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/f7/1c527e2330b48e49e0b2f089868552f5cca176 solvespace-3.0.0+git1798-df3ef2a/.git/objects/f7/1c527e2330b48e49e0b2f089868552f5cca176 --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/f7/1c527e2330b48e49e0b2f089868552f5cca176 2021-08-26 04:36:13.461656800 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/f7/1c527e2330b48e49e0b2f089868552f5cca176 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -xEKj0)oY>a!$wX|.rΜ$"dER xJ;(es=NH -ɬj .hОTIgF1Iiلؽ\%'xޫ#¹xM.+>*Ppb=cApa>ƹcoNoXnv/4Bj9#Ӈy&~}Dj[[>@-%6#$B 5;N]gVb \ No newline at end of file Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/f8/40b33fcc0b41f1ac48ce5dcab7a4664d5a74de and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/f8/40b33fcc0b41f1ac48ce5dcab7a4664d5a74de differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/f8/9c451a67b0c3b6f9ad5c8dc60f83d8565fd57b and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/f8/9c451a67b0c3b6f9ad5c8dc60f83d8565fd57b differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/f8/9d0c7ff6afbe0e36d5aa1622a3e70a41311e37 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/f8/9d0c7ff6afbe0e36d5aa1622a3e70a41311e37 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/f9/a95fcbdebc443fa121ba75b16d18ea0eda6cd9 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/f9/a95fcbdebc443fa121ba75b16d18ea0eda6cd9 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/fd/efacd2d94da42ddeb224598f531095f1102ea4 and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/fd/efacd2d94da42ddeb224598f531095f1102ea4 differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/info/commit-graph and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/info/commit-graph differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/objects/info/packs solvespace-3.0.0+git1798-df3ef2a/.git/objects/info/packs --- solvespace-3.0.0+git1793-2cd0ee4/.git/objects/info/packs 2021-08-08 05:38:25.422669400 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/objects/info/packs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -P pack-b53104dbeb913a3237b9ea8d0c5fcdb3c0013a1b.pack - Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/pack/pack-b53104dbeb913a3237b9ea8d0c5fcdb3c0013a1b.idx and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/pack/pack-b53104dbeb913a3237b9ea8d0c5fcdb3c0013a1b.idx differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/pack/pack-b53104dbeb913a3237b9ea8d0c5fcdb3c0013a1b.pack and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/pack/pack-b53104dbeb913a3237b9ea8d0c5fcdb3c0013a1b.pack differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/pack/pack-cd637afc208b8a36d9e06906defd3937331769b9.idx and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/pack/pack-cd637afc208b8a36d9e06906defd3937331769b9.idx differ Binary files /tmp/tmp6odbfxnm/N7q3T9IE8S/solvespace-3.0.0+git1793-2cd0ee4/.git/objects/pack/pack-cd637afc208b8a36d9e06906defd3937331769b9.pack and /tmp/tmp6odbfxnm/_0gI3b9_y4/solvespace-3.0.0+git1798-df3ef2a/.git/objects/pack/pack-cd637afc208b8a36d9e06906defd3937331769b9.pack differ diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/ORIG_HEAD solvespace-3.0.0+git1798-df3ef2a/.git/ORIG_HEAD --- solvespace-3.0.0+git1793-2cd0ee4/.git/ORIG_HEAD 2021-10-11 19:03:41.235666300 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/ORIG_HEAD 2021-11-05 17:27:03.527049500 +0000 @@ -1 +1 @@ -bb1938903b1d4ff7de78d11e13919490f19657fa +eb17248bd5180ad7b121c20f2c6f775ecfcfaad4 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/packed-refs solvespace-3.0.0+git1798-df3ef2a/.git/packed-refs --- solvespace-3.0.0+git1793-2cd0ee4/.git/packed-refs 2021-08-08 05:38:23.002669600 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/packed-refs 2021-11-03 19:08:59.505634300 +0000 @@ -1,18 +1,14 @@ # pack-refs with: peeled fully-peeled sorted -1b8e1dec652eef7916a94b6c9db404457dacb0db refs/heads/master b1d87bf284b32e875c8edba592113e691ea10bcd refs/remotes/origin/2.x aa29dbfbfdde6e9497befdc8e4209223add8305c refs/remotes/origin/eigen_over_master 4d7145a763e5c4198b7a348dbbd2f93ab701b8bf refs/remotes/origin/emscripten 4e823477a6b9f3b1e953a4ebda18cfe91101e254 refs/remotes/origin/fix-macos-leak -1b8e1dec652eef7916a94b6c9db404457dacb0db refs/remotes/origin/master -a02330a700db16a7efdba50a35bec8370cf7b6c0 refs/remotes/origin/readme-badges +eb17248bd5180ad7b121c20f2c6f775ecfcfaad4 refs/remotes/origin/master b7a605c44cbc3bbe5d396c88ebe9c8cdf3161f90 refs/remotes/origin/single-window 7e64c405dd3ae0322c115ced6e910e349583c85f refs/remotes/origin/solver -945c1e74fc8dec29231cee7b4097e43fd5e383d6 refs/remotes/origin/swap-vertical-horizontal-constraints 0e0b0252e23dd5bd4ae82ababcc54c44aee036d6 refs/remotes/origin/version3 9e34d310d1a87f1348fa7d596940cf4c37693688 refs/remotes/origin/wip -68ca7e82a538594f7b2a572139acfe03b32b0344 refs/remotes/origin/wip-intersection -bdd2be60412914ad434e132b41a3b41230257d0a refs/tags/edge +2a722c16b810f9de3ca1d4fa6f4ecaf7761f59e2 refs/tags/edge 37fd44ae288e339a86b155f596e7a88473037a38 refs/tags/v2.0 ^defeb6411a748a783337edc3cc8a201ab14da780 d5ec13e9e6268d7df979fa883f4441e068fc9d64 refs/tags/v2.1 @@ -23,7 +19,8 @@ ^c4ad073d1b3d3fcd81b34cbe5f2352547b14213f 8a566b0fce62282446aa07bd5e9691054350f06e refs/tags/v2.3 ^7c1ca460769fc8cbef26d296338d4bbc6f2ef6d0 -0e0b0252e23dd5bd4ae82ababcc54c44aee036d6 refs/tags/v3.0 +d69d356cada7fb391f0e3f28cf632f0db5c81a2b refs/tags/v3.0 +^0e0b0252e23dd5bd4ae82ababcc54c44aee036d6 ee8e2202fe4de3ce6347b5596edc6080f288576a refs/tags/v3.0.rc1 ^bcb8cd2c03259f382cd15d6a4497b3fa7a8ebba6 36719c62345ec1dd35400aa8e4fd7ecda3f6140e refs/tags/v3.0.rc2 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/refs/heads/master solvespace-3.0.0+git1798-df3ef2a/.git/refs/heads/master --- solvespace-3.0.0+git1793-2cd0ee4/.git/refs/heads/master 2021-10-11 19:03:41.308999800 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/refs/heads/master 2021-11-05 17:27:03.697049000 +0000 @@ -1 +1 @@ -2cd0ee4b3352c8fb68921399790d0545ad9b26bf +df3ef2ab0e805b3500803607aa33e8152f11b048 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.git/refs/remotes/origin/master solvespace-3.0.0+git1798-df3ef2a/.git/refs/remotes/origin/master --- solvespace-3.0.0+git1793-2cd0ee4/.git/refs/remotes/origin/master 2021-10-11 19:03:41.205666300 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.git/refs/remotes/origin/master 2021-11-05 17:27:03.517049600 +0000 @@ -1 +1 @@ -2cd0ee4b3352c8fb68921399790d0545ad9b26bf +df3ef2ab0e805b3500803607aa33e8152f11b048 diff -Nru solvespace-3.0.0+git1793-2cd0ee4/.github/workflows/cd.yml solvespace-3.0.0+git1798-df3ef2a/.github/workflows/cd.yml --- solvespace-3.0.0+git1793-2cd0ee4/.github/workflows/cd.yml 2021-09-04 21:52:03.176579500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/.github/workflows/cd.yml 2021-11-03 19:08:59.515634300 +0000 @@ -176,40 +176,10 @@ snap: ${{ steps.build.outputs.snap }} release: edge,beta - update_edge_release: - name: Update Edge Release - needs: [build_release_windows, build_release_windows_openmp, build_release_macos] - if: github.event_name == 'push' && !cancelled() - runs-on: ubuntu-latest - outputs: - upload_url: ${{ steps.create_release.outputs.upload_url }} - steps: - - name: Delete Old Edge Release - uses: dev-drprasad/delete-tag-and-release@v0.2.0 - with: - delete_release: true - tag_name: edge - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Wait - shell: bash - run: sleep 60 - - name: Create New Edge Release - id: create_release - uses: softprops/action-gh-release@35d938cf01f60fbe522917c81be1e892074f6ad6 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: edge - name: Edge - prerelease: true - draft: false - body: ${{ github.event.head_commit.message }} - upload_release_assets: name: Upload Release Assets - needs: [build_release_windows, build_release_windows_openmp, build_release_macos, update_edge_release] - if: "!cancelled()" + needs: [build_release_windows, build_release_windows_openmp, build_release_macos] + if: "!cancelled() && github.event_name == 'release'" runs-on: ubuntu-latest steps: - name: Download All Workflow Artifacts @@ -217,15 +187,9 @@ - name: Get Release Upload URL id: get_upload_url env: - event_name: ${{ github.event_name }} event: ${{ toJson(github.event) }} - edge_upload_url: ${{ needs.update_edge_release.outputs.upload_url }} run: | - if [ "$event_name" = "release" ]; then - upload_url=$(echo "$event" | jq -r ".release.upload_url") - else - upload_url="$edge_upload_url" - fi + upload_url=$(echo "$event" | jq -r ".release.upload_url") echo "::set-output name=upload_url::$upload_url" echo "Upload URL: $upload_url" - name: Upload solvespace.exe diff -Nru solvespace-3.0.0+git1793-2cd0ee4/README.md solvespace-3.0.0+git1798-df3ef2a/README.md --- solvespace-3.0.0+git1793-2cd0ee4/README.md 2021-09-04 21:52:03.176579500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/README.md 2021-11-03 19:08:59.515634300 +0000 @@ -61,6 +61,20 @@ [notesalexp]: https://notesalexp.org/packages/en/source/solvespace/ +### Via automated edge builds + +> :warning: **Edge builds might be unstable or contain severe bugs!** +> They are intended for experienced users to test new features or verify bugfixes. + +Cutting edge builds from the latest master commit are available as zip archives from the +following links: + +- [macOS](https://nightly.link/solvespace/solvespace/workflows/cd/master/macos.zip) +- [Windows](https://nightly.link/solvespace/solvespace/workflows/cd/master/windows.zip) +- [Windows with OpenMP enabled](https://nightly.link/solvespace/solvespace/workflows/cd/master/windows-openmp.zip) + +Extract the downloaded archive and install or execute the contained file as is appropriate for your platform. + ### Via source code See below. diff -Nru solvespace-3.0.0+git1793-2cd0ee4/src/confscreen.cpp solvespace-3.0.0+git1798-df3ef2a/src/confscreen.cpp --- solvespace-3.0.0+git1793-2cd0ee4/src/confscreen.cpp 2021-09-02 18:49:07.673129000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/src/confscreen.cpp 2021-11-03 19:08:59.535634300 +0000 @@ -161,6 +161,11 @@ buf += SS.MmToString(SS.gCode.depth, true); break; + case 'h': + SS.TW.edit.meaning = Edit::G_CODE_SAFE_HEIGHT; + buf += SS.MmToString(SS.gCode.safeHeight, true); + break; + case 's': SS.TW.edit.meaning = Edit::G_CODE_PASSES; buf += std::to_string(SS.gCode.passes); @@ -492,6 +497,11 @@ if(e) SS.gCode.depth = (float)SS.ExprToMm(e); break; } + case Edit::G_CODE_SAFE_HEIGHT: { + Expr *e = Expr::From(s, /*popUpError=*/true); + if(e) SS.gCode.safeHeight = (float)SS.ExprToMm(e); + break; + } case Edit::G_CODE_PASSES: { Expr *e = Expr::From(s, /*popUpError=*/true); if(e) SS.gCode.passes = (int)(e->Eval()); diff -Nru solvespace-3.0.0+git1793-2cd0ee4/src/exportvector.cpp solvespace-3.0.0+git1798-df3ef2a/src/exportvector.cpp --- solvespace-3.0.0+git1793-2cd0ee4/src/exportvector.cpp 2021-05-14 20:28:55.238902600 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/src/exportvector.cpp 2021-11-03 19:08:59.535634300 +0000 @@ -1102,7 +1102,7 @@ fprintf(f, "stroke-dasharray:%s;\r\n", patternStr.c_str()); } if(s->filled) { - fprintf(f, "fill:#%02x%02x%02x;\r\n", fillRgb.red, fillRgb.green, fillRgb.blue); + fprintf(f, "fill:#%02x%02x%02x;\r\n", fillRgb.red, fillRgb.green, fillRgb.blue); } else { fprintf(f, "fill:none;\r\n"); @@ -1308,9 +1308,9 @@ SS.MmToString(pt->p.x).c_str(), SS.MmToString(pt->p.y).c_str(), SS.MmToString(SS.gCode.feed).c_str()); } - // Move up to a clearance plane 5mm above the work. + // Move up to a clearance plane above the work. fprintf(f, "G00 Z%s\r\n", - SS.MmToString(SS.gCode.depth < 0 ? +5 : -5).c_str()); + SS.MmToString(SS.gCode.safeHeight).c_str()); } } diff -Nru solvespace-3.0.0+git1793-2cd0ee4/src/graphicswin.cpp solvespace-3.0.0+git1798-df3ef2a/src/graphicswin.cpp --- solvespace-3.0.0+git1793-2cd0ee4/src/graphicswin.cpp 2021-08-17 20:59:26.499472000 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/src/graphicswin.cpp 2021-11-05 17:27:03.687049000 +0000 @@ -430,7 +430,7 @@ using namespace std::placeholders; // Do this first, so that if it causes an onRender event we don't try to paint without // a canvas. - window->SetMinContentSize(720, 670); + window->SetMinContentSize(720, /*ToolbarDrawOrHitTest 636*/ 32 * 18 + 3 * 16 + 8 + 4); window->onClose = std::bind(&SolveSpaceUI::MenuFile, Command::EXIT); window->onRender = std::bind(&GraphicsWindow::Paint, this); window->onKeyboardEvent = std::bind(&GraphicsWindow::KeyboardEvent, this, _1); diff -Nru solvespace-3.0.0+git1793-2cd0ee4/src/platform/guigtk.cpp solvespace-3.0.0+git1798-df3ef2a/src/platform/guigtk.cpp --- solvespace-3.0.0+git1793-2cd0ee4/src/platform/guigtk.cpp 2021-05-14 20:28:55.242902500 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/src/platform/guigtk.cpp 2021-11-03 19:08:59.545634000 +0000 @@ -33,7 +33,13 @@ #if defined(HAVE_SPACEWARE) # include -# include +# include +# if defined(GDK_WINDOWING_X11) +# include +# endif +# if defined(GDK_WINDOWING_WAYLAND) +# include +# endif # if GTK_CHECK_VERSION(3, 20, 0) # include # else @@ -1047,7 +1053,7 @@ void Open3DConnexion() {} void Close3DConnexion() {} -#if defined(HAVE_SPACEWARE) && defined(GDK_WINDOWING_X11) +#if defined(HAVE_SPACEWARE) && (defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WAYLAND)) static void ProcessSpnavEvent(WindowImplGtk *window, const spnav_event &spnavEvent, bool shiftDown, bool controlDown) { switch(spnavEvent.type) { case SPNAV_EVENT_MOTION: { @@ -1129,17 +1135,26 @@ std::static_pointer_cast(window); Glib::RefPtr gdkWindow = windowImpl->gtkWindow.get_window(); - if(!GDK_IS_X11_DISPLAY(gdkWindow->get_display()->gobj())) { - return; +#if defined(GDK_WINDOWING_X11) + if(GDK_IS_X11_DISPLAY(gdkWindow->get_display()->gobj())) { + if(spnav_x11_open(gdk_x11_get_default_xdisplay(), + gdk_x11_window_get_xid(gdkWindow->gobj())) != -1) { + gdkWindow->add_filter(GdkSpnavFilter, windowImpl.get()); + } else if(spnav_open() != -1) { + g_io_add_watch(g_io_channel_unix_new(spnav_fd()), G_IO_IN, + ConsumeSpnavQueue, windowImpl.get()); + } } - - if(spnav_x11_open(gdk_x11_get_default_xdisplay(), - gdk_x11_window_get_xid(gdkWindow->gobj())) != -1) { - gdkWindow->add_filter(GdkSpnavFilter, windowImpl.get()); - } else if(spnav_open() != -1) { - g_io_add_watch(g_io_channel_unix_new(spnav_fd()), G_IO_IN, - ConsumeSpnavQueue, windowImpl.get()); +#endif +#if defined(GDK_WINDOWING_WAYLAND) + if(GDK_IS_WAYLAND_DISPLAY(gdkWindow->get_display()->gobj())) { + if(spnav_open() != -1) { + g_io_add_watch(g_io_channel_unix_new(spnav_fd()), G_IO_IN, + ConsumeSpnavQueue, windowImpl.get()); + } } +#endif + } #else void Request3DConnexionEventsForWindow(WindowRef window) {} diff -Nru solvespace-3.0.0+git1793-2cd0ee4/src/solvespace.cpp solvespace-3.0.0+git1798-df3ef2a/src/solvespace.cpp --- solvespace-3.0.0+git1793-2cd0ee4/src/solvespace.cpp 2021-08-17 20:59:26.502805200 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/src/solvespace.cpp 2021-11-03 19:08:59.545634000 +0000 @@ -105,6 +105,7 @@ exportCanvas.dy = settings->ThawFloat("ExportCanvas_Dy", 5.0); // Extra parameters when exporting G code gCode.depth = settings->ThawFloat("GCode_Depth", 10.0); + gCode.safeHeight = settings->ThawFloat("GCode_SafeHeight", 5.0); gCode.passes = settings->ThawInt("GCode_Passes", 1); gCode.feed = settings->ThawFloat("GCode_Feed", 10.0); gCode.plungeFeed = settings->ThawFloat("GCode_PlungeFeed", 10.0); @@ -413,7 +414,7 @@ default: dbp ("dimensions over 3 not supported"); break; - } + } return {0, "m"}; } static std::pair SelectSIPrefixInch(int deg) { diff -Nru solvespace-3.0.0+git1793-2cd0ee4/src/solvespace.h solvespace-3.0.0+git1798-df3ef2a/src/solvespace.h --- solvespace-3.0.0+git1793-2cd0ee4/src/solvespace.h 2021-08-17 20:59:26.502805200 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/src/solvespace.h 2021-11-03 19:08:59.545634000 +0000 @@ -598,6 +598,7 @@ } exportCanvas; struct { double depth; + double safeHeight; int passes; double feed; double plungeFeed; diff -Nru solvespace-3.0.0+git1793-2cd0ee4/src/toolbar.cpp solvespace-3.0.0+git1798-df3ef2a/src/toolbar.cpp --- solvespace-3.0.0+git1793-2cd0ee4/src/toolbar.cpp 2021-01-11 15:18:40.628309200 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/src/toolbar.cpp 2021-11-05 17:27:03.687049000 +0000 @@ -153,11 +153,18 @@ double width, height; window->GetContentSize(&width, &height); - int x = 17, y = (int)(height - 52); + int x = 17, y = (int)(height - 21); // 20 is the menu bar height - // When changing these values, also change the asReference drawing code in drawentity.cpp. + // When changing these values, also change the asReference drawing code in drawentity.cpp + // as well as the "window->SetMinContentSize(720, 636);" in graphicswin.cpp int fudge = 8; - int h = 32*18 + 3*16 + fudge; + int h = 32*18 + 3*16 + fudge; // Toolbar height = 18 icons * 32 pixels + 3 dividers * 16 pixels + fudge + + if(h < y) { + // If there is enough vertical space leave up to 32 pixels between the menu bar and the toolbar. + y -= ((y - h) < 32) ? y - h : 32; + } + int aleft = 0, aright = 66, atop = y+16+fudge/2, abot = y+16-h; bool withinToolbar = diff -Nru solvespace-3.0.0+git1793-2cd0ee4/src/ui.h solvespace-3.0.0+git1798-df3ef2a/src/ui.h --- solvespace-3.0.0+git1793-2cd0ee4/src/ui.h 2021-08-17 20:59:26.502805200 +0000 +++ solvespace-3.0.0+git1798-df3ef2a/src/ui.h 2021-11-03 19:08:59.545634000 +0000 @@ -314,13 +314,14 @@ EXPORT_OFFSET = 110, CANVAS_SIZE = 111, G_CODE_DEPTH = 112, - G_CODE_PASSES = 113, - G_CODE_FEED = 114, - G_CODE_PLUNGE_FEED = 115, - AUTOSAVE_INTERVAL = 116, - LIGHT_AMBIENT = 117, - FIND_CONSTRAINT_TIMEOUT = 118, - EXPLODE_DISTANCE = 119, + G_CODE_SAFE_HEIGHT = 113, + G_CODE_PASSES = 114, + G_CODE_FEED = 115, + G_CODE_PLUNGE_FEED = 116, + AUTOSAVE_INTERVAL = 117, + LIGHT_AMBIENT = 118, + FIND_CONSTRAINT_TIMEOUT = 119, + EXPLODE_DISTANCE = 120, // For TTF text TTF_TEXT = 300, // For the step dimension screen