This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11563

WIP working on making rust components compile on windows systems
Needs RevisionPublic

Authored by cspeckrun on Oct 2 2021, 12:29 AM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

cspeckrun created this revision.Oct 2 2021, 12:29 AM
cspeckrun updated this revision to Diff 30590.Oct 2 2021, 11:37 PM

Fix typo in unix file permission

cspeckrun added a comment.Oct 15 2021, 11:32 AM

Note that with these changes compilation still doesn’t succeed as the zstd crate runs into some linker errors (something about symbols already being defined). That’s when using msvc, I tried to get gcc on my windows system but could not get it to function properly with rust.

I was also planning to update the summary here to explain some of the changes, particularly with the crate dependency changes.

baymax requested changes to this revision.Feb 2 2022, 8:06 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Feb 2 2022, 8:06 PM

Revision Contents
Changeset List

Diff 30590

rust/Cargo.lock

# This file is automatically @generated by Cargo. # This file is automatically @generated by Cargo.
# It is not intended for manual editing. # It is not intended for manual editing.
[[package]] [[package]]
name = "adler" name = "adler"
version = "0.2.3" version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.9.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
dependencies = [ dependencies = [
"generic-array", "generic-array",
] ]
[[package]] [[package]]
name = "bumpalo"
version = "3.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538"
[[package]]
name = "byteorder" name = "byteorder"
version = "1.3.4" version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
[[package]] [[package]]
name = "bytes-cast" name = "bytes-cast"
version = "0.2.0" version = "0.2.0"
version = "0.9.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [ dependencies = [
"generic-array", "generic-array",
] ]
[[package]] [[package]]
name = "directories"
version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-sys"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
dependencies = [
"libc",
"redox_users",
"winapi",
]
[[package]]
name = "either" name = "either"
version = "1.6.1" version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]] [[package]]
name = "env_logger" name = "env_logger"
version = "0.7.1" version = "0.7.1"
checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
dependencies = [ dependencies = [
"cfg-if 0.1.10", "cfg-if 0.1.10",
"libc", "libc",
"wasi 0.9.0+wasi-snapshot-preview1", "wasi 0.9.0+wasi-snapshot-preview1",
] ]
[[package]] [[package]]
name = "getrandom"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
dependencies = [
"cfg-if 1.0.0",
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
]
[[package]]
name = "glob" name = "glob"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]] [[package]]
name = "hermit-abi" name = "hermit-abi"
version = "0.1.17" version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
dependencies = [ dependencies = [
"libc", "libc",
] ]
[[package]] [[package]]
name = "hg-core" name = "hg-core"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"bytes-cast", "bytes-cast",
"clap", "clap",
"crossbeam-channel 0.4.4", "crossbeam-channel 0.4.4",
"derive_more", "derive_more",
"directories",
"flate2", "flate2",
"format-bytes", "format-bytes",
"home",
"im-rc", "im-rc",
"itertools", "itertools",
"lazy_static", "lazy_static",
"log", "log",
"memmap2", "memmap2",
"micro-timer", "micro-timer",
"pretty_assertions", "pretty_assertions",
"rand", "rand",
"env_logger", "env_logger",
"hg-core", "hg-core",
"libc", "libc",
"log", "log",
"stable_deref_trait", "stable_deref_trait",
] ]
[[package]] [[package]]
name = "home"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
dependencies = [
"winapi",
]
[[package]]
name = "humantime" name = "humantime"
version = "1.3.0" version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
dependencies = [ dependencies = [
"quick-error", "quick-error",
] ]
version = "0.1.21" version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
dependencies = [ dependencies = [
"libc", "libc",
] ]
[[package]] [[package]]
name = "js-sys"
version = "0.3.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "lazy_static" name = "lazy_static"
version = "1.4.0" version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.81" version = "0.2.81"
] ]
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.7.3" version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
dependencies = [ dependencies = [
"getrandom", "getrandom 0.1.15",
"libc", "libc",
"rand_chacha", "rand_chacha",
"rand_core", "rand_core",
"rand_hc", "rand_hc",
] ]
[[package]] [[package]]
name = "rand_chacha" name = "rand_chacha"
version = "0.2.2" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
dependencies = [ dependencies = [
"ppv-lite86", "ppv-lite86",
"rand_core", "rand_core",
] ]
[[package]] [[package]]
name = "rand_core" name = "rand_core"
version = "0.5.1" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
dependencies = [ dependencies = [
"getrandom", "getrandom 0.1.15",
] ]
[[package]] [[package]]
name = "rand_distr" name = "rand_distr"
version = "0.2.2" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96977acbdd3a6576fb1d27391900035bf3863d4a16422973a409b488cf29ffb2" checksum = "96977acbdd3a6576fb1d27391900035bf3863d4a16422973a409b488cf29ffb2"
dependencies = [ dependencies = [
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.1.57" version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]] [[package]]
name = "redox_syscall"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
dependencies = [
"bitflags",
]
[[package]]
name = "redox_users"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
dependencies = [
"getrandom 0.2.3",
"redox_syscall 0.2.10",
]
[[package]]
name = "regex" name = "regex"
version = "1.4.2" version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
"regex-syntax", "regex-syntax",
[[package]] [[package]]
name = "rhg" name = "rhg"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",
"derive_more", "derive_more",
"directories",
"env_logger", "env_logger",
"format-bytes", "format-bytes",
"hg-core", "hg-core",
"home",
"lazy_static", "lazy_static",
"log", "log",
"micro-timer", "micro-timer",
"regex", "regex",
"users", "whoami",
] ]
[[package]] [[package]]
name = "same-file" name = "same-file"
version = "1.0.6" version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
dependencies = [ dependencies = [
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.8.0" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.54" version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44" checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"unicode-xid", "unicode-xid",
] ]
[[package]] [[package]]
name = "tempfile" name = "tempfile"
version = "3.1.0" version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
dependencies = [ dependencies = [
"cfg-if 0.1.10", "cfg-if 0.1.10",
"libc", "libc",
"rand", "rand",
"redox_syscall", "redox_syscall 0.1.57",
"remove_dir_all", "remove_dir_all",
"winapi", "winapi",
] ]
[[package]] [[package]]
name = "termcolor" name = "termcolor"
version = "1.1.2" version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "unicode-xid" name = "unicode-xid"
version = "0.2.1" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
[[package]] [[package]]
name = "users"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032"
dependencies = [
"libc",
"log",
]
[[package]]
name = "vcpkg" name = "vcpkg"
version = "0.2.11" version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
[[package]] [[package]]
name = "vec_map" name = "vec_map"
version = "0.8.2" version = "0.8.2"
[[package]] [[package]]
name = "wasi" name = "wasi"
version = "0.10.0+wasi-snapshot-preview1" version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
[[package]] [[package]]
name = "wasm-bindgen"
version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
dependencies = [
"cfg-if 1.0.0",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
dependencies = [
"bumpalo",
"lazy_static",
"log",
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
dependencies = [
"proc-macro2",
"quote",
"syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
[[package]]
name = "web-sys"
version = "0.3.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "whoami"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d595b2e146f36183d6a590b8d41568e2bc84c922267f43baf61c956330eeb436"
dependencies = [
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "winapi" name = "winapi"
version = "0.3.9" version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [ dependencies = [
"winapi-i686-pc-windows-gnu", "winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu",
] ]
[[package]] [[package]]
name = "winapi-x86_64-pc-windows-gnu" name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]] [[package]]
name = "zstd" name = "zstd"
version = "0.5.3+zstd.1.4.5" version = "0.5.4+zstd.1.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01b32eaf771efa709e8308605bbf9319bf485dc1503179ec0469b611937c0cd8" checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910"
dependencies = [ dependencies = [
"zstd-safe", "zstd-safe",
] ]
[[package]] [[package]]
name = "zstd-safe" name = "zstd-safe"
version = "2.0.5+zstd.1.4.5" version = "2.0.6+zstd.1.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cfb642e0d27f64729a639c52db457e0ae906e7bc6f5fe8f5c453230400f1055" checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e"
dependencies = [ dependencies = [
"libc", "libc",
"zstd-sys", "zstd-sys",
] ]
[[package]] [[package]]
name = "zstd-sys" name = "zstd-sys"
version = "1.4.17+zstd.1.4.5" version = "1.4.18+zstd.1.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b" checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81"
dependencies = [ dependencies = [
"cc", "cc",
"glob", "glob",
"itertools", "itertools",
"libc", "libc",
] ]

rust/hg-core/Cargo.toml

[package] [package]
name = "hg-core" name = "hg-core"
version = "0.1.0" version = "0.1.0"
authors = ["Georges Racinet <gracinet@anybox.fr>"] authors = ["Georges Racinet <gracinet@anybox.fr>"]
description = "Mercurial pure Rust core library, with no assumption on Python bindings (FFI)" description = "Mercurial pure Rust core library, with no assumption on Python bindings (FFI)"
edition = "2018" edition = "2018"
[lib] [lib]
name = "hg" name = "hg"
[dependencies] [dependencies]
bytes-cast = "0.2" bytes-cast = "0.2"
byteorder = "1.3.4" byteorder = "1.3.4"
derive_more = "0.99" derive_more = "0.99"
home = "0.5" directories = "4.0.1"
im-rc = "15.0.*" im-rc = "15.0.*"
itertools = "0.9" itertools = "0.9"
lazy_static = "1.4.0" lazy_static = "1.4.0"
rand = "0.7.3" rand = "0.7.3"
rand_pcg = "0.2.1" rand_pcg = "0.2.1"
rand_distr = "0.2.2" rand_distr = "0.2.2"
rayon = "1.3.0" rayon = "1.3.0"
regex = "1.3.9" regex = "1.3.9"

rust/hg-core/src/config/config.rs

// config.rs // config.rs
// //
// Copyright 2020 // Copyright 2020
// Valentin Gatien-Baron, // Valentin Gatien-Baron,
// Raphaël Gomès <rgomes@octobus.net> // Raphaël Gomès <rgomes@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
use super::layer; use super::layer;
use super::values; use super::values;
use crate::config::layer::{ use crate::config::layer::{
ConfigError, ConfigLayer, ConfigOrigin, ConfigValue, ConfigError, ConfigLayer, ConfigOrigin, ConfigValue,
}; };
use crate::utils::files::get_bytes_from_os_str; use crate::utils::files::get_bytes_from_os_str;
use directories::{BaseDirs, UserDirs};
use format_bytes::{write_bytes, DisplayBytes}; use format_bytes::{write_bytes, DisplayBytes};
use std::collections::HashSet; use std::collections::HashSet;
use std::env; use std::env;
use std::fmt; use std::fmt;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::str; use std::str;
use crate::errors::{HgResultExt, IoResultExt}; use crate::errors::{HgResultExt, IoResultExt};
key.to_owned(), key.to_owned(),
get_bytes_from_os_str(value), get_bytes_from_os_str(value),
None, None,
); );
self.layers.push(layer) self.layers.push(layer)
} }
} }
#[cfg(unix)] // TODO: other platforms
fn add_system_config(&mut self) -> Result<(), ConfigError> { fn add_system_config(&mut self) -> Result<(), ConfigError> {
// TODO: Windows, check this registry key
// - HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial
// - or HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial for 32bit
// Python on 64bit Windows.
let mut add_for_prefix = |prefix: &Path| -> Result<(), ConfigError> { let mut add_for_prefix = |prefix: &Path| -> Result<(), ConfigError> {
let etc = prefix.join("etc").join("mercurial"); #[cfg(unix)]
self.add_trusted_file(&etc.join("hgrc"))?; let prefix = prefix.join("etc").join("mercurial");
self.add_trusted_dir(&etc.join("hgrc.d"))
self.add_trusted_file(&prefix.join("hgrc"))?;
self.add_trusted_dir(&prefix.join("hgrc.d"))
}; };
let root = Path::new("/"); let root = Path::new("/");
// TODO: use `std::env::args_os().next().unwrap()` a.k.a. argv[0] // TODO: use `std::env::args_os().next().unwrap()` a.k.a. argv[0]
// instead? TODO: can this be a relative path? // instead? TODO: can this be a relative path?
let hg = crate::utils::current_exe()?; let hg = crate::utils::current_exe()?;
// TODO: this order (per-installation then per-system) matches // TODO: this order (per-installation then per-system) matches
// `systemrcpath()` in `mercurial/scmposix.py`, but // `systemrcpath()` in `mercurial/scmposix.py`, but
// `mercurial/helptext/config.txt` suggests it should be reversed // `mercurial/helptext/config.txt` suggests it should be reversed
if let Some(installation_prefix) = hg.parent().and_then(Path::parent) { if let Some(installation_prefix) = hg.parent().and_then(Path::parent) {
if installation_prefix != root { if installation_prefix != root {
add_for_prefix(&installation_prefix)? add_for_prefix(&installation_prefix)?
} }
} }
#[cfg(unix)]
add_for_prefix(root)?; add_for_prefix(root)?;
Ok(()) Ok(())
} }
#[cfg(unix)] // TODO: other plateforms
fn add_user_config(&mut self) -> Result<(), ConfigError> { fn add_user_config(&mut self) -> Result<(), ConfigError> {
let opt_home = home::home_dir(); let opt_home = UserDirs::new()
.map(|user_dirs| user_dirs.home_dir().to_path_buf());
if let Some(home) = &opt_home { if let Some(home) = &opt_home {
self.add_trusted_file(&home.join(".hgrc"))? self.add_trusted_file(&home.join(".hgrc"))?;
#[cfg(windows)]
self.add_trusted_file(&home.join("Mercurial.ini"))?;
} }
let unix = cfg!(target_os = "unix");
let darwin = cfg!(any(target_os = "macos", target_os = "ios")); let darwin = cfg!(any(target_os = "macos", target_os = "ios"));
if !darwin { if unix && !darwin {
if let Some(config_home) = env::var_os("XDG_CONFIG_HOME") if let Some(config_home) = BaseDirs::new()
.map(PathBuf::from) .map(|base_dirs| base_dirs.config_dir().to_path_buf())
.or_else(|| opt_home.map(|home| home.join(".config"))) .or_else(|| opt_home.map(|home| home.join(".config")))
{ {
self.add_trusted_file(&config_home.join("hg").join("hgrc"))? self.add_trusted_file(&config_home.join("hg").join("hgrc"))?
} }
} }
Ok(()) Ok(())
} }

