upstream/mercurial-mirror Files · doc/Makefile

tests: update annotate tests to work around simplemerge bug...

tests: update annotate tests to work around simplemerge bug test-annotate.t and test-fastannotate.hg were failing with --pure since (copies: calculate mergecopies() based on pathcopies(), 2019-04-11). It turned out to be because the pure file merge code behaved differently. I'm guessing it's the mdiff.get_matching_blocks() that behaves differently, but I haven't confirmed that. With this content in the base: a a a And this on the local side: a z a And this on the other side: a a a b4 c b6 It produced this conflict: a z a <<<<<<< working copy: - test: c ||||||| base a ======= a b4 c b5 >>>>>>> merge rev: - test: mergeb I don't care enough about the pure Python code to fix it, so this patch just updates the tests to manually resolve the conflict. Differential Revision: https://phab.mercurial-scm.org/D6351

Philippe Pepiot - - Load All Authors

File last commit:

r42225:ec7b478f default


                r42446:d5b35d69

default

Download file

             Makefile
        
                    48 lines
            
             | 1.3 KiB
            
                | text/x-makefile
            
             |
                MakefileLexer
            
             / doc / Makefile
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      SOURCES=$(notdir $(wildcard ../mercurial/help/*.[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

      PREFIX=/usr/local

      MANDIR=$(PREFIX)/share/man

      INSTALL=install -c -m 644

      PYTHON?=python

      RSTARGS=

      export HGENCODING=UTF-8

      all: man html

      man: $(MAN)

      html: $(HTML)

      # This logic is duplicated in setup.py:hgbuilddoc()

      common.txt $(SOURCES) $(SOURCES:%.txt=%.gendoc.txt): $(GENDOC)

      	${PYTHON} gendoc.py "$(basename $@)" > $@.tmp

      	mv $@.tmp $@

      %: %.txt %.gendoc.txt common.txt

      	$(PYTHON) runrst hgmanpage $(RSTARGS) --halt warning \

      	  --strip-elements-with-class htmlonly $*.txt $*

      %.html: %.txt %.gendoc.txt common.txt

      	$(PYTHON) runrst html $(RSTARGS) --halt warning \

      	  --link-stylesheet --stylesheet-path style.css $*.txt $*.html

      MANIFEST: man html

      # tracked files are already in the main MANIFEST

      	$(RM) $@

      	for i in $(MAN) $(HTML); do \

      	  echo "doc/$$i" >> $@ ; \

      	done

      install: man

      	for i in $(MAN) ; do \

      	  subdir=`echo $$i | sed -n 's/^.*\.\([0-9]\)$$/man\1/p'` ; \

      	  mkdir -p "$(DESTDIR)$(MANDIR)"/$$subdir ; \

      	  $(INSTALL) $$i "$(DESTDIR)$(MANDIR)"/$$subdir ; \

      	done

      clean:

      	$(RM) $(MAN) $(HTML) common.txt $(SOURCES) $(SOURCES:%.txt=%.gendoc.txt) MANIFEST

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				SOURCES=$(notdir $(wildcard ../mercurial/help/*.[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
				PREFIX=/usr/local
				MANDIR=$(PREFIX)/share/man
				INSTALL=install -c -m 644
				PYTHON?=python
				RSTARGS=

				export HGENCODING=UTF-8

				all: man html

				man: $(MAN)

				html: $(HTML)

				# This logic is duplicated in setup.py:hgbuilddoc()
				common.txt $(SOURCES) $(SOURCES:%.txt=%.gendoc.txt): $(GENDOC)
				${PYTHON} gendoc.py "$(basename $@)" > $@.tmp
				mv $@.tmp $@

				%: %.txt %.gendoc.txt common.txt
				$(PYTHON) runrst hgmanpage $(RSTARGS) --halt warning \
				--strip-elements-with-class htmlonly $.txt $

				%.html: %.txt %.gendoc.txt common.txt
				$(PYTHON) runrst html $(RSTARGS) --halt warning \
				--link-stylesheet --stylesheet-path style.css $.txt $.html

				MANIFEST: man html
				# tracked files are already in the main MANIFEST
				$(RM) $@
				for i in $(MAN) $(HTML); do \
				echo "doc/$$i" >> $@ ; \
				done

				install: man
				for i in $(MAN) ; do \
				subdir=`echo $$i \| sed -n 's/^.*\.\([0-9]\)$$/man\1/p'` ; \
				mkdir -p "$(DESTDIR)$(MANDIR)"/$$subdir ; \
				$(INSTALL) $$i "$(DESTDIR)$(MANDIR)"/$$subdir ; \
				done

				clean:
				$(RM) $(MAN) $(HTML) common.txt $(SOURCES) $(SOURCES:%.txt=%.gendoc.txt) MANIFEST