Skip to content

Commit

Permalink
remove generated thrift code (facebook#26)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: facebookexperimental/rust-shed#26

Pull Request resolved: facebook#104

No need for the checked in generated code anymore

Reviewed By: chadaustin, mitrandir77

Differential Revision: D33840545

fbshipit-source-id: 38d5e2f310ad4e96cea58d02a4b2fb74a274b7ed
  • Loading branch information
ahornby authored and facebook-github-bot committed Feb 9, 2022
1 parent 20a78c4 commit 0147deb
Show file tree
Hide file tree
Showing 109 changed files with 2,100 additions and 32,894 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/edenscm_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ jobs:
- uses: actions/checkout@v2
- name: Install system deps
run: sudo python3 build/fbcode_builder/getdeps.py --allow-system-packages install-system-deps --recursive eden_scm
- name: Fetch fb303-source
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fb303-source
- name: Fetch fbthrift-source
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fbthrift-source
- name: Install Rust Stable
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -83,10 +79,6 @@ jobs:
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests rust-shed
- name: Fetch fb303
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests fb303
- name: Build fb303-source
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fb303-source
- name: Build fbthrift-source
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests fbthrift-source
- name: Build ninja
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests ninja
- name: Build cmake
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/edenscm_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ jobs:
runs-on: macOS-latest
steps:
- uses: actions/checkout@v2
- name: Fetch fb303-source
run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fb303-source
- name: Fetch fbthrift-source
run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fbthrift-source
- name: Fetch openssl
run: python3 build/fbcode_builder/getdeps.py fetch --no-tests openssl
- name: Install Rust Stable
Expand Down Expand Up @@ -83,10 +79,6 @@ jobs:
run: python3 build/fbcode_builder/getdeps.py fetch --no-tests rust-shed
- name: Fetch fb303
run: python3 build/fbcode_builder/getdeps.py fetch --no-tests fb303
- name: Build fb303-source
run: python3 build/fbcode_builder/getdeps.py build --no-tests fb303-source
- name: Build fbthrift-source
run: python3 build/fbcode_builder/getdeps.py build --no-tests fbthrift-source
- name: Build openssl
run: python3 build/fbcode_builder/getdeps.py build --no-tests openssl
- name: Build ninja
Expand Down
6 changes: 3 additions & 3 deletions build/fbcode_builder/manifests/eden
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fbcode/tools/lfs = tools/lfs

[shipit.pathmap.fb=off]
fbcode/eden/fs/public_autocargo = eden/fs
fbcode/eden/scm/lib/public_autocargo = eden/scm/lib
fbcode/eden/scm/public_autocargo = eden/scm
fbcode/common/rust/shed/hostcaps/public_cargo = common/rust/shed/hostcaps
fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/hg

Expand All @@ -77,9 +77,9 @@ fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/h

[shipit.strip.fb=off]
^fbcode/common/rust/shed(?!/public_autocargo).*/Cargo\.toml$
^fbcode/configerator/structs/hg(?!/public_autocargo).*/Cargo\.toml$
^fbcode/configerator/structs/scm/hg(?!/public_autocargo).*/Cargo\.toml$
^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$
^fbcode/eden/scm/lib(?!/public_autocargo).*/Cargo\.toml$
^fbcode/eden/scm(?!/public_autocargo|/edenscmnative).*/Cargo\.toml$
^.*/facebook/.*$
^.*/fb/.*$

Expand Down
9 changes: 3 additions & 6 deletions build/fbcode_builder/manifests/eden_scm
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,20 @@ fbcode/eden/oss = .
fbcode/eden = eden
fbcode/eden/fs/public_autocargo = eden/fs
fbcode/eden/mononoke/public_autocargo = eden/mononoke
fbcode/eden/scm/lib/public_autocargo = eden/scm/lib
fbcode/eden/scm/public_autocargo = eden/scm
fbcode/tools/lfs = tools/lfs
# This is to pick up the fb303.thrift stubs
fbcode/fboss/common = common

[shipit.strip]
^fbcode/configerator/structs/hg(?!/public_autocargo).*/Cargo\.toml$
^fbcode/configerator/structs/scm/hg(?!/public_autocargo).*/Cargo\.toml$
^fbcode/eden/fs/eden-config\.h$
^fbcode/eden/fs/py/eden/config\.py$
^fbcode/eden/hg-server/.*$
^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$
^fbcode/eden/mononoke(?!/public_autocargo).*/Cargo\.toml$
^fbcode/eden/scm/lib(?!/public_autocargo).*/Cargo\.toml$
^fbcode/eden/scm(?!/public_autocargo|/edenscmnative).*/Cargo\.toml$
^fbcode/eden/scm/build/.*$
^fbcode/eden/scm/lib/third-party/rust/.*/Cargo.toml$
^fbcode/eden/.*/\.cargo/.*$
^.*/facebook/.*$
^.*/fb/.*$
Expand All @@ -56,8 +55,6 @@ fbcode/fboss/common = common
[dependencies]
fb303
fbthrift
fb303-source
fbthrift-source
python
rust-shed

Expand Down
114 changes: 114 additions & 0 deletions eden/scm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
[patch.crates-io]
daemonize = { git = "https://github.com/krallin/daemonize", rev = "f7be28efa1b4a70e43bb37b5f4ff4d664992edca" }
lru-disk-cache = { git = "https://github.com/mozilla/sccache", rev = "033ebaae69beeb0ac04e8c35d6ff1103487bd9a3" }
prost = { git = "https://github.com/gabrielrussoc/prost", branch = "protoc-runtime" }
prost-derive = { git = "https://github.com/gabrielrussoc/prost", branch = "protoc-runtime" }
prost-types = { git = "https://github.com/gabrielrussoc/prost", branch = "protoc-runtime" }
quickcheck = { git = "https://github.com/jakoschiko/quickcheck", rev = "6ecdf5bb4b0132ce66670b4d46453aa022ea892c" }
reqwest = { git = "https://github.com/vmagro/reqwest", rev = "b08239c2b6c837321a697c5bb2be394d276b59ca" }
rustfilt = { git = "https://github.com/jsgf/rustfilt.git", rev = "8141fa7f1caee562ee8daffb2ddeca3d1f0d36e5" }
shellexpand = { git = "https://github.com/fanzeyi/shellexpand.git", rev = "179447a3f8fccd765acfd2eed15a54c716c49cfe" }
terminfo = { git = "https://github.com/rust-terminfo/terminfo", rev = "9b4e1c6aae79644c9da7a2e312e3c10ee4759930" }
toml = { git = "https://github.com/fbsource/toml", branch = "dotted-table-0.5.8" }

[workspace]
members = [
"exec/eden_apfs_mount_helper",
"exec/fsprobe",
"exec/hgmain",
"exec/scm_daemon",
"exec/scratch",
"lib/async-runtime",
"lib/atomicfile",
"lib/auth",
"lib/backingstore",
"lib/blackbox",
"lib/blackbox/serde_alt",
"lib/cats",
"lib/checkout",
"lib/clidispatch",
"lib/clientinfo",
"lib/cliparser",
"lib/commitcloudsubscriber",
"lib/configmodel",
"lib/configparser",
"lib/cpython-async",
"lib/cpython-ext",
"lib/dag",
"lib/dag/bindag",
"lib/dag/dag-types",
"lib/dag/gitdag",
"lib/debugtop",
"lib/dev-logger",
"lib/drawdag",
"lib/eagerepo",
"lib/edenapi",
"lib/edenapi/ext",
"lib/edenapi/trait",
"lib/edenapi/types",
"lib/edenapi/types/proc_macros",
"lib/edenfs-client",
"lib/encoding",
"lib/fsinfo",
"lib/fsyncglob",
"lib/gitstore",
"lib/hg-http",
"lib/hg-metrics",
"lib/hgcommands",
"lib/hgcommits",
"lib/hgtime",
"lib/http-client",
"lib/indexedlog",
"lib/insta_ext",
"lib/io",
"lib/lz4-pyframe",
"lib/manifest",
"lib/manifest-tree",
"lib/metalog",
"lib/metrics",
"lib/metrics/render",
"lib/mincode",
"lib/minibench",
"lib/minibytes",
"lib/mpatch",
"lib/mpatch-sys",
"lib/mutationstore",
"lib/nodemap",
"lib/nonblocking",
"lib/pathhistory",
"lib/pathmatcher",
"lib/pprint",
"lib/procinfo",
"lib/progress/model",
"lib/progress/render",
"lib/radixbuf",
"lib/refencode",
"lib/renderdag",
"lib/repo",
"lib/revisionstore",
"lib/revisionstore/types",
"lib/revlogindex",
"lib/runlog",
"lib/spawn-ext",
"lib/status",
"lib/storemodel",
"lib/streams",
"lib/taggederror",
"lib/taggederror-util",
"lib/thrift-types",
"lib/tracing-analyzer",
"lib/tracing-collector",
"lib/tracing-runtime-callsite",
"lib/tracing-sampler",
"lib/treestate",
"lib/types",
"lib/util",
"lib/version",
"lib/vfs",
"lib/vlqencoding",
"lib/workingcopy",
"lib/xdiff",
"lib/xdiff-sys",
"lib/zstdelta",
"lib/zstore",
]
4 changes: 2 additions & 2 deletions eden/scm/edenscmnative/bindings/modules/pyio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ pyconfigparser = { path = "../pyconfigparser" }

[features]
default = []
python2 = ["cpython/python27-sys", "cpython_ext/python2", "clidispatch/python2"]
python3 = ["cpython/python3-sys", "cpython_ext/python3", "clidispatch/python3"]
python2 = ["cpython/python27-sys", "cpython_ext/python2"]
python3 = ["cpython/python3-sys", "cpython_ext/python3"]
22 changes: 22 additions & 0 deletions eden/scm/exec/eden_apfs_mount_helper/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# @generated by autocargo

[package]
name = "eden_apfs_mount_helper"
version = "0.1.0"
authors = ["Wez Furlong"]
edition = "2021"

[dependencies]
anyhow = "1.0.51"
libc = "0.2.98"
serde = { version = "1.0.126", features = ["derive", "rc"] }
serde_json = { version = "1.0.64", features = ["float_roundtrip", "unbounded_depth"], optional = true }
sha2 = "0.8"
structopt = "0.3.23"

[dev-dependencies]
pretty_assertions = "0.6"

[features]
default = ["json-plist"]
json-plist = ["serde_json"]
10 changes: 10 additions & 0 deletions eden/scm/exec/fsprobe/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# @generated by autocargo

[package]
name = "fsprobe"
version = "0.1.0"
edition = "2021"

[dependencies]
anyhow = "1.0.51"
structopt = "0.3.23"
34 changes: 34 additions & 0 deletions eden/scm/exec/hgmain/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# @generated by autocargo

[package]
name = "hgmain"
version = "0.1.0"
edition = "2021"
build = "build.rs"

[dependencies]
clidispatch = { version = "0.1.0", path = "../../lib/clidispatch" }
cliparser = { version = "0.1.0", path = "../../lib/cliparser" }
configparser = { version = "0.1.0", path = "../../lib/configparser" }
dirs = { version = "2.0", optional = true }
encoding = { version = "0.1.0", path = "../../lib/encoding" }
hgcommands = { version = "0.1.0", path = "../../lib/hgcommands", default-features = false }
libc = "0.2.98"
pyblackbox = { path = "../../edenscmnative/bindings/modules/pyblackbox" }

[target.'cfg(target_os = "windows")'.dependencies]
anyhow = "1.0.51"
winapi = { version = "0.3", features = ["everything"] }

[features]
buildinfo = []
default = []
fb = ["hgcommands/fb"]
python2 = ["hgcommands/python2"]
python3 = ["hgcommands/python3"]
with_chg = ["dirs"]

[profile.release]
debug = true
lto = false
incremental = true
17 changes: 17 additions & 0 deletions eden/scm/exec/scm_daemon/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# @generated by autocargo

[package]
name = "scm_daemon"
version = "0.1.0"
edition = "2021"

[dependencies]
anyhow = "1.0.51"
clap = "2.33"
commitcloudsubscriber = { version = "0.1.0", path = "../../lib/commitcloudsubscriber" }
env_logger = "0.7"
libc = "0.2.98"
log = { version = "0.4.14", features = ["kv_unstable", "kv_unstable_std"] }
serde = { version = "1.0.126", features = ["derive", "rc"] }
thiserror = "1.0.29"
toml = "=0.5.8"
15 changes: 15 additions & 0 deletions eden/scm/exec/scratch/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# @generated by autocargo

[package]
name = "mkscratch"
version = "0.1.0"
authors = ["Source Control Oncall [email protected]"]
edition = "2021"

[dependencies]
anyhow = "1.0.51"
clap = "2.33"
dirs = "2.0"
libc = "0.2.98"
serde = { version = "1.0.126", features = ["derive", "rc"] }
toml = "=0.5.8"
13 changes: 13 additions & 0 deletions eden/scm/lib/async-runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# @generated by autocargo

[package]
name = "async-runtime"
version = "0.1.0"
authors = ["Facebook Source Control Team <[email protected]>"]
edition = "2021"

[dependencies]
futures = { version = "0.3.13", features = ["async-await", "compat"] }
num_cpus = "1.11"
once_cell = "1.8"
tokio = { version = "1.15", features = ["full", "test-util", "tracing"] }
10 changes: 10 additions & 0 deletions eden/scm/lib/atomicfile/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# @generated by autocargo

[package]
name = "atomicfile"
version = "0.1.0"
edition = "2021"

[dependencies]
tempfile = "3.2"
tracing = "0.1.29"
22 changes: 22 additions & 0 deletions eden/scm/lib/auth/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# @generated by autocargo

[package]
name = "auth"
version = "0.1.0"
edition = "2021"

[dependencies]
anyhow = "1.0.51"
chrono = { version = "0.4", features = ["clock", "serde", "std"], default-features = false }
configmodel = { version = "0.1.0", path = "../configmodel" }
indexmap = { version = "1.8.0", features = ["rayon", "serde-1"] }
pem = "0.8"
simple_asn1 = "0.4"
thiserror = "1.0.29"
tracing = "0.1.29"
url = "2.2.2"
util = { version = "0.1.0", path = "../util" }

[dev-dependencies]
configparser = { version = "0.1.0", path = "../configparser" }
once_cell = "1.8"
Loading

0 comments on commit 0147deb

Please sign in to comment.