Commits

Giu...@puck  committed ea5ae4d

Add images.

  • Participants
  • Parent commits 124179f

Comments (0)

Files changed (26)

 clean:
 	rm -f $(web-local)/index-read.html.in
 	rm -rf $(obj-web)
+
+image-folder := figs
+# graphs, figures, screenshots
+image-files := $(wildcard $(image-folder)/*.dot $(image-folder)/*.svg $(image-folder)/*.png)
+# graphs
+image-dot := $(filter %.dot, $(image-files))
+# figures
+image-svg := $(filter %.svg, $(image-files))
+# screenshots
+image-png := $(filter %.png, $(image-files))
+
+figs-folder := examples/figs
+figs-web := \
+	$(image-dot:$(image-folder)/%.dot=$(figs-folder)/%.png) \
+	$(image-svg:$(image-folder)/%.svg=$(figs-folder)/%.png) \
+	$(image-png:$(image-folder)/%.png=$(figs-folder)/%.png)
+
+figs: $(figs-web)
+
+#$(figs-folder)/%.png: $(image-folder)/%.png $(image-folder)/%.svg
+$(figs-folder)/%.png: $(image-folder)/%.svg
+	inkscape -D -d 120 -e $@ $<
+
+$(figs-folder)/%.png: $(figs-folder)/%.svg
+	inkscape -D -d 120 -e $@ $<
+	rm $<
+
+$(figs-folder)/%.png: $(image-folder)/%.png
+	cp $< $@
+
+$(figs-folder)/%.svg: $(image-folder)/%.dot
+	dot -Tsvg -o $@ $<

File it/figs/bad-merge-1.dot

+digraph bad_merge_1 {
+	ancestor [label="1: antenato"];
+	left [label="2: mia modifica"];
+	right [label="3: vostra modifica"];
+	bad [label="4: unione sbagliata"];
+	new [label="5: nuova modifica"];
+
+	ancestor -> left;
+	ancestor -> right;
+	left -> bad;
+	right -> bad;
+	bad -> new;
+}

File it/figs/bad-merge-2.dot

+digraph bad_merge_2 {
+	ancestor [label="1: antenato",color=grey,fontcolor=grey];
+	left [label="2: mia modifica",color=grey,fontcolor=grey];
+	right [label="3: vostra modifica",color=grey,fontcolor=grey];
+	bad [label="4: unione sbagliata",color=grey,fontcolor=grey];
+	new [label="5: nuova modifica",color=grey,fontcolor=grey];
+
+	bak_left [label="6: ritiro n°1 della\nunione sbagliata",shape=box];
+
+	ancestor -> left [color=grey];
+	ancestor -> right [color=grey];
+	left -> bad [color=grey];
+	right -> bad [color=grey];
+	bad -> new [color=grey];
+
+	bad -> bak_left;
+	left -> bak_left [style=dotted,label="--parent=2"];
+}

File it/figs/bad-merge-3.dot

+digraph bad_merge_3 {
+	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
+	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
+	new [label="5: nuova modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+
+	bak_left [label="6: ritiro n°1 della\nunione sbagliata",color=grey,shape=box];
+	bak_right [label="8: ritiro n°2 della\nunione sbagliata",shape=box];
+
+	ancestor -> left [color="#bbbbbb"];
+	ancestor -> right [color="#bbbbbb"];
+	left -> bad [color="#bbbbbb"];
+	right -> bad [color="#bbbbbb"];
+	bad -> new [color="#bbbbbb"];
+
+	bad -> bak_left [color=grey];
+	left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
+
+	bad -> bak_right;
+	right -> bak_right [style=dotted,label="--parent=3"];
+}

File it/figs/bad-merge-4.dot

+digraph bad_merge_4 {
+	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
+	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
+	new [label="5: nuova modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+
+	bak_left [label="6: ritiro n°1 della\nunione sbagliata",color=grey,fontcolor=grey,shape=box];
+	bak_right [label="7: ritiro n°2 della\nunione sbagliata",color=grey,fontcolor=grey,shape=box];
+	good [label="8: unione\ndei ritiri",shape=box];
+
+	ancestor -> left [color="#bbbbbb"];
+	ancestor -> right [color="#bbbbbb"];
+	left -> bad [color="#bbbbbb"];
+	right -> bad [color="#bbbbbb"];
+	bad -> new [color="#bbbbbb"];
+
+	bad -> bak_left [color=grey];
+	left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
+
+	bad -> bak_right [color=grey];
+	right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey];
+
+	bak_left -> good;
+	bak_right -> good;
+}

File it/figs/bad-merge-5.dot

+digraph bad_merge_5 {
+	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
+	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
+	new [label="5: nuova modifica",color=grey,fontcolor=grey];
+
+	bak_left [label="6: ritiro n°1 della\nunione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
+	bak_right [label="7: ritiro n°2 della\nunione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
+	good [label="8: unione\ndei ritiri",color=grey,fontcolor=grey,shape=box];
+	last [label="9: unione con la\nnuova modifica",shape=box];
+
+	ancestor -> left [color="#bbbbbb"];
+	ancestor -> right [color="#bbbbbb"];
+	left -> bad [color="#bbbbbb"];
+	right -> bad [color="#bbbbbb"];
+	bad -> new [color="#bbbbbb"];
+
+	bad -> bak_left [color="#bbbbbb"];
+	left -> bak_left [style=dotted,label="--parent=2",color="#bbbbbb",fontcolor="#bbbbbb"];
+
+	bad -> bak_right [color="#bbbbbb"];
+	right -> bak_right [style=dotted,label="--parent=3",color="#bbbbbb",fontcolor="#bbbbbb"];
+
+	bak_left -> good [color=grey];
+	bak_right -> good [color=grey];
+
+	good -> last;
+	new -> last;
+}

File it/figs/feature-branches.dot

+digraph feature_branches {
+	principale -> cripto;
+	principale -> filesystem;
+	principale -> ipc;
+	principale -> memoria;
+	principale -> rete;
+	principale -> sicurezza;
+}

File it/figs/filelog.svg

Added
New image

File it/figs/metadata.svg

Added
New image

File it/figs/mq-stack.svg

Added
New image

File it/figs/revlog.svg

Added
New image

File it/figs/snapshot.svg

Added
New image

File it/figs/tour-history.svg

Added
New image

File it/figs/tour-merge-conflict.svg

Added
New image

File it/figs/tour-merge-merge.svg

Added
New image

File it/figs/tour-merge-pull.svg

Added
New image

File it/figs/tour-merge-sep-repos.svg

Added
New image

File it/figs/undo-manual-merge.dot

+digraph undo_manual {
+	"prima modifica" -> "seconda modifica";
+	"seconda modifica" -> "terza modifica";
+	backout [label="ritira la\nseconda modifica", shape=box];
+	"seconda modifica" -> backout;
+	"terza modifica" -> "unione\nmanuale";
+	backout -> "unione\nmanuale";
+}

File it/figs/undo-manual.dot

+digraph undo_manual {
+	"prima modifica" -> "seconda modifica";
+	"seconda modifica" -> "terza modifica";
+	backout [label="ritira la\nseconda modifica", shape=box];
+	"seconda modifica" -> backout;
+}

File it/figs/undo-non-tip.dot

+digraph undo_non_tip {
+	"prima modifica" -> "seconda modifica";
+	"seconda modifica" -> "terza modifica";
+	backout [label="ritira la\nseconda modifica", shape=box];
+	"seconda modifica" -> backout;
+	merge [label="unione\nautomatica", shape=box];
+	"terza modifica" -> merge;
+	backout -> merge;
+}

File it/figs/undo-simple.dot

+digraph undo_simple {
+	"prima modifica" -> "seconda modifica";
+	"seconda modifica" -> "ritira la\nseconda modifica";
+}

File it/figs/wdir-after-commit.svg

Added
New image

File it/figs/wdir-branch.svg

Added
New image

File it/figs/wdir-merge.svg

Added
New image

File it/figs/wdir-pre-branch.svg

Added
New image

File it/figs/wdir.svg

Added
New image