evolve: comparison tests/test-sharing.t

equal deleted inserted replaced

-:0fad1d376814
+:44f340c2a8eb
 Setting things up
 $ cat >> $HGRCPATH <<EOF
 > [alias]
-> shortlog = log --template '{rev}:{node|short}  {phase}  {desc|firstline}\n'
+> shortlog = log --template '{rev}:{node|shortest}  {phase}  {desc|firstline}\n'
 > [extensions]
 > rebase =
 > EOF
 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 $ hg init public
 $ hg commit -m'prelim change'
 $ hg push -q ../test-repo
 Figure SG01 (roughly)
 $ hg shortlog -G
-@  1:f6490818a721  draft  prelim change
+@  1:f649  draft  prelim change
 |
-o  0:0dc9c9f6ab91  public  create new project
+o  0:0dc9  public  create new project
 Now let's switch to test-repo to test our change and amend::
 $ cd ../test-repo
 $ hg update -q
 $ echo 'Fix fix fix.' > file1
 $ hg amend -m'fix bug 37'
 Figure SG02
 $ hg shortlog --hidden -G
-@  2:60ffde5765c5  draft  fix bug 37
+@  2:60ff  draft  fix bug 37
 |
-| x  1:f6490818a721  draft  prelim change
+| x  1:f649  draft  prelim change
 |/
-o  0:0dc9c9f6ab91  public  create new project
+o  0:0dc9  public  create new project
 Pull into dev-repo: obsolescence markers are transferred, but not
 the new obsolete changeset.
 $ cd ../dev-repo
 $ hg pull -u
 updated to "60ffde5765c5: fix bug 37"
 1 other heads for branch "default"
 Figure SG03
 $ hg shortlog --hidden -G
-@  2:60ffde5765c5  draft  fix bug 37
+@  2:60ff  draft  fix bug 37
 |
-| x  1:f6490818a721  draft  prelim change
+| x  1:f649  draft  prelim change
 |/
-o  0:0dc9c9f6ab91  public  create new project
+o  0:0dc9  public  create new project
 Amend again in dev-repo
 $ echo 'Fix, fix, and fix.' > file1
 $ hg amend
 $ hg push -q
 Figure SG04 (dev-repo)
 $ hg shortlog --hidden -G
-@  3:de6151c48e1c  draft  fix bug 37
+@  3:de61  draft  fix bug 37
 |
-| x  2:60ffde5765c5  draft  fix bug 37
+| x  2:60ff  draft  fix bug 37
 |/
-| x  1:f6490818a721  draft  prelim change
+| x  1:f649  draft  prelim change
 |/
-o  0:0dc9c9f6ab91  public  create new project
+o  0:0dc9  public  create new project
 Figure SG04 (test-repo)
 $ cd ../test-repo
 $ hg update
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 updated to "de6151c48e1c: fix bug 37"
 1 other heads for branch "default"
 $ hg shortlog --hidden -G
-@  3:de6151c48e1c  draft  fix bug 37
+@  3:de61  draft  fix bug 37
 |
-| x  2:60ffde5765c5  draft  fix bug 37
+| x  2:60ff  draft  fix bug 37
 |/
-| x  1:f6490818a721  draft  prelim change
+| x  1:f649  draft  prelim change
 |/
-o  0:0dc9c9f6ab91  public  create new project
+o  0:0dc9  public  create new project
 This bug fix is finished. We can push it to the public repository.
 $ hg push
 pushing to $TESTTMP/public (glob)
 searching for changes
 (see 'hg help phases' for details)
 [255]
 Figure SG05
 $ hg -R ../public shortlog -G
-o  1:de6151c48e1c  public  fix bug 37
+o  1:de61  public  fix bug 37
 |
-o  0:0dc9c9f6ab91  public  create new project
+o  0:0dc9  public  create new project
 Oops, still have draft changesets in dev-repo: push the phase change there.
 $ hg -R ../dev-repo shortlog -r 'draft()'
-3:de6151c48e1c  draft  fix bug 37
+3:de61  draft  fix bug 37
 $ hg push ../dev-repo
 pushing to ../dev-repo
 searching for changes
 no changes found
 [1]
 $ hg -R ../review bookmarks
 bug15                     3:cbdfbd5a5db2
 Figure SG06: review repository after Alice pushes her amended changeset.
 $ hg --hidden -R ../review shortlog -G -r 1::
-o  3:cbdfbd5a5db2  draft  fix bug 15 (v2)
+o  3:cbdf  draft  fix bug 15 (v2)
 |
-| x  2:f91e97234c2b  draft  fix bug 15 (v1)
+| x  2:f91e  draft  fix bug 15 (v1)
 |/
