<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a6fcf7d0a44d5e0e833bd19254deb20995cebbeb">https://github.com/macports/macports-ports/commit/a6fcf7d0a44d5e0e833bd19254deb20995cebbeb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a6fcf7d0a44d5e0e833bd19254deb20995cebbeb
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Jan 31 05:35:29 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> watchman: try updating to 2023.01.30.00
</span>---
sysutils/watchman/Portfile | 16 +-
...-move.diff => 0001-revert-optionset-move.patch} | 177 ++++++++++++++-------
.../files/0002-cmake-rust-build-target.patch | 34 ++++
.../watchman/files/cmake-rust-build-target.diff | 20 ---
4 files changed, 165 insertions(+), 82 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/Portfile b/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c54d131154c..569e31f7de4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,16 +7,16 @@ PortGroup boost 1.0
</span> PortGroup rust 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup facebook watchman 2022.08.22.00 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup facebook watchman 2023.01.30.00 v
</span> revision 0
categories sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {danchr @danchr} openmaintainer
license Apache-2
description watches files and takes action when they change
long_description ${description}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs arm64 x86_64
</span>
set port_libfmt libfmt9
cmake.module_path-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +43,9 @@ configure.env-append \
</span> YARN_PATH=${prefix}/bin/yarn \
DESTDIR=${destroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles cmake-rust-build-target.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revert-optionset-move.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-revert-optionset-move.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-cmake-rust-build-target.patch
</span>
post-patch {
reinplace "s,/usr/bin,${prefix}," CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,10 +70,9 @@ compiler.cxx_standard \
</span> 2017
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ccdc1f38d6a6d68c9bea0ef76267893ddec901ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2a500e68317953b882276a979a3205c08a348c8910b9e33a4bcf606d0ab580f7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3785713
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1232b1beaea84798f925190212bfbd641646e979 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5b8fb29a92fd3428e90bf330792311191455779175a1f3b7365e165541c7f6b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3810912
</span>
cargo.crates \
ahash 0.3.8 e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/files/revert-optionset-move.diff b/sysutils/watchman/files/0001-revert-optionset-move.patch
</span>similarity index 74%
rename from sysutils/watchman/files/revert-optionset-move.diff
rename to sysutils/watchman/files/0001-revert-optionset-move.patch
<span style='display:block; white-space:pre;color:#808080;'>index 7fc73ed8c36..fc71065596d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/watchman/files/revert-optionset-move.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watchman/files/0001-revert-optionset-move.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -342,10 +342,10 @@ find_package(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c92684a617284e628ad2c748051b1fbdc2ea0755 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 31 Jan 2023 02:45:22 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] revert optionset move
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 9 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build/fbcode_builder/manifests/watchman | 4 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ watchman/Client.cpp | 23 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ watchman/Client.h | 22 ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ watchman/CommandRegistry.h | 4 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ watchman/OptionSet.h | 207 ++++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ watchman/PendingCollection.h | 4 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ watchman/cmds/debug.cpp | 40 +----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ watchman/test/OptionSetTest.cpp | 90 +++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 9 files changed, 308 insertions(+), 95 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create mode 100644 watchman/OptionSet.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create mode 100644 watchman/test/OptionSetTest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 850ebdc4d..97671a487 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -342,7 +342,6 @@ find_package(
</span> find_package(LibEvent REQUIRED)
get_filename_component(LIBEVENT_LIBDIR "${LIBEVENT_LIB}" DIRECTORY)
link_directories(${LIBEVENT_LIBDIR})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,11 +29,15 @@ diff --git CMakeLists.txt CMakeLists.txt
</span> find_package(fmt CONFIG REQUIRED)
find_package(folly CONFIG REQUIRED)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ENABLE_EDEN_SUPPORT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(fizz CONFIG REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(wangle CONFIG REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -450,7 +450,6 @@ target_link_libraries(third_party_deps I
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -352,6 +351,7 @@ if (ENABLE_EDEN_SUPPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(FBThrift CONFIG REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(fb303 CONFIG REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(cpptoml CONFIG REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(edencommon CONFIG REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(${FB303_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(DEFINED ENV{NODE_BIN})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -455,7 +455,6 @@ target_link_libraries(third_party_deps INTERFACE
</span> gflags
${Boost_LIBRARIES}
fmt::fmt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +45,22 @@ diff --git CMakeLists.txt CMakeLists.txt
</span> )
target_include_directories(third_party_deps INTERFACE
${FOLLY_INCLUDE_DIR}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -773,6 +772,7 @@ t_test(ignore watchman/test/BserTest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -464,12 +463,11 @@ target_include_directories(third_party_deps INTERFACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ENABLE_EDEN_SUPPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- third_party_deps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INTERFACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(third_party_deps INTERFACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${YARPL_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FBThrift::thriftcpp2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpptoml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ edencommon::edencommon_utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(PCRE2_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -774,6 +772,7 @@ t_test(ignore watchman/test/BserTest.cpp)
</span> #t_test(inmemoryview watchman/test/InMemoryViewTest.cpp)
t_test(log watchman/test/LogTest.cpp)
t_test(maputil watchman/test/MapUtilTest.cpp)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +68,10 @@ diff --git CMakeLists.txt CMakeLists.txt
</span> t_test(pendingcollection watchman/test/PendingCollectionTest.cpp)
# Linking this test needs the targets graph to be cleaned up.
#t_test(perfsample watchman/test/PerfSampleTest.cpp)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git build/fbcode_builder/manifests/watchman build/fbcode_builder/manifests/watchman
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/fbcode_builder/manifests/watchman
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/fbcode_builder/manifests/watchman
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/build/fbcode_builder/manifests/watchman b/build/fbcode_builder/manifests/watchman
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b733a0c09..d50eafd45 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/build/fbcode_builder/manifests/watchman
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/build/fbcode_builder/manifests/watchman
</span> @@ -13,7 +13,6 @@ builder = cmake
[dependencies]
boost
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +80,25 @@ diff --git build/fbcode_builder/manifests/watchman build/fbcode_builder/manifest
</span> fb303
fbthrift
folly
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git watchman/Client.cpp watchman/Client.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- watchman/Client.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ watchman/Client.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,13 +25,12 @@ rust
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [shipit.pathmap]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fbcode/watchman = watchman
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fbcode/watchman/oss = .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fbcode/eden/fs = eden/fs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [shipit.strip]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^fbcode/eden/fs/(?!.*\.thrift|service/shipit_test_file\.txt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [cmake.defines.fb=on]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENABLE_EDEN_SUPPORT=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ENABLE_EDEN_SUPPORT=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IS_FB_BUILD=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FB macos specific settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/watchman/Client.cpp b/watchman/Client.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 10ef94397..568045756 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/watchman/Client.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/watchman/Client.cpp
</span> @@ -23,17 +23,6 @@ namespace watchman {
namespace {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +117,7 @@ diff --git watchman/Client.cpp watchman/Client.cpp
</span> constexpr size_t kResponseLogLimit = 0;
folly::Synchronized<std::unordered_set<UserClient*>> clients;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -220,10 +209,7 @@ void UserClient::create(std::unique_ptr<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -220,10 +209,7 @@ void UserClient::create(std::unique_ptr<watchman_stream> stm) {
</span> }
UserClient::UserClient(PrivateBadge, std::unique_ptr<watchman_stream> stm)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +129,7 @@ diff --git watchman/Client.cpp watchman/Client.cpp
</span> clients.wlock()->insert(this);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -260,13 +246,6 @@ std::vector<ClientDebugStatus> UserClien
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,13 +246,6 @@ std::vector<ClientDebugStatus> UserClient::getStatusForAllClients() {
</span> ClientDebugStatus UserClient::getDebugStatus() const {
ClientDebugStatus rv;
rv.state = status_.getName();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,25 +143,22 @@ diff --git watchman/Client.cpp watchman/Client.cpp
</span> return rv;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git watchman/Client.h watchman/Client.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- watchman/Client.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ watchman/Client.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,14 +6,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/watchman/Client.h b/watchman/Client.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index da19a9670..70fcad348 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/watchman/Client.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/watchman/Client.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,10 +7,7 @@
</span>
#pragma once
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -#include <eden/common/utils/ProcessNameCache.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fmt/format.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fmt/core.h>
</span> -
-#include <chrono>
#include <deque>
#include <unordered_map>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "watchman/Clock.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "watchman/CommandRegistry.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "watchman/Logging.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,27 +154,12 @@ class ClientStatus {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,27 +156,12 @@ class ClientStatus {
</span> std::atomic<State> state_{THREAD_STARTING};
};
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +186,7 @@ diff --git watchman/Client.h watchman/Client.h
</span> }
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -234,10 +214,6 @@ class UserClient final : public Client {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -234,10 +216,6 @@ class UserClient final : public Client {
</span>
void clientThread() noexcept;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,9 +197,10 @@ diff --git watchman/Client.h watchman/Client.h
</span> ClientStatus status_;
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git watchman/CommandRegistry.h watchman/CommandRegistry.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- watchman/CommandRegistry.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ watchman/CommandRegistry.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/watchman/CommandRegistry.h b/watchman/CommandRegistry.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e0915449f..465a2c4ca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/watchman/CommandRegistry.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/watchman/CommandRegistry.h
</span> @@ -12,7 +12,7 @@
// TODO: We could avoid the Client dependency fi CommandHandler returned a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,16 +219,17 @@ diff --git watchman/CommandRegistry.h watchman/CommandRegistry.h
</span>
inline constexpr auto CMD_DAEMON = CommandFlags::raw(1);
inline constexpr auto CMD_CLIENT = CommandFlags::raw(2);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git watchman/OptionSet.h watchman/OptionSet.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/watchman/OptionSet.h b/watchman/OptionSet.h
</span> new file mode 100644
<span style='display:block; white-space:pre;background:#e0ffe0;'>+index 000000000..976f128ad
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ watchman/OptionSet.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/watchman/OptionSet.h
</span> @@ -0,0 +1,207 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This source code is licensed under the MIT license found in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * LICENSE file in the root directory of this source tree.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This source code is licensed under the MIT license found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * in the LICENSE file in the root directory of this source tree.
</span> + */
+
+#pragma once
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -377,9 +432,10 @@ new file mode 100644
</span> +};
+
+} // namespace watchman
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git watchman/PendingCollection.h watchman/PendingCollection.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- watchman/PendingCollection.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ watchman/PendingCollection.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/watchman/PendingCollection.h b/watchman/PendingCollection.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2dd43af8f..47617cd58 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/watchman/PendingCollection.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/watchman/PendingCollection.h
</span> @@ -11,7 +11,7 @@
#include <folly/futures/Promise.h>
#include <chrono>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -398,21 +454,23 @@ diff --git watchman/PendingCollection.h watchman/PendingCollection.h
</span> using OptionSet::OptionSet;
static const NameTable table;
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git watchman/cmds/debug.cpp watchman/cmds/debug.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- watchman/cmds/debug.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ watchman/cmds/debug.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,10 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * LICENSE file in the root directory of this source tree.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/watchman/cmds/debug.cpp b/watchman/cmds/debug.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9042616b1..e5e39e641 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/watchman/cmds/debug.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/watchman/cmds/debug.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,11 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unordered_map>
</span>
-#include <fmt/chrono.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -#include <folly/String.h>
#include <folly/chrono/Conv.h>
-#include <folly/system/Shell.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unordered_map>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #include "watchman/Client.h"
#include "watchman/InMemoryView.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -260,28 +257,6 @@ W_CMD_REG(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -263,28 +259,6 @@ W_CMD_REG(
</span> CMD_DAEMON,
w_cmd_realpath_root);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,7 +499,7 @@ diff --git watchman/cmds/debug.cpp watchman/cmds/debug.cpp
</span> struct DebugStatusCommand : PrettyCommand<DebugStatusCommand> {
static constexpr std::string_view name = "debug-status";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -328,19 +303,7 @@ struct DebugStatusCommand : PrettyComman
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -331,25 +305,13 @@ struct DebugStatusCommand : PrettyCommand<DebugStatusCommand> {
</span>
fmt::print("CLIENTS\n-------\n");
for (auto& client : response.clients) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -459,18 +517,26 @@ diff --git watchman/cmds/debug.cpp watchman/cmds/debug.cpp
</span> fmt::print(" - state: {}\n", client.state);
- fmt::print("\n");
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ // fmt does not flush, so when the stream is not line buffered the stream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // needs to be manually flushed (or else nothing is written to stdout).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // eventually this can be fmt::flush instead:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // https://github.com/vgc/vgc/issues/519
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // TODO(T136788014): why doesn't macOS do this for us.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // TODO (T136788014): why doesn't macOS do this for us.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fflush(stdout);
</span> }
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git watchman/test/OptionSetTest.cpp watchman/test/OptionSetTest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/watchman/test/OptionSetTest.cpp b/watchman/test/OptionSetTest.cpp
</span> new file mode 100644
<span style='display:block; white-space:pre;background:#e0ffe0;'>+index 000000000..ede31d735
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ watchman/test/OptionSetTest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/watchman/test/OptionSetTest.cpp
</span> @@ -0,0 +1,90 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This source code is licensed under the MIT license found in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * LICENSE file in the root directory of this source tree.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This source code is licensed under the MIT license found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * in the LICENSE file in the root directory of this source tree.
</span> + */
+
+#include "watchman/OptionSet.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -556,3 +622,6 @@ new file mode 100644
</span> + EXPECT_FALSE((CM_RED | CM_GREEN).containsNoneOf(CM_GREEN | CM_BLUE));
+ EXPECT_TRUE(CM_RED.containsNoneOf(CM_GREEN | CM_BLUE));
+}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.39.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/files/0002-cmake-rust-build-target.patch b/sysutils/watchman/files/0002-cmake-rust-build-target.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..16b67c63146
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watchman/files/0002-cmake-rust-build-target.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 17b3ee2f7d91606d601efd01b036bd57ef0a1e18 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 31 Jan 2023 03:06:43 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] cmake-rust-build-target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build/fbcode_builder/CMake/RustStaticLibrary.cmake | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/build/fbcode_builder/CMake/RustStaticLibrary.cmake b/build/fbcode_builder/CMake/RustStaticLibrary.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index dd57b2b3d..41fec49ae 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/build/fbcode_builder/CMake/RustStaticLibrary.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/build/fbcode_builder/CMake/RustStaticLibrary.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,7 +117,7 @@ function(rust_static_library TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(cargo_target "${TARGET}.cargo")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(target_dir $<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(target_dir $ENV{CARGO_BUILD_TARGET}/$<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(staticlib_name "${CMAKE_STATIC_LIBRARY_PREFIX}${crate_name}${CMAKE_STATIC_LIBRARY_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(rust_staticlib "${CMAKE_CURRENT_BINARY_DIR}/${target_dir}/${staticlib_name}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,7 +179,7 @@ function(rust_executable TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(crate_name "${TARGET}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(cargo_target "${TARGET}.cargo")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(target_dir $<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(target_dir $ENV{CARGO_BUILD_TARGET}/$<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(DEFINED ARG_BINARY_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(executable_name "${ARG_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.39.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/files/cmake-rust-build-target.diff b/sysutils/watchman/files/cmake-rust-build-target.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e8a7e6090cc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/watchman/files/cmake-rust-build-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/fbcode_builder/CMake/RustStaticLibrary.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ #<buffer RustStaticLibrary.cmake>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,7 +97,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(cargo_target "${TARGET}.cargo")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(target_dir $<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(target_dir $ENV{CARGO_BUILD_TARGET}/$<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(staticlib_name "${CMAKE_STATIC_LIBRARY_PREFIX}${crate_name}${CMAKE_STATIC_LIBRARY_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(rust_staticlib "${CMAKE_CURRENT_BINARY_DIR}/${target_dir}/${staticlib_name}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,7 +158,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(crate_name "${TARGET}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(cargo_target "${TARGET}.cargo")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(target_dir $<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(target_dir $ENV{CARGO_BUILD_TARGET}/$<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(DEFINED ARG_BINARY_NAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(executable_name "${ARG_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
</span></pre><pre style='margin:0'>
</pre>