upstream/mercurial-mirror Files · doc/Makefile

split: new extension to split changesets...

split: new extension to split changesets This diff introduces an experimental split extension to split changesets. The implementation is largely inspired by Laurent Charignon's implementation for mutable-history (changeset [1]) This version contains various improvements: - Rebase by default. This is more friendly for new users. Split won't lead to merge conflicts so a rebase won't give the user more trouble. This has been on by default at Facebook for months now and seems to be a good UX improvement. The rebase skips obsoleted or orphaned changesets, which can avoid issues like allowdivergence, merge conflicts, etc. This is more flexible because the user can decide what to do next (see the last test case in test-split.t) - Remove "Done split? [y/n]" prompt. That could be detected by checking `repo.status()` instead. - Works with obsstore disabled. Without obsstore, split uses strip to clean up old nodes, and it can even handle split a non-head changeset with "allowunstable" disabled, since it runs a rebase to solve the "unstable" issue in a same transaction. - More friendly editor text. Put what has been already split into the editor text so users won't lost track about where they are. [1]: https://bitbucket.org/marmoute/mutable-history/commits/9603aa1ecdfd54b Differential Revision: https://phab.mercurial-scm.org/D1082

muxator - - Load All Authors

File last commit:

r34623:b584ed1b default


                r35471:02ea370c

@7 default

Download file

             Makefile
        
                    47 lines
            
             | 1.2 KiB
            
                | text/x-makefile
            
             |
                MakefileLexer
            
             / doc / Makefile
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Takumi IINO
    
