This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9552

share: remove unexpected heading from "verbose" container in help test
ClosedPublic

Authored by martinvonz on Dec 9 2020, 12:59 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGc80f9e3daec3: share: remove unexpected heading from "verbose" container in help test
Summary

test-gendoc-*.t have been failing for me since 91425656e2b1 (share:
add documentation about share-safe mode in hg help -e share,
2020-11-27) with this kind of output:

--- /usr/local/google/home/martinvonz/hg/tests/test-gendoc-ru.t
+++ /usr/local/google/home/martinvonz/hg/tests/test-gendoc-ru.t.err
@@ -2,3 +2,9 @@

   $ $TESTDIR/check-gendoc ru
   checking for parse errors
+  gendoc.txt:12818: (SEVERE/4) Unexpected section title.
+
+  Sharing requirements and configs of source repository with shares
+  -----------------------------------------------------------------
+  Exiting due to level-4 (SEVERE) system message.
+  [1]

This patch fixes that.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 9 2020, 12:59 PM
mharbison72 accepted this revision.Dec 9 2020, 7:24 PM
mharbison72 added a subscriber: mharbison72.

Well, this is new:

$ hg phabimport 9552
applying patch from D9552
unable to find 'usr/local/google/home/martinvonz/hg/tests/test-gendoc-ru.t' for patching
(use '--prefix' to apply patch relative to the current directory)
abort: patch failed to apply

It looks like maybe the hg parser isn't smart enough to skip ahead to the first filename reference. I edited the patch to indent the triple backtick content, and apply it.

This revision is now accepted and ready to land.Dec 9 2020, 7:24 PM
martinvonz added a comment.Dec 9 2020, 7:26 PM
In D9552#143830, @mharbison72 wrote:

Well, this is new:

$ hg phabimport 9552
applying patch from D9552
unable to find 'usr/local/google/home/martinvonz/hg/tests/test-gendoc-ru.t' for patching
(use '--prefix' to apply patch relative to the current directory)
abort: patch failed to apply

It looks like maybe the hg parser isn't smart enough to skip ahead to the first filename reference. I edited the patch to indent the triple backtick content, and apply it.

Yes, I knew about that. I'm sorry I didn't think of it myself. Thanks for fixing!

Revision Contents
Changeset List

PathPackages
Mhgext/share.py (3 lines)

Diff 24146

hgext/share.py

path or URL. In this mode, storage is only shared if the path or URL path or URL. In this mode, storage is only shared if the path or URL
requested in the :hg:`clone` command matches exactly to a repository requested in the :hg:`clone` command matches exactly to a repository
that was cloned before. that was cloned before.
The default naming mode is "identity". The default naming mode is "identity".
.. container:: verbose .. container:: verbose
Sharing requirements and configs of source repository with shares Sharing requirements and configs of source repository with shares:
-----------------------------------------------------------------
By default creating a shared repository only enables sharing a common By default creating a shared repository only enables sharing a common
history and does not share requirements and configs between them. This history and does not share requirements and configs between them. This
may lead to problems in some cases, for example when you upgrade the may lead to problems in some cases, for example when you upgrade the
storage format from one repository but does not set related configs storage format from one repository but does not set related configs
in the shares. in the shares.
Setting `format.exp-share-safe = True` enables sharing configs and Setting `format.exp-share-safe = True` enables sharing configs and