Mercurial > hg
changeset 44359:a69c08cdb2a8
merge with stable
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 13 Feb 2020 10:12:12 -0800 |
| parents | d52e3826cd4b (current diff) 60bc043d7df7 (diff) |
| children | 2bd3b95fdce0 |
| files | mercurial/chgserver.py rust/hg-cpython/src/dirstate/dirstate_map.rs tests/test-chg.t |
| diffstat | 6 files changed, 71 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/chgserver.py Sat Feb 01 12:57:32 2020 +0900 +++ b/mercurial/chgserver.py Thu Feb 13 10:12:12 2020 -0800 @@ -83,6 +83,7 @@ b'eol', # uses setconfig('eol', ...) b'extdiff', # uisetup will register new commands b'extensions', + b'schemes', # extsetup will update global hg.schemes ] _configsectionitems = [
--- a/tests/test-chg.t Sat Feb 01 12:57:32 2020 +0900 +++ b/tests/test-chg.t Thu Feb 13 10:12:12 2020 -0800 @@ -245,6 +245,54 @@ YYYY/MM/DD HH:MM:SS (PID)> worker process exited (pid=...) YYYY/MM/DD HH:MM:SS (PID)> $TESTTMP/extreload/chgsock/server-... is not owned, exiting. +global data mutated by schems +----------------------------- + + $ hg init schemes + $ cd schemes + +initial state + + $ cat > .hg/hgrc <<'EOF' + > [extensions] + > schemes = + > [schemes] + > foo = https://foo.example.org/ + > EOF + $ hg debugexpandscheme foo://expanded + https://foo.example.org/expanded + $ hg debugexpandscheme bar://unexpanded + bar://unexpanded + +add bar + + $ cat > .hg/hgrc <<'EOF' + > [extensions] + > schemes = + > [schemes] + > foo = https://foo.example.org/ + > bar = https://bar.example.org/ + > EOF + $ hg debugexpandscheme foo://expanded + https://foo.example.org/expanded + $ hg debugexpandscheme bar://expanded + https://bar.example.org/expanded + +remove foo + + $ cat > .hg/hgrc <<'EOF' + > [extensions] + > schemes = + > [schemes] + > bar = https://bar.example.org/ + > EOF + $ hg debugexpandscheme foo://unexpanded + foo://unexpanded + $ hg debugexpandscheme bar://expanded + https://bar.example.org/expanded + + $ cd .. + repository cache ---------------- @@ -317,6 +365,8 @@ check server log: $ cat log/server.log | filterlog + YYYY/MM/DD HH:MM:SS (PID)> worker process exited (pid=...) + YYYY/MM/DD HH:MM:SS (PID)> worker process exited (pid=...) YYYY/MM/DD HH:MM:SS (PID)> init cached YYYY/MM/DD HH:MM:SS (PID)> id -R cached YYYY/MM/DD HH:MM:SS (PID)> loaded repo into cache: $TESTTMP/cached (in ...s)
--- a/tests/test-convert-bzr-directories.t Sat Feb 01 12:57:32 2020 +0900 +++ b/tests/test-convert-bzr-directories.t Thu Feb 13 10:12:12 2020 -0800 @@ -2,6 +2,9 @@ $ . "$TESTDIR/bzr-definitions" +Work around https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=944379 + $ mkdir -p "${HOME}/.config/breezy" + empty directory $ mkdir test-empty
--- a/tests/test-convert-bzr.t Sat Feb 01 12:57:32 2020 +0900 +++ b/tests/test-convert-bzr.t Thu Feb 13 10:12:12 2020 -0800 @@ -226,7 +226,7 @@ Created tag trunk-tag. $ bzr switch -b branch Tree is up to date at revision 1. - Switched to branch: *repo/branch/ (glob) + Switched to branch*repo/branch/ (glob) $ sleep 1 $ echo b > b $ bzr add -q b @@ -235,7 +235,7 @@ Created tag branch-tag. $ bzr switch --force ../repo/trunk Updated to revision 1. - Switched to branch: */repo/trunk/ (glob) + Switched to branch*/repo/trunk/ (glob) $ sleep 1 $ echo a >> a $ bzr ci -qm changea
--- a/tests/test-issue4074.t Sat Feb 01 12:57:32 2020 +0900 +++ b/tests/test-issue4074.t Thu Feb 13 10:12:12 2020 -0800 @@ -25,5 +25,5 @@ Time a check-in, should never take more than 10 seconds user time: - $ hg ci --time -m1 + $ hg ci --time -m1 --config worker.enabled=no time: real .* secs .user [0-9][.].* sys .* (re)
--- a/tests/test-remotefilelog-bgprefetch.t Sat Feb 01 12:57:32 2020 +0900 +++ b/tests/test-remotefilelog-bgprefetch.t Thu Feb 13 10:12:12 2020 -0800 @@ -178,8 +178,11 @@ $ clearcache $ find $CACHEDIR -type f | sort $ echo b > b +.. The following output line about files fetches is globed because it is +.. flaky, the core the test is checked when checking the cache dir, so +.. hopefully this flakyness is not hiding any actual bug. $ hg commit -qAm b - * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) + * files fetched over 1 fetches - (* misses, 0.00% hit ratio) over *s (glob) (?) $ hg bookmark temporary $ find $CACHEDIR -type f | sort $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx @@ -222,10 +225,19 @@ (leaving bookmark temporary) $ clearcache $ find $CACHEDIR -type f | sort +.. The following output line about files fetches is globed because it is +.. flaky, the core the test is checked when checking the cache dir, so +.. hopefully this flakyness is not hiding any actual bug. $ hg rebase -s temporary -d foo rebasing 3:d9cf06e3b5b6 "b" (temporary tip) saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/d9cf06e3b5b6-e5c3dc63-rebase.hg - 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over *s (glob) + ? files fetched over ? fetches - (? misses, 0.00% hit ratio) over *s (glob) + $ find $CACHEDIR -type f | sort + $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histidx + $TESTTMP/hgcache/master/packs/8f1443d44e57fec96f72fb2412e01d2818767ef2.histpack + $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.dataidx + $TESTTMP/hgcache/master/packs/f4d50848e0b465e9bfd2875f213044c06cfd7407.datapack + $TESTTMP/hgcache/repos # Ensure that file 'y' was prefetched - it was not part of the rebase operation and therefore # could only be downloaded by the background prefetch