Mercurial > hg
changeset 43736:640bae94f2f3
cleanup: update references to /help/ that should now be /helptext/
I noticed this only because the WiX build was broken after
2e017696181f. I haven't tested this change with WiX, but it seems
pretty obvious by inspection this should fix it.
Differential Revision: https://phab.mercurial-scm.org/D7472
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 21 Nov 2019 23:35:29 -0500 |
| parents | 7eb701e355bd |
| children | c7fc2d92067e |
| files | Makefile contrib/packaging/hgpackaging/py2exe.py doc/Makefile mercurial/linelog.py |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri Nov 22 21:42:04 2019 +0900 +++ b/Makefile Thu Nov 21 23:35:29 2019 -0500 @@ -11,7 +11,7 @@ PURE= PYFILESCMD=find mercurial hgext doc -name '*.py' PYFILES:=$(shell $(PYFILESCMD)) -DOCFILES=mercurial/help/*.txt +DOCFILES=mercurial/helptext/*.txt export LANGUAGE=C export LC_ALL=C TESTFLAGS ?= $(shell echo $$HGTESTFLAGS)
--- a/contrib/packaging/hgpackaging/py2exe.py Fri Nov 22 21:42:04 2019 +0900 +++ b/contrib/packaging/hgpackaging/py2exe.py Thu Nov 21 23:35:29 2019 -0500 @@ -44,7 +44,7 @@ ('dist/python*.dll', './'), ('doc/*.html', 'doc/'), ('doc/style.css', 'doc/'), - ('mercurial/help/**/*.txt', 'help/'), + ('mercurial/helptext/**/*.txt', 'helptext/'), ('mercurial/default.d/*.rc', 'hgrc.d/'), ('mercurial/locale/**/*', 'locale/'), ('mercurial/templates/**/*', 'Templates/'),
--- a/doc/Makefile Fri Nov 22 21:42:04 2019 +0900 +++ b/doc/Makefile Thu Nov 21 23:35:29 2019 -0500 @@ -1,8 +1,8 @@ -SOURCES=$(notdir $(wildcard ../mercurial/help/*.[0-9].txt)) +SOURCES=$(notdir $(wildcard ../mercurial/helptext/*.[0-9].txt)) MAN=$(SOURCES:%.txt=%) HTML=$(SOURCES:%.txt=%.html) GENDOC=gendoc.py ../mercurial/commands.py ../mercurial/help.py \ - ../mercurial/help/*.txt ../hgext/*.py ../hgext/*/__init__.py + ../mercurial/helptext/*.txt ../hgext/*.py ../hgext/*/__init__.py PREFIX=/usr/local MANDIR=$(PREFIX)/share/man INSTALL=install -c -m 644
--- a/mercurial/linelog.py Fri Nov 22 21:42:04 2019 +0900 +++ b/mercurial/linelog.py Thu Nov 21 23:35:29 2019 -0500 @@ -8,7 +8,7 @@ SCCS Weaves are an implementation of https://en.wikipedia.org/wiki/Interleaved_deltas. See -mercurial/help/internals/linelog.txt for an exploration of SCCS weaves +mercurial/helptext/internals/linelog.txt for an exploration of SCCS weaves and how linelog works in detail. Here's a hacker's summary: a linelog is a program which is executed in