--- a/.hgsigs Tue Oct 26 19:47:30 2021 +0100
+++ b/.hgsigs Wed Nov 10 14:54:55 2021 -0500
@@ -218,3 +218,4 @@
86a60679cf619e14cee9442f865fcf31b142cb9f 0 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
--- a/.hgtags Tue Oct 26 19:47:30 2021 +0100
+++ b/.hgtags Wed Nov 10 14:54:55 2021 -0500
@@ -231,3 +231,4 @@
86a60679cf619e14cee9442f865fcf31b142cb9f 5.9.1
750920b18aaaddd654756be40dec59d90f2643be 5.9.2
6ee0244fc1cf889ae543d2ce0ec45201ae0be6e1 5.9.3
+a44bb185f6bdbecc754996d8386722e2f0123b0a 6.0rc0
--- a/relnotes/5.9 Tue Oct 26 19:47:30 2021 +0100
+++ b/relnotes/5.9 Wed Nov 10 14:54:55 2021 -0500
@@ -2,7 +2,7 @@
* `hg config` now has a `--source` option to show where each
configuration value comes from.
- * Introduced a command (debug-repair-issue6533) to repair repositories affected
+ * Introduced a command (debug-repair-issue6528) to repair repositories affected
by issue6528 where certain files would show up as modified even if they were
clean due to an issue in the copy-tracing code.
--- a/rust/hg-core/src/utils/path_auditor.rs Tue Oct 26 19:47:30 2021 +0100
+++ b/rust/hg-core/src/utils/path_auditor.rs Wed Nov 10 14:54:55 2021 -0500
@@ -180,12 +180,14 @@
#[cfg(test)]
mod tests {
use super::*;
- use crate::utils::files::get_path_from_bytes;
- use crate::utils::hg_path::path_to_hg_path_buf;
+ use std::fs::{create_dir, File};
+ use tempfile::tempdir;
#[test]
fn test_path_auditor() {
- let auditor = PathAuditor::new(get_path_from_bytes(b"/tmp"));
+ let base_dir = tempdir().unwrap();
+ let base_dir_path = base_dir.path();
+ let auditor = PathAuditor::new(base_dir_path);
let path = HgPath::new(b".hg/00changelog.i");
assert_eq!(
@@ -201,32 +203,20 @@
})
);
- use std::fs::{create_dir, File};
- use tempfile::tempdir;
-
- let base_dir = tempdir().unwrap();
- let base_dir_path = base_dir.path();
- let skip = base_dir_path.components().count() - 1;
- let a = base_dir_path.join("a");
- let b = base_dir_path.join("b");
- create_dir(&a).unwrap();
- let in_a_path = a.join("in_a");
- File::create(in_a_path).unwrap();
-
+ create_dir(&base_dir_path.join("realdir")).unwrap();
+ File::create(&base_dir_path.join("realdir/realfile")).unwrap();
// TODO make portable
- std::os::unix::fs::symlink(&a, &b).unwrap();
-
- let buf = b.join("in_a").components().skip(skip).collect::<PathBuf>();
- eprintln!("buf: {}", buf.display());
- let path = path_to_hg_path_buf(buf).unwrap();
+ std::os::unix::fs::symlink(
+ &base_dir_path.join("realdir"),
+ &base_dir_path.join("symlink"),
+ )
+ .unwrap();
+ let path = HgPath::new(b"symlink/realfile");
assert_eq!(
- auditor.audit_path(&path),
+ auditor.audit_path(path),
Err(HgPathError::TraversesSymbolicLink {
- path: path,
- symlink: path_to_hg_path_buf(
- b.components().skip(2).collect::<PathBuf>()
- )
- .unwrap()
+ path: path.to_owned(),
+ symlink: HgPathBuf::from_bytes(b"symlink"),
})
);
}
--- a/tests/hghave.py Tue Oct 26 19:47:30 2021 +0100
+++ b/tests/hghave.py Wed Nov 10 14:54:55 2021 -0500
@@ -264,6 +264,13 @@
return not (new_file_has_exec or exec_flags_cannot_flip)
+@check("suidbit", "setuid and setgid bit")
+def has_suidbit():
+ if getattr(os, "statvfs", None) is None or getattr(os, "ST_NOSUID") is None:
+ return False
+ return bool(os.statvfs('.').f_flag & os.ST_NOSUID)
+
+
@check("icasefs", "case insensitive file system")
def has_icasefs():
# Stolen from mercurial.util
--- a/tests/test-remotefilelog-permissions.t Tue Oct 26 19:47:30 2021 +0100
+++ b/tests/test-remotefilelog-permissions.t Wed Nov 10 14:54:55 2021 -0500
@@ -33,6 +33,8 @@
$ chmod -R u+w master/.hg/remotefilelogcache
+#if suidbit
+
# Test setting up shared cache with the right permissions
# (this is hard to test in a cross platform way, so we just make sure nothing
# crashes)
@@ -44,3 +46,5 @@
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ ls -ld $CACHEDIR/11
drwxrws* $TESTTMP/hgcache/11 (glob)
+
+#endif
--- a/tests/test-run-tests.t Tue Oct 26 19:47:30 2021 +0100
+++ b/tests/test-run-tests.t Wed Nov 10 14:54:55 2021 -0500
@@ -23,7 +23,7 @@
#if symlink
$ ln -s `which true` hg
$ "$PYTHON" $TESTDIR/run-tests.py --with-hg=./hg
- warning: --with-hg should specify an hg script, not: true
+ ^warning: --with-hg should specify an hg script, not: (true|coreutils)$ (re)
running 0 tests using 0 parallel processes
# Ran 0 tests, 0 skipped, 0 failed.
--- a/tests/test-serve.t Tue Oct 26 19:47:30 2021 +0100
+++ b/tests/test-serve.t Wed Nov 10 14:54:55 2021 -0500
@@ -57,6 +57,7 @@
$ hgserve -p daytime
abort: cannot start server at 'localhost:13': Permission denied (?)
abort: child process failed to start (?)
+ abort: no port number associated with service 'daytime' (?)
listening at http://localhost/ (bound to $LOCALIP:13) (?)
% errors
$ KILLQUIETLY=N