# HG changeset patch # User Joerg Sonnenberger # Date 2023-10-10 16:29:04 # Node ID 704c3d0878d93fc4e8fe0b72b2b1c9f0f3fe91a9 # Parent 051de900b2403c8a8ea7043bd22cc124b884464a cleanup: typos, formatting diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py --- a/mercurial/bundle2.py +++ b/mercurial/bundle2.py @@ -896,7 +896,7 @@ class unbundle20(unpackermixin): """utility to transfer a bundle2 as binary This is made necessary by the fact the 'getbundle' command over 'ssh' - have no way to know then the reply end, relying on the bundle to be + have no way to know when the reply ends, relying on the bundle to be interpreted to know its end. This is terrible and we are sorry, but we needed to move forward to get general delta enabled. """ diff --git a/mercurial/upgrade_utils/actions.py b/mercurial/upgrade_utils/actions.py --- a/mercurial/upgrade_utils/actions.py +++ b/mercurial/upgrade_utils/actions.py @@ -289,8 +289,7 @@ class sharesafe(requirementformatvariant postdowngrademessage = _( b'repository downgraded to not use share safe mode, ' - b'existing shares will not work and needs to' - b' be reshared.' + b'existing shares will not work and need to be reshared.' ) postupgrademessage = _( @@ -359,7 +358,7 @@ class copiessdc(requirementformatvariant description = _(b'Stores copies information alongside changesets.') upgrademessage = _( - b'Allows to use more efficient algorithm to deal with ' b'copy tracing.' + b'Allows to use more efficient algorithm to deal with copy tracing.' ) touches_filelogs = False diff --git a/tests/test-share-safe.t b/tests/test-share-safe.t --- a/tests/test-share-safe.t +++ b/tests/test-share-safe.t @@ -470,7 +470,7 @@ Test that downgrading works too (it is safe to interrupt this process any time before data migration completes) upgrading repository requirements removing temporary repository $TESTTMP/non-share-safe/.hg/upgrade.* (glob) - repository downgraded to not use share safe mode, existing shares will not work and needs to be reshared. + repository downgraded to not use share safe mode, existing shares will not work and need to be reshared. $ hg debugrequirements dotencode