-@  1:de6151c48e1c  public  fix bug 37
+@  1:de61  public  fix bug 37
 |
 ~
 Bob commits a draft changeset, pushes to review repo.
 $ cd ../bob
 bug15                     3:cbdfbd5a5db2
 featureX                  6:540ba8f317e6
 Figure SG07: review and public repos after Bob implements feature X.
 $ hg --hidden -R ../review shortlog -G -r 1::
-o  6:540ba8f317e6  public  implement feature X (v3)
+o  6:540b  public  implement feature X (v3)
 |
-| x  5:0eb74a7b6698  draft  implement feature X (v2)
+| x  5:0eb7  draft  implement feature X (v2)
 |/
-| x  4:193657d1e852  draft  implement feature X (v1)
+| x  4:1936  draft  implement feature X (v1)
 |/
-| o  3:cbdfbd5a5db2  draft  fix bug 15 (v2)
+| o  3:cbdf  draft  fix bug 15 (v2)
 |/
-| x  2:f91e97234c2b  draft  fix bug 15 (v1)
+| x  2:f91e  draft  fix bug 15 (v1)
 |/
-@  1:de6151c48e1c  public  fix bug 37
+@  1:de61  public  fix bug 37
 |
 ~
 $ hg --hidden -R ../public shortlog -G -r 1::
-o  2:540ba8f317e6  public  implement feature X (v3)
+o  2:540b  public  implement feature X (v3)
 |
-o  1:de6151c48e1c  public  fix bug 37
+o  1:de61  public  fix bug 37
 |
 ~
 How do things look in the review repo?
 $ cd ../review
 $ hg --hidden shortlog -G -r 1::
-o  6:540ba8f317e6  public  implement feature X (v3)
+o  6:540b  public  implement feature X (v3)
 |
-| x  5:0eb74a7b6698  draft  implement feature X (v2)
+| x  5:0eb7  draft  implement feature X (v2)
 |/
-| x  4:193657d1e852  draft  implement feature X (v1)
+| x  4:1936  draft  implement feature X (v1)
 |/
-| o  3:cbdfbd5a5db2  draft  fix bug 15 (v2)
+| o  3:cbdf  draft  fix bug 15 (v2)
 |/
-| x  2:f91e97234c2b  draft  fix bug 15 (v1)
+| x  2:f91e  draft  fix bug 15 (v1)
 |/
-@  1:de6151c48e1c  public  fix bug 37
+@  1:de61  public  fix bug 37
 |
 ~
 Meantime, Alice is back from lunch. While she was away, Bob approved
 her change, so now she can publish it.
 $ cd ../alice
 $ hg --hidden shortlog -G -r 1::
-@  3:cbdfbd5a5db2  draft  fix bug 15 (v2)
+@  3:cbdf  draft  fix bug 15 (v2)
 |
-| x  2:f91e97234c2b  draft  fix bug 15 (v1)
+| x  2:f91e  draft  fix bug 15 (v1)
 |/
-o  1:de6151c48e1c  public  fix bug 37
+o  1:de61  public  fix bug 37
 |
 ~
 $ hg outgoing -q ../public
 3:cbdfbd5a5db2
 $ hg push ../public
 ~
 @  3:cbdfbd5a5db2
 |
 ~
 $ hg --hidden shortlog -G -r 1::
-o  4:540ba8f317e6  public  implement feature X (v3)
+o  4:540b  public  implement feature X (v3)
 |
-| @  3:cbdfbd5a5db2  draft  fix bug 15 (v2)
+| @  3:cbdf  draft  fix bug 15 (v2)
 |/
-| x  2:f91e97234c2b  draft  fix bug 15 (v1)
+| x  2:f91e  draft  fix bug 15 (v1)
 |/
-o  1:de6151c48e1c  public  fix bug 37
+o  1:de61  public  fix bug 37
 |
 ~
 Alice rebases her draft changeset on top of Bob's public changeset and
 publishes the result.
 obsoleted 1 changesets
 updating bookmark bug15
 Figure SG08: review and public changesets after Alice pushes.
 $ hg --hidden -R ../review shortlog -G -r 1::
-o  7:a06ec1bf97bd  public  fix bug 15 (v2)
+o  7:a06e  public  fix bug 15 (v2)
 |
-o  6:540ba8f317e6  public  implement feature X (v3)
+o  6:540b  public  implement feature X (v3)
 |
-| x  5:0eb74a7b6698  draft  implement feature X (v2)
+| x  5:0eb7  draft  implement feature X (v2)
 |/
-| x  4:193657d1e852  draft  implement feature X (v1)
+| x  4:1936  draft  implement feature X (v1)
 |/
