Initial setup

-------------

This Mercurial configuration example is used for testing.

.. Various setup

  $ cat >> $HGRCPATH << EOF

  > [ui]

  > # This is change the default output of log for clear tutorial

  > logtemplate ="{node|short} ({phase}): {desc}\n"

  > [diff]

  > # use "git" diff format, clearer and smarter format

  > git = 1

  > [alias]

  > # "-d '0 0'" means that the new commit will be at January 1st 1970.

  > # This is used for stable hash during test

  > # (this tutorial is automatically tested.)

  > amend = amend -d '0 0'

  > EOF

  $ hg init local

  $ cat >> local/.hg/hgrc << EOF

  > [paths]

  > remote = ../remote

  > other = ../other

  > [ui]

  > user = Babar the King

  > EOF

  $ hg init remote

  $ cat >> remote/.hg/hgrc << EOF

  > [paths]

  > local = ../local

  > [ui]

  > user = Celestine the Queen

  > EOF

  $ hg init other

  $ cat >> other/.hg/hgrc << EOF

  > [ui]

  > user = Princess Flore

  > EOF

This tutorial uses the following configuration for Mercurial:

A compact log template with phase data:

  $ hg showconfig ui | grep log

  ui.logtemplate="{node|short} ({phase}): {desc}\n"

Improved git format diff:

  $ hg showconfig diff

  diff.git=1

And of course, we enable the experimental extensions for mutable history:

  $ cat >> $HGRCPATH <<EOF

  > [extensions]

  > evolve = $TESTDIR/../hgext3rd/evolve/

  > # enabling rebase is also needed for now

  > rebase =

  > EOF

#if docgraph-ext

  $ . "$TESTDIR/testlib/docgraph_setup.sh" #rest-ignore

#endif

-----------------------

Single Developer Usage

-----------------------

This tutorial shows how to use evolution to rewrite history locally.

Fixing mistake with `hg amend`

--------------------------------

We are versioning a shopping list

  $ cd local

  $ cat  >> shopping << EOF

  > Spam

  > Whizzo butter

  > Albatross

  > Rat (rather a lot)

  > Jugged fish

  > Blancmange

  > Salmon mousse

  > EOF

  $ hg commit -A -m "Monthy Python Shopping list"

  adding shopping

Its first version is shared with the outside.

  $ hg push remote

  pushing to $TESTTMP/remote (glob)

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files

Later I add additional item to my list

  $ cat >> shopping << EOF

  > Egg

  > Suggar

  > Vinegar

  > Oil

  > EOF

  $ hg commit -m "adding condiment"

  $ cat >> shopping << EOF

  > Bananos

  > Pear

  > Apple

  > EOF

  $ hg commit -m "adding fruit"

This history is very linear

  $ hg log -G

  @  d85de4546133 (draft): adding fruit

  |

  o  4d5dc8187023 (draft): adding condiment

  |

  o  7e82d3f3c2cb (public): Monthy Python Shopping list

#if docgraph-ext

  $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore

  .. graphviz::

      strict digraph  {

      	graph [rankdir=LR,

      		splines=polyline

      	];

      	node [label="\N"];

      	0	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="0: 7e82d3f3c2cb",

      		pin=true,

      		pos="1,0!",

      		shape=circle,

      		style=filled,

      		width=2];

      	1	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="1: 4d5dc8187023",

      		pin=true,

      		pos="1,1!",

      		shape=pentagon,

      		style=filled,

      		width=2];

      	0 -> 1;

      	2	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="2: d85de4546133",

      		pin=true,

      		pos="1,2!",

      		shape=pentagon,

      		style=filled,

      		width=2];

      	1 -> 2;

      }

#endif

But a typo was made in Babanas!

  $ hg export tip

  # HG changeset patch

  # User test

  # Date 0 0

  #      Thu Jan 01 00:00:00 1970 +0000

  # Node ID d85de4546133030c82d257bbcdd9b1b416d0c31c

  # Parent  4d5dc81870237d492284826e21840b2ca00e26d1

  adding fruit

  diff --git a/shopping b/shopping

  --- a/shopping

  +++ b/shopping

  @@ -9,3 +9,6 @@

   Suggar

   Vinegar

   Oil

  +Bananos

  +Pear

  +Apple

The faulty changeset is in the "draft" phase because it has not been exchanged with

