Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-split.t
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 22 Jan 2018 14:10:59 +0530
branchstable
changeset 3452 8275ef099135
parent 3417 d3a17c67f85c
child 3590 d5adce52cef4
child 4577 bcd52ce0916d
permissions -rw-r--r--
amend: query the wdir parent after taking lock (issue5266) If we query wdir parent without taking a lock, that can lead to bugs because the wdir parent can change is another process has changed the wdir parent. One such example of this was issue 5266. When a user is running amend and that amend is waiting for commit message, the user runs another amend which waits for lock. The second amend is waiting for lock, but has already read the description from the parent of working directory to use. Once the first amend completes the wdir parent changes but we still have the description from an old wdir parent. This patch fixes the bug by querying the description after taking lock. Attempts were made to add test for this but the results were unstable because they depend on time in which lock is released.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1428
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     1
 
Check that evolve shows error while handling split commits
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     2
 
--------------------------------------
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     3
 
  $ cat >> $HGRCPATH <<EOF
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     4
 
  > [defaults]
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     5
 
  > amend=-d "0 0"
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     6
 
  > fold=-d "0 0"
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     7
 
  > [web]
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     8
 
  > push_ssl = false
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
     9
 
  > allow_push = *
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    10
 
  > [phases]
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    11
 
  > publish = False
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    12
 
  > [diff]
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    13
 
  > git = 1
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    14
 
  > unified = 0
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    15
 
  > [ui]
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    16
 
  > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    17
 
  > [extensions]
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    18
 
  > EOF
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1481
diff changeset 
    19
 
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
1428
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    20
 
  $ mkcommit() {
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    21
 
  >    echo "$1" > "$1"
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    22
 
  >    hg add "$1"
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    23
 
  >    hg ci -m "add $1"
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    24
 
  > }
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents:
diff changeset 
    25
 












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    26


  $ hg init split












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    27


  $ cd split












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    28


  $ mkcommit aa












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    29














20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    30


Create a split commit












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    31


  $ printf "oo" > oo;












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    32


  $ printf "pp" > pp;












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    33


  $ hg add oo pp












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    34


  $ hg commit -m "oo+pp"












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    35


  $ mkcommit uu












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    36


  $ hg up 0












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    37


  0 files updated, 0 files merged, 3 files removed, 0 files unresolved












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    38


  $ printf "oo" > oo;












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    39


  $ hg add oo












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    40


  $ hg commit -m "_oo"












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    41


  created new head












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    42


  $ printf "pp" > pp;












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    43


  $ hg add pp












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    44


  $ hg commit -m "_pp"







1471






4140d680784e
evolve: (issue4386) cleanup, split, fold and bijection in `hg prune`



Laurent Charignon <lcharignon@fb.com>


parents: 
1428

diff
changeset




    45


  $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split







1428






20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    46


  1 changesets pruned







3013






945a0989e41b
packaging: merge stable back into default



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
3000

diff
changeset




    47


  1 new orphan changesets







1428






20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    48


  $ hg log -G












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    49


  @  4:d0dcf24cddd3@default(draft) _pp












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    50


  |












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    51


  o  3:a7fdfda64c08@default(draft) _oo












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    52


  |







3417






d3a17c67f85c
branching: merge stable back into default



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
3411

diff
changeset




    53


  | *  2:f52200b086ca@default(draft) add uu







1428






20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    54


  | |












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    55


  | x  1:d55647aaa0c6@default(draft) oo+pp












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    56


  |/












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    57


  o  0:58663bb03074@default(draft) add aa












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    58


  












20a3b0b27bfe
evolve: raise MultipleSuccessorsError when computing dependency for split commits



Laurent Charignon <lcharignon@fb.com>


parents: 

diff
changeset




    59


  $ hg evolve --rev "0::"







1481






3c0aebe73482
evolve: handle split commit for instability



Laurent Charignon <lcharignon@fb.com>


parents: 
1471

diff
changeset




    60


  move:[2] add uu












3c0aebe73482
evolve: handle split commit for instability



Laurent Charignon <lcharignon@fb.com>


parents: 
1471

diff
changeset




    61


  atop:[4] _pp












3c0aebe73482
evolve: handle split commit for instability



Laurent Charignon <lcharignon@fb.com>


parents: 
1471

diff
changeset




    62


  working directory is now at 6f5bbe2e3df3














evolve