-| x  3:cbdfbd5a5db2  draft  fix bug 15 (v2)
+| x  3:cbdf  draft  fix bug 15 (v2)
 |/
-| x  2:f91e97234c2b  draft  fix bug 15 (v1)
+| x  2:f91e  draft  fix bug 15 (v1)
 |/
-@  1:de6151c48e1c  public  fix bug 37
+@  1:de61  public  fix bug 37
 |
 ~
 $ hg --hidden -R ../public shortlog -G -r 1::
-o  3:a06ec1bf97bd  public  fix bug 15 (v2)
+o  3:a06e  public  fix bug 15 (v2)
 |
-o  2:540ba8f317e6  public  implement feature X (v3)
+o  2:540b  public  implement feature X (v3)
 |
-o  1:de6151c48e1c  public  fix bug 37
+o  1:de61  public  fix bug 37
 |
 ~
 $ cd ..
 Setup for shared mutable history (to illustrate content-divergence and
 $ cd bob
 $ echo 'pretty good fix' >> file1
 $ hg commit -u bob -m 'fix bug 24 (v1)'
 $ hg shortlog -r .
-4:2fe6c4bd32d0  draft  fix bug 24 (v1)
+4:2fe6  draft  fix bug 24 (v1)
 Alice pulls Bob's draft changeset and amends it herself. ::
 $ cd ../alice
 $ hg pull -u ../bob
 $ cd ../bob
 $ echo 'better fix (bob)' >> file1
 $ hg amend -u bob -m 'fix bug 24 (v2 by bob)'
 $ hg --hidden shortlog -G -r 3::
-@  5:a360947f6faf  draft  fix bug 24 (v2 by bob)
+@  5:a360  draft  fix bug 24 (v2 by bob)
 |
-| x  4:2fe6c4bd32d0  draft  fix bug 24 (v1)
+| x  4:2fe6  draft  fix bug 24 (v1)
 |/
-o  3:a06ec1bf97bd  public  fix bug 15 (v2)
+o  3:a06e  public  fix bug 15 (v2)
 |
 ~
 Bob discovers the divergence.
 $ hg pull ../alice
 new changesets e3f99ce9d9cd (1 drafts)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 Figure SG09: multiple heads! divergence! oh my!
 $ hg --hidden shortlog -G -r 3::
-*  6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
+*  6:e3f9  draft  fix bug 24 (v2 by alice)
 |
-| @  5:a360947f6faf  draft  fix bug 24 (v2 by bob)
+| @  5:a360  draft  fix bug 24 (v2 by bob)
 |/
-| x  4:2fe6c4bd32d0  draft  fix bug 24 (v1)
+| x  4:2fe6  draft  fix bug 24 (v1)
 |/
-o  3:a06ec1bf97bd  public  fix bug 15 (v2)
+o  3:a06e  public  fix bug 15 (v2)
 |
 ~
 $ hg --hidden shortlog -r 'successors(2fe6)'
-5:a360947f6faf  draft  fix bug 24 (v2 by bob)
+5:a360  draft  fix bug 24 (v2 by bob)
-6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
+6:e3f9  draft  fix bug 24 (v2 by alice)
 Use evolve to fix the divergence.
 $ cat > editor.sh <<EOF
 > #!/bin/sh
 > cat > \$1 <<ENDOF
 working directory is now at b1499b0f03ca
 $ hg log -q -r 'contentdivergent()'
 Figure SG10: Bob's repository after fixing divergence.
 $ hg --hidden shortlog -G -r 3::
-@  7:b1499b0f03ca  draft  fix bug 24 (v2 by bob)
+@  7:b149  draft  fix bug 24 (v2 by bob)
 |
-| x  6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
+| x  6:e3f9  draft  fix bug 24 (v2 by alice)
 |/
-| x  5:a360947f6faf  draft  fix bug 24 (v2 by bob)
+| x  5:a360  draft  fix bug 24 (v2 by bob)
 |/
-| x  4:2fe6c4bd32d0  draft  fix bug 24 (v1)
+| x  4:2fe6  draft  fix bug 24 (v1)
 |/
-o  3:a06ec1bf97bd  public  fix bug 15 (v2)
+o  3:a06e  public  fix bug 15 (v2)
 |
 ~
 $ hg --hidden shortlog -r 'predecessors(b1499b0f03ca)'
-5:a360947f6faf  draft  fix bug 24 (v2 by bob)
+5:a360  draft  fix bug 24 (v2 by bob)
-6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
+6:e3f9  draft  fix bug 24 (v2 by alice)
 $ cat file1
 Do stuff.
 pretty good fix
 better fix (alice)

branch	stable
changeset 4930	44f340c2a8eb
parent 4633	61c2518cd6d2
child 4931	6408d7a01b59