the outside. The first one has been exchanged and is "public" (immutable).

  $ hg log -G

  @  d85de4546133 (draft): adding fruit

  |

  o  4d5dc8187023 (draft): adding condiment

  |

  o  7e82d3f3c2cb (public): Monthy Python Shopping list

#if docgraph-ext

  $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore

  .. graphviz::

      strict digraph  {

      	graph [rankdir=LR,

      		splines=polyline

      	];

      	node [label="\N"];

      	0	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="0: 7e82d3f3c2cb",

      		pin=true,

      		pos="1,0!",

      		shape=circle,

      		style=filled,

      		width=2];

      	1	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="1: 4d5dc8187023",

      		pin=true,

      		pos="1,1!",

      		shape=pentagon,

      		style=filled,

      		width=2];

      	0 -> 1;

      	2	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="2: d85de4546133",

      		pin=true,

      		pos="1,2!",

      		shape=pentagon,

      		style=filled,

      		width=2];

      	1 -> 2;

      }

#endif

Hopefully. I can use `hg commit --amend` to rewrite my faulty changeset!

  $ sed -i'' -e s/Bananos/Banana/ shopping

  $ hg diff

  diff --git a/shopping b/shopping

  --- a/shopping

  +++ b/shopping

  @@ -9,6 +9,6 @@

   Suggar

   Vinegar

   Oil

  -Bananos

  +Banana

   Pear

   Apple

  $ hg commit --amend

A new changeset with the right diff replace the wrong one.

  $ hg log -G

  @  9d0363b81950 (draft): adding fruit

  |

  o  4d5dc8187023 (draft): adding condiment

  |

  o  7e82d3f3c2cb (public): Monthy Python Shopping list

#if docgraph-ext

  $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore

  .. graphviz::

      strict digraph  {

      	graph [rankdir=LR,

      		splines=polyline

      	];

      	node [label="\N"];

      	0	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="0: 7e82d3f3c2cb",

      		pin=true,

      		pos="1,0!",

      		shape=circle,

      		style=filled,

      		width=2];

      	1	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="1: 4d5dc8187023",

      		pin=true,

      		pos="1,1!",

      		shape=pentagon,

      		style=filled,

      		width=2];

      	0 -> 1;

      	3	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="3: 9d0363b81950",

      		pin=true,

      		pos="1,3!",

      		shape=pentagon,

      		style=filled,

      		width=2];

      	1 -> 3;

      }

#endif

  $ hg export tip

  # HG changeset patch

  # User test

  # Date 0 0

  #      Thu Jan 01 00:00:00 1970 +0000

  # Node ID 9d0363b81950646bc6ad1ec5de8b8197ea586541

  # Parent  4d5dc81870237d492284826e21840b2ca00e26d1

  adding fruit

  diff --git a/shopping b/shopping

  --- a/shopping

  +++ b/shopping

  @@ -9,3 +9,6 @@

   Suggar

   Vinegar

   Oil

  +Banana

  +Pear

  +Apple

Getting rid of branchy history

----------------------------------

While I was working on my list. Someone made a change remotely.

  $ cd ../remote

  $ hg up -q

  $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping

  $ hg ci -m 'SPAM'

  $ cd ../local

I'll get this remote changeset when pulling

  $ hg pull remote

  pulling from $TESTTMP/remote (glob)

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files (+1 heads)

  (run 'hg heads' to see heads, 'hg merge' to merge)

I now have a new head. Note that this remote head is immutable.

  $ hg log -G

  o  9ca060c80d74 (public): SPAM

  |

  | @  9d0363b81950 (draft): adding fruit

  | |

  | o  4d5dc8187023 (draft): adding condiment

  |/

  o  7e82d3f3c2cb (public): Monthy Python Shopping list

#if docgraph-ext

  $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore

  .. graphviz::

      strict digraph  {

      	graph [rankdir=LR,

      		splines=polyline

      	];

      	node [label="\N"];

      	0	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="0: 7e82d3f3c2cb",

      		pin=true,

      		pos="1,0!",

      		shape=circle,

      		style=filled,

      		width=2];

      	1	 [fillcolor="#7F7FFF",

      		fixedsize=true,

      		group=default,

      		height=2,

      		label="1: 4d5dc8187023",

      		pin=true,