doc: make man and html from translated documents...

              r19426
            
      SOURCES=$(notdir $(wildcard ../mercurial/help/*.[0-9].txt))

        Bryan O'Sullivan
    
Move hgrc documentation out to its own man page, hgrc(5)....

              r671
            
      MAN=$(SOURCES:%.txt=%)

      HTML=$(SOURCES:%.txt=%.html)

        Martin Geisler
    
doc/Makefile: docs now also depend on extensions...

              r12921
            
      GENDOC=gendoc.py ../mercurial/commands.py ../mercurial/help.py \

      	../mercurial/help/*.txt ../hgext/*.py ../hgext/*/__init__.py

        wilde@trapperkeeper.sha-bang.de
    
Added install target.

              r2233
            
      PREFIX=/usr/local

        Jonathan Smith <https://issues.rpath.com/>
    
install man pages by default into $(PREFIX)/share/man not $(PREFIX)/man since the FHS puts them there

              r4030
            
      MANDIR=$(PREFIX)/share/man

        Christian Ebert
    
Do not install executable man pages...

              r7686
            
      INSTALL=install -c -m 644

        Dirkjan Ochtman
    
use ${PYTHON} var in doc/Makefile as well

              r6724
            
      PYTHON=python

        Nicolas Dumazet
    
runrst: add RSTARGS Makefile variable to allow customization...

              r13054
            
      RSTARGS=

        mpm@selenic.com
    
Add a doc makefile...

              r465
            
        Takumi IINO
    
doc: make i18n man and html...

              r19427
            
      export HGENCODING=UTF-8

        Martin Geisler
    
doc/Makefile: ensure C locale...

              r9971
            
        Thomas Arendsen Hein
    
Generate html documentation by default, too.

              r1006
            
      all: man html

        mpm@selenic.com
    
Add a doc makefile...

              r465
            
      man: $(MAN)

      html: $(HTML)

        Takumi IINO
    
doc: make man and html from translated documents...

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

        muxator
    
build: make install in "/doc" failed if the destination dir contained spaces...

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

        Martin Geisler
    
doc/Makefile: do not create files in case of errors...

              r9444
            
      	mv $@.tmp $@

        Benoit Boissinot
    
generate hg manpage from commands.py docstring...

              r1814
            
        Takumi IINO
    
doc: make man and html from translated documents...

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

        Nicolas Dumazet
    
runrst: add RSTARGS Makefile variable to allow customization...

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

        Martin Geisler
    
doc/Makefile: make rst2html and rst2man halt on warnings

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

        mpm@selenic.com
    
Add a doc makefile...

              r465
            
        Takumi IINO
    
doc: make man and html from translated documents...

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

        Nicolas Dumazet
    
runrst: add RSTARGS Makefile variable to allow customization...

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

        Martin Geisler
    
doc: add a style sheet to the generated HTML pages

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

        mpm@selenic.com
    
Add a doc makefile...

              r465
            
        Benoit Boissinot
    
fix MANIFEST generation

              r3872
            
      MANIFEST: man html

        Mads Kiilerich
    
doc/Makefile: Don't show Makefile comments in output...

              r9401
            
      # tracked files are already in the main MANIFEST

        Benoit Boissinot
    
fix MANIFEST generation

              r3872
            
      	$(RM) $@

        Martin Geisler
    
doc/Makefile: do not include hg.1.gendoc.txt in MANIFEST...

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

        Benoit Boissinot
    
fix MANIFEST generation

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

      	done

        wilde@trapperkeeper.sha-bang.de
    
Added install target.

              r2233
            
      install: man

      	for i in $(MAN) ; do \

        Cédric Duval
    
doc: fix regexp for determining the man page section...

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

        muxator
    
build: make install in "/doc" failed if the destination dir contained spaces...

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

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

        wilde@trapperkeeper.sha-bang.de
    
Added install target.

              r2233
            
      	done

        mpm@selenic.com
    
Add a doc makefile...

              r465
            
      clean:

        Takumi IINO
    
doc: make man and html from translated documents...

              r19426
            
      	$(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

Takumi IINO doc: make man and html from translated documents...	r19426	SOURCES=$(notdir $(wildcard ../mercurial/help/*.[0-9].txt))
Bryan O'Sullivan Move hgrc documentation out to its own man page, hgrc(5)....	r671	MAN=$(SOURCES:%.txt=%)
		HTML=$(SOURCES:%.txt=%.html)
Martin Geisler doc/Makefile: docs now also depend on extensions...	r12921	GENDOC=gendoc.py ../mercurial/commands.py ../mercurial/help.py \
		../mercurial/help/.txt ../hgext/.py ../hgext/*/__init__.py
wilde@trapperkeeper.sha-bang.de Added install target.	r2233	PREFIX=/usr/local
Jonathan Smith <https://issues.rpath.com/> install man pages by default into $(PREFIX)/share/man not $(PREFIX)/man since the FHS puts them there	r4030	MANDIR=$(PREFIX)/share/man
Christian Ebert Do not install executable man pages...	r7686	INSTALL=install -c -m 644
Dirkjan Ochtman use ${PYTHON} var in doc/Makefile as well	r6724	PYTHON=python
Nicolas Dumazet runrst: add RSTARGS Makefile variable to allow customization...	r13054	RSTARGS=
mpm@selenic.com Add a doc makefile...	r465
Takumi IINO doc: make i18n man and html...	r19427	export HGENCODING=UTF-8
Martin Geisler doc/Makefile: ensure C locale...	r9971
Thomas Arendsen Hein Generate html documentation by default, too.	r1006	all: man html
mpm@selenic.com Add a doc makefile...	r465
		man: $(MAN)

		html: $(HTML)

Takumi IINO doc: make man and html from translated documents...	r19426	common.txt $(SOURCES) $(SOURCES:%.txt=%.gendoc.txt): $(GENDOC)
muxator build: make install in "/doc" failed if the destination dir contained spaces...	r34623	${PYTHON} gendoc.py "$(basename $@)" > $@.tmp
Martin Geisler doc/Makefile: do not create files in case of errors...	r9444	mv $@.tmp $@
Benoit Boissinot generate hg manpage from commands.py docstring...	r1814
Takumi IINO doc: make man and html from translated documents...	r19426	%: %.txt %.gendoc.txt common.txt
Nicolas Dumazet runrst: add RSTARGS Makefile variable to allow customization...	r13054	$(PYTHON) runrst hgmanpage $(RSTARGS) --halt warning \
Martin Geisler doc/Makefile: make rst2html and rst2man halt on warnings	r9445	--strip-elements-with-class htmlonly $.txt $
mpm@selenic.com Add a doc makefile...	r465
Takumi IINO doc: make man and html from translated documents...	r19426	%.html: %.txt %.gendoc.txt common.txt
Nicolas Dumazet runrst: add RSTARGS Makefile variable to allow customization...	r13054	$(PYTHON) runrst html $(RSTARGS) --halt warning \
Martin Geisler doc: add a style sheet to the generated HTML pages	r9626	--link-stylesheet --stylesheet-path style.css $.txt $.html
mpm@selenic.com Add a doc makefile...	r465
Benoit Boissinot fix MANIFEST generation	r3872	MANIFEST: man html
Mads Kiilerich doc/Makefile: Don't show Makefile comments in output...	r9401	# tracked files are already in the main MANIFEST
Benoit Boissinot fix MANIFEST generation	r3872	$(RM) $@
Martin Geisler doc/Makefile: do not include hg.1.gendoc.txt in MANIFEST...	r12841	for i in $(MAN) $(HTML); do \
Benoit Boissinot fix MANIFEST generation	r3872	echo "doc/$$i" >> $@ ; \
		done

wilde@trapperkeeper.sha-bang.de Added install target.	r2233	install: man
		for i in $(MAN) ; do \
Cédric Duval doc: fix regexp for determining the man page section...	r8822	subdir=`echo $$i \| sed -n 's/^.*\.\([0-9]\)$$/man\1/p'` ; \
muxator build: make install in "/doc" failed if the destination dir contained spaces...	r34623	mkdir -p "$(DESTDIR)$(MANDIR)"/$$subdir ; \
		$(INSTALL) $$i "$(DESTDIR)$(MANDIR)"/$$subdir ; \
wilde@trapperkeeper.sha-bang.de Added install target.	r2233	done

mpm@selenic.com Add a doc makefile...	r465	clean:
Takumi IINO doc: make man and html from translated documents...	r19426	$(RM) $(MAN) $(HTML) common.txt $(SOURCES) $(SOURCES:%.txt=%.gendoc.txt) MANIFEST