Mercurial > evolve
annotate docs/makefile @ 6889:a66cf9008781
obslog: also display patch for rebased changesets
This applies the same logic that is used for "merge-diff" to rebased
changesets. The successors' content is compared to the content of the
predecessors rebased in-memory on the new parents.
This highlights the changes that were actually introduced while rebasing (like
conflict resolution or API adjustment).
As a side effect, obslog now also outputs slightly more diffs for splits,
showing what parts of the original big changeset were moved to the smaller
split components (but for now it only works for the first few changesets).
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 22 Sep 2024 02:58:54 +0200 |
parents | 5affbb44f135 |
children |
rev | line source |
---|---|
5663
5affbb44f135
packaging: run sphinx on py3 by default
Anton Shestakov <av6@dwimlabs.net>
parents:
5660
diff
changeset
|
1 SPHINXBUILD ?= python3 -m sphinx -b html |
233 | 2 |
5386
77729ad7cb0c
makefile: make all non-file targets phony
Anton Shestakov <av6@dwimlabs.net>
parents:
4631
diff
changeset
|
3 .PHONY: all |
2824
d0e3a8e0b62c
docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents:
765
diff
changeset
|
4 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
|
5 $(SPHINXBUILD) . ../html/ |
233 | 6 |
2960
1a4f26eec0af
test2rst: ignore the #if/#endif line in the output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2824
diff
changeset
|
7 tutorials/tutorial.rst: tutorials/tutorial.t test2rst.py |
5660 | 8 python3 test2rst.py $< |
557
41688ca951e7
doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
242
diff
changeset
|
9 |
2960
1a4f26eec0af
test2rst: ignore the #if/#endif line in the output
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2824
diff
changeset
|
10 tutorials/topic-tutorial.rst: tutorials/topic-tutorial.t test2rst.py |
5660 | 11 python3 test2rst.py $< |
2824
d0e3a8e0b62c
docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents:
765
diff
changeset
|
12 |
558
11c5f734d64e
docs: fix makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
557
diff
changeset
|
13 static/logo-evolve.ico: static/logo-evolve.svg |
5387
6664e9f44bca
makefile: use fancy automatic variables
Anton Shestakov <av6@dwimlabs.net>
parents:
5386
diff
changeset
|
14 convert -resize 36x36 $< $@ |
5406
187bd6ade465
packaging: move docs cleanup target from debian/rules to docs/makefile
Anton Shestakov <av6@dwimlabs.net>
parents:
5387
diff
changeset
|
15 |
187bd6ade465
packaging: move docs cleanup target from debian/rules to docs/makefile
Anton Shestakov <av6@dwimlabs.net>
parents:
5387
diff
changeset
|
16 .PHONY: clean |
187bd6ade465
packaging: move docs cleanup target from debian/rules to docs/makefile
Anton Shestakov <av6@dwimlabs.net>
parents:
5387
diff
changeset
|
17 clean: |
187bd6ade465
packaging: move docs cleanup target from debian/rules to docs/makefile
Anton Shestakov <av6@dwimlabs.net>
parents:
5387
diff
changeset
|
18 rm -rf ../html |
187bd6ade465
packaging: move docs cleanup target from debian/rules to docs/makefile
Anton Shestakov <av6@dwimlabs.net>
parents:
5387
diff
changeset
|
19 rm -f static/logo-evolve.ico |
187bd6ade465
packaging: move docs cleanup target from debian/rules to docs/makefile
Anton Shestakov <av6@dwimlabs.net>
parents:
5387
diff
changeset
|
20 rm -f tutorials/tutorial.rst |
187bd6ade465
packaging: move docs cleanup target from debian/rules to docs/makefile
Anton Shestakov <av6@dwimlabs.net>
parents:
5387
diff
changeset
|
21 rm -f tutorials/topic-tutorial.rst |