docs/makefile
author Kyle Lippincott <spectral@google.com>
Mon, 16 Sep 2019 12:44:38 -0700
changeset 4848 535ab2609e45
parent 4631 150be007f421
child 5226 38d225efcea9
permissions -rw-r--r--
cmdstate: introduce a "saver" contextmanager and use it in place of save() Previously, the state was only saved in some paths out of these functions. This can be problematic, if the user ctrl-c's (or `kill -9`'s) the process, or we exit out of `relocate` for anything besides the "expected" reason, we won't record that we were in the middle of an evolve. One of our users has discovered that this leaves hg in a weird state; the user did something like this: ``` $ hg evolve <something goes wrong with the merge tool, hits ctrl-c> <deals with the merge conflicts> $ hg evolve --continue abort: no interrupted evolve to continue $ hg evolve abort: uncommitted changes # Note: commands.status.verbose=True is set. $ hg status M foo # The repository is in an unfinished *update* state. # No unresolved merge conflicts # To continue: hg update ``` The user did an `hg update`, but it didn't actually do anything besides take it out of the unfinished update state (the files were still dirty in the working directory).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4631
150be007f421 docs: add SPHINXBUILD make variable
Faheem Mitha <faheem@faheem.info>
parents: 2960
diff changeset
     1
SPHINXBUILD ?= sphinx-build
233
9e153a9101c3 [doc] add a simple make file
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
     2
2824
d0e3a8e0b62c docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents: 765
diff changeset
     3
all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
4631
150be007f421 docs: add SPHINXBUILD make variable
Faheem Mitha <faheem@faheem.info>
parents: 2960
diff changeset
     4
	$(SPHINXBUILD) . ../html/
233
9e153a9101c3 [doc] add a simple make file
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
     5
2960
1a4f26eec0af test2rst: ignore the #if/#endif line in the output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2824
diff changeset
     6
tutorials/tutorial.rst: tutorials/tutorial.t test2rst.py
235
8469ccb9550f [doc] add `.t` to `.rst` converteur
Pierre-Yves.David@ens-lyon.org
parents: 233
diff changeset
     7
	python test2rst.py tutorials/
557
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 242
diff changeset
     8
2960
1a4f26eec0af test2rst: ignore the #if/#endif line in the output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2824
diff changeset
     9
tutorials/topic-tutorial.rst: tutorials/topic-tutorial.t test2rst.py
2824
d0e3a8e0b62c docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents: 765
diff changeset
    10
	python test2rst.py tutorials/
d0e3a8e0b62c docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents: 765
diff changeset
    11
558
11c5f734d64e docs: fix makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 557
diff changeset
    12
static/logo-evolve.ico: static/logo-evolve.svg
557
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 242
diff changeset
    13
	convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico