Patchwork D7472: cleanup: update references to /help/ that should now be /helptext/

login
register
mail settings
Submitter phabricator
Date Nov. 22, 2019, 4:40 a.m.
Message ID <differential-rev-PHID-DREV-zgj4s2brhq6wzeqi65oc-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/43407/
State Superseded
Headers show

Comments

phabricator - Nov. 22, 2019, 4:40 a.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I noticed this only because the WiX build was broken after
  2e017696181f <https://phab.mercurial-scm.org/rHG2e017696181f1effb6ec41ca05a875670498e768>. I haven't tested this change with WiX, but it seems
  pretty obvious by inspection this should fix it.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7472

AFFECTED FILES
  Makefile
  contrib/packaging/hgpackaging/py2exe.py
  doc/Makefile
  mercurial/linelog.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/linelog.py b/mercurial/linelog.py
--- a/mercurial/linelog.py
+++ b/mercurial/linelog.py
@@ -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
diff --git a/doc/Makefile b/doc/Makefile
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -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
diff --git a/contrib/packaging/hgpackaging/py2exe.py b/contrib/packaging/hgpackaging/py2exe.py
--- a/contrib/packaging/hgpackaging/py2exe.py
+++ b/contrib/packaging/hgpackaging/py2exe.py
@@ -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/'),
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -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)