rust/hg-core/src/dirstate/entry.rs

self.state != EntryState::Normal || self.mtime == MTIME_UNSET self.state != EntryState::Normal || self.mtime == MTIME_UNSET
} }
pub fn is_from_other_parent(&self) -> bool { pub fn is_from_other_parent(&self) -> bool {
self.state == EntryState::Normal && self.size == SIZE_FROM_OTHER_PARENT self.state == EntryState::Normal && self.size == SIZE_FROM_OTHER_PARENT
} }
// TODO: other platforms // TODO: other platforms
#[cfg(unix)]
pub fn mode_changed( pub fn mode_changed(
&self, &self,
#[cfg_attr(windows, allow(unused_variables))]
filesystem_metadata: &std::fs::Metadata, filesystem_metadata: &std::fs::Metadata,
) -> bool { ) -> bool {
#[cfg(unix)]
{
use std::os::unix::fs::MetadataExt; use std::os::unix::fs::MetadataExt;
const EXEC_BIT_MASK: u32 = 0o100; const EXEC_BIT_MASK: u32 = 0o100;
let dirstate_exec_bit = (self.mode as u32) & EXEC_BIT_MASK; let dirstate_exec_bit = (self.mode as u32) & EXEC_BIT_MASK;
let fs_exec_bit = filesystem_metadata.mode() & EXEC_BIT_MASK; let fs_exec_bit = filesystem_metadata.mode() & EXEC_BIT_MASK;
dirstate_exec_bit != fs_exec_bit dirstate_exec_bit != fs_exec_bit
} }
#[cfg(windows)]
{
// According to this SO, Mercurial only tracks executable bits on
// files, which it isn't able to do on Windows systems.
// https://stackoverflow.com/a/18926911
false
}
}
/// Returns a `(state, mode, size, mtime)` tuple as for /// Returns a `(state, mode, size, mtime)` tuple as for
/// `DirstateMapMethods::debug_iter`. /// `DirstateMapMethods::debug_iter`.
pub fn debug_tuple(&self) -> (u8, i32, i32, i32) { pub fn debug_tuple(&self) -> (u8, i32, i32, i32) {
(self.state.into(), self.mode, self.size, self.mtime) (self.state.into(), self.mode, self.size, self.mtime)
} }
pub fn mtime_is_ambiguous(&self, now: i32) -> bool { pub fn mtime_is_ambiguous(&self, now: i32) -> bool {
self.state == EntryState::Normal && self.mtime == now self.state == EntryState::Normal && self.mtime == now

rust/hg-core/src/dirstate_tree/status.rs

.unknown .unknown
.push(hg_path.detach_from_tree()) .push(hg_path.detach_from_tree())
} }
} }
is_ignored is_ignored
} }
} }
#[cfg(unix)] // TODO // TODO: Support other systems
fn mtime_seconds(metadata: &std::fs::Metadata) -> i64 { fn mtime_seconds(metadata: &std::fs::Metadata) -> i64 {
// Going through `Metadata::modified()` would be portable, but would take // Going through `Metadata::modified()` would be portable, but would take
// care to construct a `SystemTime` value with sub-second precision just // care to construct a `SystemTime` value with sub-second precision just
// for us to throw that away here. // for us to throw that away here.
#[cfg(unix)]
{
use std::os::unix::fs::MetadataExt; use std::os::unix::fs::MetadataExt;
metadata.mtime() metadata.mtime()
} }
#[cfg(windows)]
{
use std::os::windows::fs::MetadataExt;
let ticks = metadata.last_write_time();
use crate::utils::files::from_win_filetime;
from_win_filetime(ticks) as i64
}
}
struct DirEntry { struct DirEntry {
base_name: HgPathBuf, base_name: HgPathBuf,
full_path: PathBuf, full_path: PathBuf,
metadata: std::fs::Metadata, metadata: std::fs::Metadata,
} }
impl DirEntry { impl DirEntry {
/// Returns **unsorted** entries in the given directory, with name and /// Returns **unsorted** entries in the given directory, with name and

rust/hg-core/src/filepatterns.rs

| PatternSyntax::ExpandedSubInclude(_) => unreachable!(), | PatternSyntax::ExpandedSubInclude(_) => unreachable!(),
} }
} }
const GLOB_SPECIAL_CHARACTERS: [u8; 7] = const GLOB_SPECIAL_CHARACTERS: [u8; 7] =
[b'*', b'?', b'[', b']', b'{', b'}', b'\\']; [b'*', b'?', b'[', b']', b'{', b'}', b'\\'];
/// TODO support other platforms /// TODO support other platforms
#[cfg(unix)]
pub fn normalize_path_bytes(bytes: &[u8]) -> Vec<u8> { pub fn normalize_path_bytes(bytes: &[u8]) -> Vec<u8> {
if bytes.is_empty() { if bytes.is_empty() {
return b".".to_vec(); return b".".to_vec();
} }
let sep = b'/';
let sep = std::path::MAIN_SEPARATOR as u8;
let mut initial_slashes = bytes.iter().take_while(|b| **b == sep).count(); let mut initial_slashes = bytes.iter().take_while(|b| **b == sep).count();
if initial_slashes > 2 { if initial_slashes > 2 {
// POSIX allows one or two initial slashes, but treats three or more // POSIX allows one or two initial slashes, but treats three or more
// as single slash. // as single slash.
initial_slashes = 1; initial_slashes = 1;
} }
let components = bytes let components = bytes
.split(|b| *b == sep) .split(|b| *b == sep)

rust/hg-core/src/utils.rs

pub(crate) fn strip_suffix<'a>(s: &'a str, suffix: &str) -> Option<&'a str> { pub(crate) fn strip_suffix<'a>(s: &'a str, suffix: &str) -> Option<&'a str> {
if s.ends_with(suffix) { if s.ends_with(suffix) {
Some(&s[..s.len() - suffix.len()]) Some(&s[..s.len() - suffix.len()])
} else { } else {
None None
} }
} }
#[cfg(unix)]
pub fn shell_quote(value: &[u8]) -> Vec<u8> { pub fn shell_quote(value: &[u8]) -> Vec<u8> {
// TODO: Use the `matches!` macro when we require Rust 1.42+ // TODO: Use the `matches!` macro when we require Rust 1.42+
if value.iter().all(|&byte| match byte { let valid_chars;
#[cfg(unix)]
{
valid_chars = |&byte| match byte {
b'a'..=b'z' b'a'..=b'z'
| b'A'..=b'Z' | b'A'..=b'Z'
| b'0'..=b'9' | b'0'..=b'9'
| b'.' | b'.'
| b'_' | b'_'
| b'/' | b'/'
| b'+' | b'+'
| b'-' => true, | b'-' => true,
_ => false, _ => false,
}) { };
}
#[cfg(windows)]
{
valid_chars = |&byte| match byte {
b'a'..=b'z'
| b'A'..=b'Z'
| b'0'..=b'9'
| b'.'
| b'_'
| b'/'
| b'\\'
| b'+'
| b'-' => true,
_ => false,
};
}
if value.iter().all(valid_chars) {
value.to_owned() value.to_owned()
} else { } else {
let mut quoted = Vec::with_capacity(value.len() + 2); let mut quoted = Vec::with_capacity(value.len() + 2);
quoted.push(b'\''); quoted.push(b'\'');
for &byte in value { for &byte in value {
if byte == b'\'' { if byte == b'\'' {
quoted.push(b'\\'); quoted.push(b'\\');
} }

rust/hg-core/src/utils/files.rs

use same_file::is_same_file; use same_file::is_same_file;
use std::borrow::{Cow, ToOwned}; use std::borrow::{Cow, ToOwned};
use std::ffi::{OsStr, OsString}; use std::ffi::{OsStr, OsString};
use std::fs::Metadata; use std::fs::Metadata;
use std::iter::FusedIterator; use std::iter::FusedIterator;
use std::ops::Deref; use std::ops::Deref;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
pub fn get_os_str_from_bytes(bytes: &[u8]) -> &OsStr { // TODO Handle other platforms
let os_str; pub fn get_os_str_from_bytes(bytes: &[u8]) -> OsString {
#[cfg(unix)] #[cfg(unix)]
{ {
use std::os::unix::ffi::OsStrExt; use std::os::unix::ffi::OsStrExt;
os_str = std::ffi::OsStr::from_bytes(bytes); let os_str = OsStr::from_bytes(bytes);
os_str.to_os_string()
}
#[cfg(windows)]
{
use std::os::windows::ffi::OsStringExt;
// TODO: convert from WTF8 to Windows MBCS (ANSI encoding)
let wide_bytes: Vec<u16> = bytes.iter().map(|b| *b as u16).collect();
OsString::from_wide(wide_bytes.as_slice())
} }
// TODO Handle other platforms
// TODO: convert from WTF8 to Windows MBCS (ANSI encoding).
// Perhaps, the return type would have to be Result<PathBuf>.
os_str
} }
pub fn get_path_from_bytes(bytes: &[u8]) -> &Path { pub fn get_path_from_bytes(bytes: &[u8]) -> PathBuf {
Path::new(get_os_str_from_bytes(bytes)) Path::new(&get_os_str_from_bytes(bytes)).to_path_buf()
} }
// TODO: need to convert from WTF8 to MBCS bytes on Windows. // TODO: need to convert from WTF8 to MBCS bytes on Windows.
// that's why Vec<u8> is returned. // that's why Vec<u8> is returned.
#[cfg(unix)]
pub fn get_bytes_from_path(path: impl AsRef<Path>) -> Vec<u8> { pub fn get_bytes_from_path(path: impl AsRef<Path>) -> Vec<u8> {
get_bytes_from_os_str(path.as_ref()) get_bytes_from_os_str(path.as_ref())
} }
#[cfg(unix)]
pub fn get_bytes_from_os_str(str: impl AsRef<OsStr>) -> Vec<u8> { pub fn get_bytes_from_os_str(str: impl AsRef<OsStr>) -> Vec<u8> {
#[cfg(unix)]
{
use std::os::unix::ffi::OsStrExt; use std::os::unix::ffi::OsStrExt;
str.as_ref().as_bytes().to_vec() str.as_ref().as_bytes().to_vec()
} }
#[cfg(unix)] #[cfg(windows)]
{
use std::os::windows::ffi::OsStrExt;
// TODO: convert from WTF8 to Windows MBCS (ANSI encoding)
// If the conversion from u16 to u8 is lossy then issues will
// occur elsewhere.
str.as_ref().encode_wide().map(|b| b as u8).collect()
}
}
pub fn get_bytes_from_os_string(str: OsString) -> Vec<u8> { pub fn get_bytes_from_os_string(str: OsString) -> Vec<u8> {
#[cfg(unix)]
{
use std::os::unix::ffi::OsStringExt; use std::os::unix::ffi::OsStringExt;
str.into_vec() str.into_vec()
} }
#[cfg(windows)]
{
get_bytes_from_os_str(str.as_os_str())
}
}
/// An iterator over repository path yielding itself and its ancestors. /// An iterator over repository path yielding itself and its ancestors.
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
pub struct Ancestors<'a> { pub struct Ancestors<'a> {
next: Option<&'a HgPath>, next: Option<&'a HgPath>,
} }
impl<'a> Iterator for Ancestors<'a> { impl<'a> Iterator for Ancestors<'a> {
type Item = &'a HgPath; type Item = &'a HgPath;
pub fn is_symlink(&self) -> bool { pub fn is_symlink(&self) -> bool {
// This is way too manual, but `HgMetadata` will go away in the // This is way too manual, but `HgMetadata` will go away in the
// near-future dirstate rewrite anyway. // near-future dirstate rewrite anyway.
self.st_mode & 0170000 == 0120000 self.st_mode & 0170000 == 0120000
} }
} }
#[cfg(windows)]
impl HgMetadata {
pub fn from_metadata(metadata: Metadata) -> Self {
use std::os::windows::fs::MetadataExt;
let mode = match metadata.permissions().readonly() {
true => 0o400,
false => 0o600,
};
Self {
st_dev: 0,
st_mode: mode,
st_nlink: 0,
st_size: metadata.len(),
st_mtime: from_win_filetime(metadata.last_write_time()) as i64,
// Last status change time -- windows doesn't have corresponding
st_ctime: from_win_filetime(metadata.last_write_time()) as i64,
}
}
pub fn is_symlink(&self) -> bool {
// ?
false
}
}
#[cfg(windows)]
/// Converts Windows' FILETIME (100 ns from Jan. 1, 1601) to seconds from
/// the standard 1970 epoch.
pub fn from_win_filetime(ticks: u64) -> u64 {
match ticks {
0 => 0,
// See from_intervals() implemented in
// https://github.com/alexcrichton/filetime/blob/master/src/windows.rs
n => n / 1_000_000_000 / 100,
}
}
/// Returns the canonical path of `name`, given `cwd` and `root` /// Returns the canonical path of `name`, given `cwd` and `root`
pub fn canonical_path( pub fn canonical_path(
root: impl AsRef<Path>, root: impl AsRef<Path>,
cwd: impl AsRef<Path>, cwd: impl AsRef<Path>,
name: impl AsRef<Path>, name: impl AsRef<Path>,
) -> Result<PathBuf, HgPathError> { ) -> Result<PathBuf, HgPathError> {
// TODO add missing normalization for other platforms // TODO add missing normalization for other platforms
let root = root.as_ref(); let root = root.as_ref();

rust/hg-core/src/utils/hg_path.rs

// hg_path.rs // hg_path.rs
// //
// Copyright 2019 Raphaël Gomès <rgomes@octobus.net> // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
use crate::utils::files;
use crate::utils::SliceExt; use crate::utils::SliceExt;
use std::borrow::Borrow; use std::borrow::Borrow;
use std::borrow::Cow; use std::borrow::Cow;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::ffi::{OsStr, OsString}; use std::ffi::{OsStr, OsString};
use std::fmt; use std::fmt;
use std::ops::Deref; use std::ops::Deref;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
/// TODO: Once https://www.mercurial-scm.org/wiki/WindowsUTF8Plan is /// TODO: Once https://www.mercurial-scm.org/wiki/WindowsUTF8Plan is
/// implemented, these conversion utils will have to work differently depending /// implemented, these conversion utils will have to work differently depending
/// on the repository encoding: either `UTF-8` or `MBCS`. /// on the repository encoding: either `UTF-8` or `MBCS`.
pub fn hg_path_to_os_string<P: AsRef<HgPath>>( pub fn hg_path_to_os_string<P: AsRef<HgPath>>(
hg_path: P, hg_path: P,
) -> Result<OsString, HgPathError> { ) -> Result<OsString, HgPathError> {
hg_path.as_ref().check_state()?; hg_path.as_ref().check_state()?;
let os_str; let os_str = files::get_os_str_from_bytes(&hg_path.as_ref().as_bytes());
#[cfg(unix)]
{
use std::os::unix::ffi::OsStrExt;
os_str = std::ffi::OsStr::from_bytes(&hg_path.as_ref().as_bytes());
}
// TODO Handle other platforms
// TODO: convert from WTF8 to Windows MBCS (ANSI encoding).
Ok(os_str.to_os_string()) Ok(os_str.to_os_string())
} }
pub fn hg_path_to_path_buf<P: AsRef<HgPath>>( pub fn hg_path_to_path_buf<P: AsRef<HgPath>>(
hg_path: P, hg_path: P,
) -> Result<PathBuf, HgPathError> { ) -> Result<PathBuf, HgPathError> {
Ok(Path::new(&hg_path_to_os_string(hg_path)?).to_path_buf()) Ok(Path::new(&hg_path_to_os_string(hg_path)?).to_path_buf())
} }
pub fn os_string_to_hg_path_buf<S: AsRef<OsStr>>( pub fn os_string_to_hg_path_buf<S: AsRef<OsStr>>(
os_string: S, os_string: S,
) -> Result<HgPathBuf, HgPathError> { ) -> Result<HgPathBuf, HgPathError> {
let buf; let buf = HgPathBuf::from_bytes(&files::get_bytes_from_os_str(
#[cfg(unix)] os_string.as_ref(),
{ ));
use std::os::unix::ffi::OsStrExt;
buf = HgPathBuf::from_bytes(&os_string.as_ref().as_bytes());
}
// TODO Handle other platforms
// TODO: convert from WTF8 to Windows MBCS (ANSI encoding).
buf.check_state()?; buf.check_state()?;
Ok(buf) Ok(buf)
} }
pub fn path_to_hg_path_buf<P: AsRef<Path>>( pub fn path_to_hg_path_buf<P: AsRef<Path>>(
path: P, path: P,
) -> Result<HgPathBuf, HgPathError> { ) -> Result<HgPathBuf, HgPathError> {
let buf; let buf = HgPathBuf::from_bytes(&files::get_bytes_from_path(path));
let os_str = path.as_ref().as_os_str();
#[cfg(unix)]
{
use std::os::unix::ffi::OsStrExt;
buf = HgPathBuf::from_bytes(&os_str.as_bytes());
}
// TODO Handle other platforms
// TODO: convert from WTF8 to Windows MBCS (ANSI encoding).
buf.check_state()?; buf.check_state()?;
Ok(buf) Ok(buf)
} }
impl TryFrom<PathBuf> for HgPathBuf { impl TryFrom<PathBuf> for HgPathBuf {
type Error = HgPathError; type Error = HgPathError;
fn try_from(path: PathBuf) -> Result<Self, Self::Error> { fn try_from(path: PathBuf) -> Result<Self, Self::Error> {
path_to_hg_path_buf(path) path_to_hg_path_buf(path)

rust/hg-cpython/src/dirstate/status.rs

) )
.map_err(|e| { .map_err(|e| {
handle_fallback(py, StatusError::Pattern(e)) handle_fallback(py, StatusError::Pattern(e))
})?; })?;
let pattern = k.get_item(py, 1)?.extract::<PyBytes>(py)?; let pattern = k.get_item(py, 1)?.extract::<PyBytes>(py)?;
let pattern = pattern.data(py); let pattern = pattern.data(py);
let source = k.get_item(py, 2)?.extract::<PyBytes>(py)?; let source = k.get_item(py, 2)?.extract::<PyBytes>(py)?;
let source = get_path_from_bytes(source.data(py)); let source = get_path_from_bytes(source.data(py));
let new = IgnorePattern::new(syntax, pattern, source); let new = IgnorePattern::new(syntax, pattern, &source);
Ok(new) Ok(new)
}) })
.collect(); .collect();
let ignore_patterns = ignore_patterns?; let ignore_patterns = ignore_patterns?;
let matcher = IncludeMatcher::new(ignore_patterns) let matcher = IncludeMatcher::new(ignore_patterns)
.map_err(|e| handle_fallback(py, e.into()))?; .map_err(|e| handle_fallback(py, e.into()))?;

rust/rhg/Cargo.toml

[package] [package]
name = "rhg" name = "rhg"
version = "0.1.0" version = "0.1.0"
authors = [ authors = [
"Antoine Cezar <antoine.cezar@octobus.net>", "Antoine Cezar <antoine.cezar@octobus.net>",
"Raphaël Gomès <raphael.gomes@octobus.net>", "Raphaël Gomès <raphael.gomes@octobus.net>",
] ]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
hg-core = { path = "../hg-core"} hg-core = { path = "../hg-core"}
chrono = "0.4.19" chrono = "0.4.19"
clap = "2.33.1" clap = "2.33.1"
derive_more = "0.99" derive_more = "0.99"
home = "0.5.3" directories = "4.0.1"
lazy_static = "1.4.0" lazy_static = "1.4.0"
log = "0.4.11" log = "0.4.11"
micro-timer = "0.3.1" micro-timer = "0.3.1"
regex = "1.3.9" regex = "1.3.9"
env_logger = "0.7.1" env_logger = "0.7.1"
format-bytes = "0.2.1" format-bytes = "0.2.1"
users = "0.11.0"
# The 1.1 series does not compile on rust 1.41, requires 1.43
whoami = "1.0.3"
No newline at end of file

rust/rhg/src/blackbox.rs

configured.log(&now, &message); configured.log(&now, &message);
} }
} }
} }
impl ConfiguredBlackbox<'_> { impl ConfiguredBlackbox<'_> {
fn log(&self, date_time: &DateTime, message: &[u8]) { fn log(&self, date_time: &DateTime, message: &[u8]) {
let date = format_bytes::Utf8(date_time.format(self.date_format)); let date = format_bytes::Utf8(date_time.format(self.date_format));
let user = users::get_current_username().map(get_bytes_from_os_str); let user = get_bytes_from_os_str(&whoami::username_os());
let user = user.as_deref().unwrap_or(b"???");
let rev = format_bytes::Utf8(match self.repo.dirstate_parents() { let rev = format_bytes::Utf8(match self.repo.dirstate_parents() {
Ok(parents) if parents.p2 == hg::revlog::node::NULL_NODE => { Ok(parents) if parents.p2 == hg::revlog::node::NULL_NODE => {
format!("{:x}", parents.p1) format!("{:x}", parents.p1)
} }
Ok(parents) => format!("{:x}+{:x}", parents.p1, parents.p2), Ok(parents) => format!("{:x}+{:x}", parents.p1, parents.p2),
Err(_dirstate_corruption_error) => { Err(_dirstate_corruption_error) => {
// TODO: log a non-fatal warning to stderr // TODO: log a non-fatal warning to stderr
"???".to_owned() "???".to_owned()

rust/rhg/src/commands/status.rs

} else { } else {
requested requested
} }
}; };
let repo = invocation.repo?; let repo = invocation.repo?;
let mut dmap = repo.dirstate_map_mut()?; let mut dmap = repo.dirstate_map_mut()?;
let check_exec = if cfg!(target_os = "windows") {
false
} else {
true
};
let options = StatusOptions { let options = StatusOptions {
// TODO should be provided by the dirstate parsing and // TODO should be provided by the dirstate parsing and
// hence be stored on dmap. Using a value that assumes we aren't // hence be stored on dmap. Using a value that assumes we aren't
// below the time resolution granularity of the FS and the // below the time resolution granularity of the FS and the
// dirstate. // dirstate.
last_normal_time: 0, last_normal_time: 0,
// we're currently supporting file systems with exec flags only check_exec,
// anyway
check_exec: true,
list_clean: display_states.clean, list_clean: display_states.clean,
list_unknown: display_states.unknown, list_unknown: display_states.unknown,
list_ignored: display_states.ignored, list_ignored: display_states.ignored,
collect_traversed_dirs: false, collect_traversed_dirs: false,
}; };
let ignore_file = repo.working_directory_vfs().join(".hgignore"); // TODO hardcoded let ignore_file = repo.working_directory_vfs().join(".hgignore"); // TODO hardcoded
let (mut ds_status, pattern_warnings) = dmap.status( let (mut ds_status, pattern_warnings) = dmap.status(
&AlwaysMatcher, &AlwaysMatcher,

rust/rhg/src/main.rs

extern crate log; extern crate log;
use crate::ui::Ui; use crate::ui::Ui;
use clap::App; use clap::App;
use clap::AppSettings; use clap::AppSettings;
use clap::Arg; use clap::Arg;
use clap::ArgMatches; use clap::ArgMatches;
use directories::UserDirs;
use format_bytes::{format_bytes, join}; use format_bytes::{format_bytes, join};
use hg::config::{Config, ConfigSource}; use hg::config::{Config, ConfigSource};
use hg::exit_codes; use hg::exit_codes;
use hg::repo::{Repo, RepoError}; use hg::repo::{Repo, RepoError};
use hg::utils::files::{get_bytes_from_os_str, get_path_from_bytes}; use hg::utils::files::{get_bytes_from_os_str, get_path_from_bytes};
use hg::utils::SliceExt; use hg::utils::SliceExt;
use std::ffi::OsString; use std::ffi::OsString;
use std::path::PathBuf; use std::path::PathBuf;
let process_start_time = blackbox::ProcessStartTime::now(); let process_start_time = blackbox::ProcessStartTime::now();
env_logger::init(); env_logger::init();
let ui = ui::Ui::new(); let ui = ui::Ui::new();
let early_args = EarlyArgs::parse(std::env::args_os()); let early_args = EarlyArgs::parse(std::env::args_os());
let initial_current_dir = early_args.cwd.map(|cwd| { let initial_current_dir = early_args.cwd.map(|cwd| {
let cwd = get_path_from_bytes(&cwd); let cwd = &get_path_from_bytes(&cwd);
std::env::current_dir() std::env::current_dir()
.and_then(|initial| { .and_then(|initial| {
std::env::set_current_dir(cwd)?; std::env::set_current_dir(cwd)?;
Ok(initial) Ok(initial)
}) })
.unwrap_or_else(|error| { .unwrap_or_else(|error| {
exit( exit(
&None, &None,
} else { } else {
None None
} }
}; };
let non_repo_config_val = { let non_repo_config_val = {
let non_repo_val = non_repo_config.get(b"paths", &repo_arg); let non_repo_val = non_repo_config.get(b"paths", &repo_arg);
match &non_repo_val { match &non_repo_val {
Some(val) if val.len() > 0 => home::home_dir() Some(val) if val.len() > 0 => UserDirs::new()
.map(|user_dirs| user_dirs.home_dir().to_path_buf())
.unwrap_or_else(|| PathBuf::from("~")) .unwrap_or_else(|| PathBuf::from("~"))
.join(get_path_from_bytes(val)) .join(get_path_from_bytes(val))
.canonicalize() .canonicalize()
// TODO: handle error and make it similar to python // TODO: handle error and make it similar to python
// implementation maybe? // implementation maybe?
.ok(), .ok(),
_ => None, _ => None,
} }
if let ( if let (
OnUnsupported::Fallback { executable }, OnUnsupported::Fallback { executable },
Err(CommandError::UnsupportedFeature { .. }), Err(CommandError::UnsupportedFeature { .. }),
) = (&on_unsupported, &result) ) = (&on_unsupported, &result)
{ {
let mut args = std::env::args_os(); let mut args = std::env::args_os();
let executable_path = get_path_from_bytes(&executable); let executable_path = get_path_from_bytes(&executable);
let this_executable = args.next().expect("exepcted argv[0] to exist"); let this_executable = args.next().expect("exepcted argv[0] to exist");
if executable_path == &PathBuf::from(this_executable) { if executable_path == PathBuf::from(this_executable) {
// Avoid spawning infinitely many processes until resource // Avoid spawning infinitely many processes until resource
// exhaustion. // exhaustion.
let _ = ui.write_stderr(&format_bytes!( let _ = ui.write_stderr(&format_bytes!(
b"Blocking recursive fallback. The 'rhg.fallback-executable = {}' config \ b"Blocking recursive fallback. The 'rhg.fallback-executable = {}' config \
points to `rhg` itself.\n", points to `rhg` itself.\n",
executable executable
)); ));
on_unsupported = OnUnsupported::Abort on_unsupported = OnUnsupported::Abort