| hg-reviewers |
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.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | Makefile (2 lines) | |||
| M | contrib/packaging/hgpackaging/py2exe.py (2 lines) | |||
| M | doc/Makefile (4 lines) | |||
| M | mercurial/linelog.py (2 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| c06381b3d298 | 8ca92bcb3083 | Augie Fackler | Nov 21 2019, 11:35 PM |
| # If you want to change PREFIX, do not just edit it below. The changed | # If you want to change PREFIX, do not just edit it below. The changed | ||||
| # value wont get passed on to recursive make calls. You should instead | # value wont get passed on to recursive make calls. You should instead | ||||
| # override the variable on the command like: | # override the variable on the command like: | ||||
| # | # | ||||
| # % make PREFIX=/opt/ install | # % make PREFIX=/opt/ install | ||||
| export PREFIX=/usr/local | export PREFIX=/usr/local | ||||
| PYTHON?=python | PYTHON?=python | ||||
| $(eval HGROOT := $(shell pwd)) | $(eval HGROOT := $(shell pwd)) | ||||
| HGPYTHONS ?= $(HGROOT)/build/pythons | HGPYTHONS ?= $(HGROOT)/build/pythons | ||||
| PURE= | PURE= | ||||
| PYFILESCMD=find mercurial hgext doc -name '*.py' | PYFILESCMD=find mercurial hgext doc -name '*.py' | ||||
| PYFILES:=$(shell $(PYFILESCMD)) | PYFILES:=$(shell $(PYFILESCMD)) | ||||
| DOCFILES=mercurial/help/*.txt | DOCFILES=mercurial/helptext/*.txt | ||||
| export LANGUAGE=C | export LANGUAGE=C | ||||
| export LC_ALL=C | export LC_ALL=C | ||||
| TESTFLAGS ?= $(shell echo $$HGTESTFLAGS) | TESTFLAGS ?= $(shell echo $$HGTESTFLAGS) | ||||
| OSXVERSIONFLAGS ?= $(shell echo $$OSXVERSIONFLAGS) | OSXVERSIONFLAGS ?= $(shell echo $$OSXVERSIONFLAGS) | ||||
| CARGO = cargo | CARGO = cargo | ||||
| # Set this to e.g. "mingw32" to use a non-default compiler. | # Set this to e.g. "mingw32" to use a non-default compiler. | ||||
| COMPILER= | COMPILER= | ||||
| ('dist/lib/*.dll', 'lib/'), | ('dist/lib/*.dll', 'lib/'), | ||||
| ('dist/lib/*.pyd', 'lib/'), | ('dist/lib/*.pyd', 'lib/'), | ||||
| ('dist/lib/library.zip', 'lib/'), | ('dist/lib/library.zip', 'lib/'), | ||||
| ('dist/Microsoft.VC*.CRT.manifest', './'), | ('dist/Microsoft.VC*.CRT.manifest', './'), | ||||
| ('dist/msvc*.dll', './'), | ('dist/msvc*.dll', './'), | ||||
| ('dist/python*.dll', './'), | ('dist/python*.dll', './'), | ||||
| ('doc/*.html', 'doc/'), | ('doc/*.html', 'doc/'), | ||||
| ('doc/style.css', 'doc/'), | ('doc/style.css', 'doc/'), | ||||
| ('mercurial/help/**/*.txt', 'help/'), | ('mercurial/helptext/**/*.txt', 'helptext/'), | ||||
| ('mercurial/default.d/*.rc', 'hgrc.d/'), | ('mercurial/default.d/*.rc', 'hgrc.d/'), | ||||
| ('mercurial/locale/**/*', 'locale/'), | ('mercurial/locale/**/*', 'locale/'), | ||||
| ('mercurial/templates/**/*', 'Templates/'), | ('mercurial/templates/**/*', 'Templates/'), | ||||
| ('COPYING', 'Copying.txt'), | ('COPYING', 'Copying.txt'), | ||||
| ] | ] | ||||
| # List of paths to exclude from the staging area. | # List of paths to exclude from the staging area. | ||||
| STAGING_EXCLUDES = [ | STAGING_EXCLUDES = [ | ||||
| SOURCES=$(notdir $(wildcard ../mercurial/help/*.[0-9].txt)) | SOURCES=$(notdir $(wildcard ../mercurial/helptext/*.[0-9].txt)) | ||||
| MAN=$(SOURCES:%.txt=%) | MAN=$(SOURCES:%.txt=%) | ||||
| HTML=$(SOURCES:%.txt=%.html) | HTML=$(SOURCES:%.txt=%.html) | ||||
| GENDOC=gendoc.py ../mercurial/commands.py ../mercurial/help.py \ | 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 | PREFIX=/usr/local | ||||
| MANDIR=$(PREFIX)/share/man | MANDIR=$(PREFIX)/share/man | ||||
| INSTALL=install -c -m 644 | INSTALL=install -c -m 644 | ||||
| PYTHON?=python | PYTHON?=python | ||||
| RSTARGS= | RSTARGS= | ||||
| export HGENCODING=UTF-8 | export HGENCODING=UTF-8 | ||||
| # linelog - efficient cache for annotate data | # linelog - efficient cache for annotate data | ||||
| # | # | ||||
| # Copyright 2018 Google LLC. | # Copyright 2018 Google LLC. | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| """linelog is an efficient cache for annotate data inspired by SCCS Weaves. | """linelog is an efficient cache for annotate data inspired by SCCS Weaves. | ||||
| SCCS Weaves are an implementation of | SCCS Weaves are an implementation of | ||||
| https://en.wikipedia.org/wiki/Interleaved_deltas. See | 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. | and how linelog works in detail. | ||||
| Here's a hacker's summary: a linelog is a program which is executed in | Here's a hacker's summary: a linelog is a program which is executed in | ||||
| the context of a revision. Executing the program emits information | the context of a revision. Executing the program emits information | ||||
| about lines, including the revision that introduced them and the line | about lines, including the revision that introduced them and the line | ||||
| number in the file at the introducing revision. When an insertion or | number in the file at the introducing revision. When an insertion or | ||||
| deletion is performed on the file, a jump instruction is used to patch | deletion is performed on the file, a jump instruction is used to patch | ||||
| in a new body of annotate information. | in a new body of annotate information. | ||||