diff options
| author | jade <lix@jade.fyi> | 2024-05-30 02:33:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix-systems> | 2024-05-30 02:33:05 +0000 |
| commit | 562ff516ab27b8e98490646dd30ac96e7e2c36bb (patch) | |
| tree | 1798a20b33da0101bd91acf7da26c891f0cda620 /src/libfetchers | |
| parent | c71f21da3ac4d95ef9a42a26416ccee71639dbd6 (diff) | |
| parent | a39ba22ff7112cd3984bbf28d8610d84dd525a0f (diff) | |
Merge changes from topic "libutil-split" into main
* changes:
util.hh: Delete remaining file and clean up headers
util.hh: Move nativeSystem to local-derivation-goal.cc
util.hh: Move stuff to types.hh
util.cc: Delete remaining file
util.{hh,cc}: Move ignoreException to error.{hh,cc}
util.{hh,cc}: Split out namespaces.{hh,cc}
util.{hh,cc}: Split out users.{hh,cc}
util.{hh,cc}: Split out strings.{hh,cc}
util.{hh,cc}: Split out unix-domain-socket.{hh,cc}
util.{hh,cc}: Split out child.{hh,cc}
util.{hh,cc}: Split out current-process.{hh,cc}
util.{hh,cc}: Split out processes.{hh,cc}
util.{hh,cc}: Split out file-descriptor.{hh,cc}
util.{hh,cc}: Split out file-system.{hh,cc}
util.{hh,cc}: Split out terminal.{hh,cc}
util.{hh,cc}: Split out environment-variables.{hh,cc}
Diffstat (limited to 'src/libfetchers')
| -rw-r--r-- | src/libfetchers/cache.cc | 1 | ||||
| -rw-r--r-- | src/libfetchers/fetch-settings.hh | 1 | ||||
| -rw-r--r-- | src/libfetchers/fetch-to-store.hh | 1 | ||||
| -rw-r--r-- | src/libfetchers/git.cc | 3 | ||||
| -rw-r--r-- | src/libfetchers/mercurial.cc | 4 | ||||
| -rw-r--r-- | src/libfetchers/registry.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/libfetchers/cache.cc b/src/libfetchers/cache.cc index 672e1e0bc..eec77c2dc 100644 --- a/src/libfetchers/cache.cc +++ b/src/libfetchers/cache.cc @@ -2,6 +2,7 @@ #include "sqlite.hh" #include "sync.hh" #include "store-api.hh" +#include "users.hh" #include <nlohmann/json.hpp> diff --git a/src/libfetchers/fetch-settings.hh b/src/libfetchers/fetch-settings.hh index c67a75082..2dc2834fb 100644 --- a/src/libfetchers/fetch-settings.hh +++ b/src/libfetchers/fetch-settings.hh @@ -3,7 +3,6 @@ #include "types.hh" #include "config.hh" -#include "util.hh" #include <map> #include <limits> diff --git a/src/libfetchers/fetch-to-store.hh b/src/libfetchers/fetch-to-store.hh index 717450944..b74879637 100644 --- a/src/libfetchers/fetch-to-store.hh +++ b/src/libfetchers/fetch-to-store.hh @@ -3,7 +3,6 @@ #include "source-path.hh" #include "store-api.hh" -#include "util.hh" #include "repair-flag.hh" #include "content-address.hh" diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc index 4d4bf6cd6..07cbc781c 100644 --- a/src/libfetchers/git.cc +++ b/src/libfetchers/git.cc @@ -1,11 +1,12 @@ #include "fetchers.hh" #include "cache.hh" #include "globals.hh" +#include "processes.hh" #include "tarfile.hh" #include "store-api.hh" #include "url-parts.hh" #include "pathlocks.hh" -#include "util.hh" +#include "users.hh" #include "git.hh" #include "logging.hh" #include "finally.hh" diff --git a/src/libfetchers/mercurial.cc b/src/libfetchers/mercurial.cc index 87fecfca3..4fffa71d3 100644 --- a/src/libfetchers/mercurial.cc +++ b/src/libfetchers/mercurial.cc @@ -1,9 +1,9 @@ #include "fetchers.hh" #include "cache.hh" -#include "globals.hh" -#include "tarfile.hh" +#include "processes.hh" #include "store-api.hh" #include "url-parts.hh" +#include "users.hh" #include "fetch-settings.hh" diff --git a/src/libfetchers/registry.cc b/src/libfetchers/registry.cc index 4b2d61f52..96e9ed1c6 100644 --- a/src/libfetchers/registry.cc +++ b/src/libfetchers/registry.cc @@ -1,6 +1,6 @@ #include "registry.hh" #include "fetchers.hh" -#include "util.hh" +#include "users.hh" #include "globals.hh" #include "store-api.hh" #include "local-fs-store.hh" |