tests/test-obsolete.t
author Durham Goode <durham@fb.com>
Thu, 19 Mar 2015 10:52:28 -0700
changeset 1218 dd5e62979100
parent 1188 0c879e986ce4
child 1352 a143037892d6
permissions -rw-r--r--
wrapcommand: allow adding additional arguments to commands This allows eh.wrapcommand to specify additional parameters to be added to the commands being wrapped. This will be useful when wrapping strip in the future.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
32
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     2
  > [web]
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     3
  > push_ssl = false
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     4
  > allow_push = *
112
eae9be0ee00e adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 98
diff changeset
     5
  > [phases]
eae9be0ee00e adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 98
diff changeset
     6
  > publish=False
1060
f6e0cfca1bf0 test: work around a bug in debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1040
diff changeset
     7
  > [alias]
f6e0cfca1bf0 test: work around a bug in debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1040
diff changeset
     8
  > debugobsolete=debugobsolete -d '0 0'
32
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     9
  > [extensions]
491
6989d8fe4ed2 merge evolve and obsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 486
diff changeset
    10
  > hgext.rebase=
32
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    11
  > EOF
491
6989d8fe4ed2 merge evolve and obsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 486
diff changeset
    12
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
32
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    13
  $ mkcommit() {
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    14
  >    echo "$1" > "$1"
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    15
  >    hg add "$1"
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    16
  >    hg ci -m "add $1"
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    17
  > }
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
    18
  $ getid() {
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
    19
  >    hg id --hidden --debug -ir "$1"
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
    20
  > }
32
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    21
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    22
  $ alias qlog="hg log --template='{rev}\n- {node|short}\n'"
39
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
    23
  $ hg init local
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
    24
  $ cd local
32
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    25
  $ mkcommit a # 0
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
    26
  $ hg phase -p .
32
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    27
  $ mkcommit b # 1
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    28
  $ mkcommit c # 2
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    29
  $ hg up 1
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    30
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    31
  $ mkcommit obsol_c # 3
c27491be4431 obsolet: basic support (hide changeset)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    32
  created new head
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
    33
  $ getid 2
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
    34
  4538525df7e2b9f09423636c61ef63a4cb872a2d
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
    35
  $ getid 3
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
    36
  0d3f46688ccc6e756c7e96cf64c391c411309597
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
    37
  $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
    38
  $ hg debugobsolete
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
    39
  4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
    40
39
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
    41
398
42828b0ace98 obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents: 390
diff changeset
    42
Test hidden() revset
42828b0ace98 obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents: 390
diff changeset
    43
42828b0ace98 obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents: 390
diff changeset
    44
  $ qlog -r 'hidden()' --hidden
42828b0ace98 obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents: 390
diff changeset
    45
  2
42828b0ace98 obsolete: fix hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents: 390
diff changeset
    46
  - 4538525df7e2
39
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
    47
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
    48
Test that obsolete changeset are hidden
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
    49
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
    50
  $ qlog
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    51
  3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    52
  - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    53
  1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    54
  - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    55
  0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    56
  - 1f0dee641bb7
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
    57
  $ qlog --hidden
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    58
  3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    59
  - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    60
  2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    61
  - 4538525df7e2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    62
  1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    63
  - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    64
  0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    65
  - 1f0dee641bb7
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
    66
  $ qlog -r 'obsolete()' --hidden
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    67
  2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
    68
  - 4538525df7e2
39
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 32
diff changeset
    69
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    70
Test that obsolete precursors are properly computed
143
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    71
305
0b444d7c5c96 update revset vocabulary to use precursors, successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 299
diff changeset
    72
  $ qlog -r 'precursors(.)' --hidden
143
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    73
  2
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    74
  - 4538525df7e2
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    75
  $ qlog -r .
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    76
  3
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    77
  - 0d3f46688ccc
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    78
  $ hg odiff
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    79
  diff -r 4538525df7e2 -r 0d3f46688ccc c
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    80
  --- a/c	Thu Jan 01 00:00:00 1970 +0000
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    81
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    82
  @@ -1,1 +0,0 @@
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    83
  -c
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    84
  diff -r 4538525df7e2 -r 0d3f46688ccc obsol_c
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    85
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    86
  +++ b/obsol_c	Thu Jan 01 00:00:00 1970 +0000
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    87
  @@ -0,0 +1,1 @@
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    88
  +obsol_c
0599fb01dc41 add an obsolete parent revset and related alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 136
diff changeset
    89
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    90
Test that obsolete successors are properly computed
306
8cfa3163dfaa obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 305
diff changeset
    91
8cfa3163dfaa obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 305
diff changeset
    92
  $ qlog -r 'successors(2)' --hidden
8cfa3163dfaa obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 305
diff changeset
    93
  3
8cfa3163dfaa obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 305
diff changeset
    94
  - 0d3f46688ccc
8cfa3163dfaa obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 305
diff changeset
    95
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    96
test obsolete changeset with non-obsolete descendant
40
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
    97
  $ hg up 1 -q
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
    98
  $ mkcommit "obsol_c'" # 4 (on 1)
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
    99
  created new head
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
   100
  $ hg debugobsolete `getid 3` `getid 4`
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
   101
  $ qlog
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   102
  4
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   103
  - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   104
  1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   105
  - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   106
  0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   107
  - 1f0dee641bb7
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
   108
  $ qlog -r 'obsolete()' --hidden
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   109
  2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   110
  - 4538525df7e2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   111
  3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   112
  - 0d3f46688ccc
305
0b444d7c5c96 update revset vocabulary to use precursors, successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 299
diff changeset
   113
  $ qlog -r 'allprecursors(4)' --hidden
144
f387658d6d22 Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 143
diff changeset
   114
  2
f387658d6d22 Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 143
diff changeset
   115
  - 4538525df7e2
f387658d6d22 Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 143
diff changeset
   116
  3
f387658d6d22 Add a bosancestors revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 143
diff changeset
   117
  - 0d3f46688ccc
306
8cfa3163dfaa obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 305
diff changeset
   118
  $ qlog -r 'allsuccessors(2)' --hidden
8cfa3163dfaa obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 305
diff changeset
   119
  3
8cfa3163dfaa obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 305
diff changeset
   120
  - 0d3f46688ccc
8cfa3163dfaa obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 305
diff changeset
   121
  4
8cfa3163dfaa obsolete: add precursors and successors revset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 305
diff changeset
   122
  - 725c380fe99b
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
   123
  $ hg up --hidden 3 -q
743
af74a5cdf96b conform to the Mercurial custom of lowercase messages
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 652
diff changeset
   124
  working directory parent is obsolete!
745
99e51aff724b add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 743
diff changeset
   125
(reported by parents too)
99e51aff724b add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 743
diff changeset
   126
  $ hg parents
99e51aff724b add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 743
diff changeset
   127
  changeset:   3:0d3f46688ccc
99e51aff724b add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 743
diff changeset
   128
  parent:      1:7c3bad9141dc
99e51aff724b add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 743
diff changeset
   129
  user:        test
99e51aff724b add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 743
diff changeset
   130
  date:        Thu Jan 01 00:00:00 1970 +0000
99e51aff724b add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 743
diff changeset
   131
  summary:     add obsol_c
99e51aff724b add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 743
diff changeset
   132
  
99e51aff724b add obsolete parents wrapper to the 'parents' command
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 743
diff changeset
   133
  working directory parent is obsolete!
40
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
   134
  $ mkcommit d # 5 (on 3)
486
2111c655b4f5 fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 480
diff changeset
   135
  1 new unstable changesets
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
   136
  $ qlog -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   137
  3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   138
  - 0d3f46688ccc
40
b9a5a596d9ef proper computation of hidden changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 39
diff changeset
   139
136
915728be8afd add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 135
diff changeset
   140
  $ qlog -r 'extinct()' --hidden
915728be8afd add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 135
diff changeset
   141
  2
915728be8afd add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 135
diff changeset
   142
  - 4538525df7e2
915728be8afd add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 135
diff changeset
   143
  $ qlog -r 'suspended()'
915728be8afd add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 135
diff changeset
   144
  3
915728be8afd add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 135
diff changeset
   145
  - 0d3f46688ccc
915728be8afd add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 135
diff changeset
   146
  $ qlog -r 'unstable()'
915728be8afd add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 135
diff changeset
   147
  5
915728be8afd add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 135
diff changeset
   148
  - a7a6f2b5d8a5
915728be8afd add test for revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 135
diff changeset
   149
299
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   150
Test obsolete keyword
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   151
570
1c45a07dda51 test-obsolete: clean up useless inlined option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 554
diff changeset
   152
  $ hg log -G --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' \
299
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   153
  >   --hidden
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   154
  @  5:a7a6f2b5d8a5@default(unstable/draft) add d
299
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   155
  |
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   156
  | o  4:725c380fe99b@default(stable/draft) add obsol_c'
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   157
  | |
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   158
  x |  3:0d3f46688ccc@default(suspended/draft) add obsol_c
299
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   159
  |/
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   160
  | x  2:4538525df7e2@default(extinct/draft) add c
299
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   161
  |/
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   162
  o  1:7c3bad9141dc@default(stable/draft) add b
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   163
  |
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   164
  o  0:1f0dee641bb7@default(stable/public) add a
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   165
  
eda6491ca269 obsolete: add 'obsolete' keyword
Patrick Mezard <patrick@mezard.eu>
parents: 280
diff changeset
   166
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   167
Test communication of obsolete relation with a compatible client
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   168
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   169
  $ hg init ../other-new
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
   170
  $ hg phase --draft 'secret() - extinct()' # until we fix exclusion
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   171
  abort: empty revision set
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   172
  [255]
217
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
   173
  $ hg push ../other-new
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
   174
  pushing to ../other-new
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
   175
  searching for changes
590
02cadd3dc9f4 evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
   176
  abort: push includes unstable changeset: a7a6f2b5d8a5!
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 491
diff changeset
   177
  (use 'hg evolve' to get a stable history or --force to ignore warnings)
217
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
   178
  [255]
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
   179
  $ hg push -f ../other-new
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   180
  pushing to ../other-new
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   181
  searching for changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   182
  adding changesets
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   183
  adding manifests
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   184
  adding file changes
46
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
   185
  added 5 changesets with 5 changes to 5 files (+1 heads)
1130
be31c34bb341 test: ignore bytes lenght in message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1092
diff changeset
   186
  pushing 2 obsolescence markers (* bytes) (glob)
1092
85c699c4fba4 compat: update the tests after the jump
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1068
diff changeset
   187
  2 obsolescence markers added
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   188
  $ hg -R ../other-new verify
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   189
  checking changesets
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   190
  checking manifests
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   191
  crosschecking files in changesets and manifests
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   192
  checking files
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   193
  5 files, 5 changesets, 5 total revisions
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
   194
  $ qlog -R ../other-new -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   195
  2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   196
  - 0d3f46688ccc
45
d89453a10991 include hash in test.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 44
diff changeset
   197
  $ qlog -R ../other-new
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   198
  4
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   199
  - a7a6f2b5d8a5
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   200
  3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   201
  - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   202
  2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   203
  - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   204
  1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   205
  - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   206
  0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   207
  - 1f0dee641bb7
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
   208
  $ hg up --hidden 3 -q
743
af74a5cdf96b conform to the Mercurial custom of lowercase messages
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 652
diff changeset
   209
  working directory parent is obsolete!
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   210
  $ mkcommit obsol_d # 6
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   211
  created new head
486
2111c655b4f5 fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 480
diff changeset
   212
  1 new unstable changesets
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
   213
  $ hg debugobsolete `getid 5` `getid 6`
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   214
  $ qlog
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   215
  6
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   216
  - 95de7fc6918d
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   217
  4
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   218
  - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   219
  3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   220
  - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   221
  1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   222
  - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   223
  0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   224
  - 1f0dee641bb7
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   225
  $ qlog -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   226
  3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   227
  - 0d3f46688ccc
217
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
   228
  $ hg push ../other-new
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
   229
  pushing to ../other-new
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
   230
  searching for changes
590
02cadd3dc9f4 evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
   231
  abort: push includes unstable changeset: 95de7fc6918d!
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 491
diff changeset
   232
  (use 'hg evolve' to get a stable history or --force to ignore warnings)
217
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
   233
  [255]
786eb34d93ea obsolete: refuse to push unstable changeset without -f
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 215
diff changeset
   234
  $ hg push ../other-new -f # use f because there is unstability
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   235
  pushing to ../other-new
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   236
  searching for changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   237
  adding changesets
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   238
  adding manifests
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   239
  adding file changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   240
  added 1 changesets with 1 changes to 1 files (+1 heads)
1130
be31c34bb341 test: ignore bytes lenght in message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1092
diff changeset
   241
  pushing 3 obsolescence markers (* bytes) (glob)
1092
85c699c4fba4 compat: update the tests after the jump
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1068
diff changeset
   242
  1 obsolescence markers added
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   243
  $ qlog -R ../other-new
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   244
  5
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   245
  - 95de7fc6918d
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   246
  3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   247
  - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   248
  2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   249
  - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   250
  1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   251
  - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   252
  0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   253
  - 1f0dee641bb7
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   254
  $ qlog -R ../other-new -r 'obsolete()'
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   255
  2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   256
  - 0d3f46688ccc
214
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
   257
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   258
Pushing again does not advertise extinct changesets
214
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
   259
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
   260
  $ hg push ../other-new
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
   261
  pushing to ../other-new
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
   262
  searching for changes
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   263
  no changes found
1130
be31c34bb341 test: ignore bytes lenght in message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1092
diff changeset
   264
  pushing 3 obsolescence markers (* bytes) (glob)
1092
85c699c4fba4 compat: update the tests after the jump
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1068
diff changeset
   265
  0 obsolescence markers added
214
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
   266
  [1]
a140d1857931 obsolete: do not warn about unpushed extinct changeset.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 206
diff changeset
   267
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
   268
  $ hg up --hidden -q .^ # 3
743
af74a5cdf96b conform to the Mercurial custom of lowercase messages
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 652
diff changeset
   269
  working directory parent is obsolete!
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   270
  $ mkcommit "obsol_d'" # 7
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   271
  created new head
486
2111c655b4f5 fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 480
diff changeset
   272
  1 new unstable changesets
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
   273
  $ hg debugobsolete `getid 6` `getid 7`
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   274
  $ hg pull -R ../other-new .
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   275
  pulling from .
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   276
  searching for changes
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   277
  adding changesets
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   278
  adding manifests
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   279
  adding file changes
633
3d5bed04ee4c test: adapt to the way the bundle is generated
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 594
diff changeset
   280
  added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
1038
45c4739e85dc evolve: make the "pulling obsolescence marker" message important
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1037
diff changeset
   281
  pull obsolescence markers
1040
640f3280559e evolve: add "obsolescence" in front of marked in the previous message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1039
diff changeset
   282
  1 obsolescence markers added
823
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
   283
  (run 'hg heads' to see heads, 'hg merge' to merge)
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   284
  $ qlog -R ../other-new
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
   285
  6
49
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   286
  - 909a0fb57e5d
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   287
  3
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   288
  - 725c380fe99b
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   289
  2
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   290
  - 0d3f46688ccc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   291
  1
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   292
  - 7c3bad9141dc
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   293
  0
4e804af47e57 Change test output again
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 46
diff changeset
   294
  - 1f0dee641bb7
46
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
   295
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   296
pushing to stuff that doesn't support obsolescence
46
3b0364fc822f Do not propagate obsolete changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 45
diff changeset
   297
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   298
DISABLED. the _enable switch is global :-/
405
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   299
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   300
..  $ hg init ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   301
..  > # XXX I don't like this but changeset get published otherwise
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   302
..  > # remove it when we will get a --keep-state flag for push
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   303
..  $ echo '[extensions]'  > ../other-old/.hg/hgrc
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   304
..  $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   305
..  $ hg push ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   306
..  pushing to ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   307
..  searching for changes
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   308
..  abort: push includes an unstable changeset: 909a0fb57e5d!
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 491
diff changeset
   309
..  (use 'hg evolve' to get a stable history or --force to ignore warnings)
405
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   310
..  [255]
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   311
..  $ hg push -f ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   312
..  pushing to ../other-old
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   313
..  searching for changes
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   314
..  adding changesets
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   315
..  adding manifests
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   316
..  adding file changes
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   317
..  added 5 changesets with 5 changes to 5 files (+1 heads)
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   318
..  $ qlog -R ../other-ol
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   319
..  4
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   320
..  - 909a0fb57e5d
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   321
..  3
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   322
..  - 725c380fe99b
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   323
..  2
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   324
..  - 0d3f46688ccc
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   325
..  1
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   326
..  - 7c3bad9141dc
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   327
..  0
b5b1bf5166a2 obsolete: enable obsolete feature
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 398
diff changeset
   328
..  - 1f0dee641bb7
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   329
50
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
   330
clone support
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   331
50
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
   332
  $ hg clone . ../cloned
75
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
   333
  > # The warning should go away once we have default value to set ready before we pull
50
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
   334
  updating to branch default
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
   335
  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
44
b243c10a5fbe Add pushkey support for pull and push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 40
diff changeset
   336
389
cb575242d2ba test-obsolete: handle local clones copying obsolete markers
Patrick Mezard <patrick@mezard.eu>
parents: 385
diff changeset
   337
  $ qlog -R ../cloned --hidden
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   338
  7
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   339
  - 909a0fb57e5d
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   340
  6
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   341
  - 95de7fc6918d
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   342
  5
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   343
  - a7a6f2b5d8a5
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
   344
  4
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   345
  - 725c380fe99b
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
   346
  3
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   347
  - 0d3f46688ccc
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
   348
  2
385
cdcdedc532b7 obsolete: Stop turning obsolete secret changesets secret
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 381
diff changeset
   349
  - 4538525df7e2
50
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
   350
  1
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
   351
  - 7c3bad9141dc
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
   352
  0
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
   353
  - 1f0dee641bb7
19b22ad56b32 clone support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 49
diff changeset
   354
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   355
Test rollback support
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   356
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
   357
  $ hg up --hidden .^ -q # 3
743
af74a5cdf96b conform to the Mercurial custom of lowercase messages
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 652
diff changeset
   358
  working directory parent is obsolete!
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   359
  $ mkcommit "obsol_d''"
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   360
  created new head
486
2111c655b4f5 fix typo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 480
diff changeset
   361
  1 new unstable changesets
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
   362
  $ hg debugobsolete `getid 7` `getid 8`
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   363
  $ cd ../other-new
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   364
  $ hg up -q 3
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   365
  $ hg pull ../local/
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   366
  pulling from ../local/
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   367
  searching for changes
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   368
  adding changesets
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   369
  adding manifests
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   370
  adding file changes
633
3d5bed04ee4c test: adapt to the way the bundle is generated
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 594
diff changeset
   371
  added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
1038
45c4739e85dc evolve: make the "pulling obsolescence marker" message important
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1037
diff changeset
   372
  pull obsolescence markers
1040
640f3280559e evolve: add "obsolescence" in front of marked in the previous message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1039
diff changeset
   373
  1 obsolescence markers added
823
9aa20585e158 exchange: add a new method to pull markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 817
diff changeset
   374
  (run 'hg heads' to see heads, 'hg merge' to merge)
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   375
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   376
  $ hg up -q 7 # to check rollback update behavior
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   377
  $ qlog
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
   378
  7
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   379
  - 159dfc9fa5d3
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   380
  3
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   381
  - 725c380fe99b
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   382
  2
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   383
  - 0d3f46688ccc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   384
  1
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   385
  - 7c3bad9141dc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   386
  0
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   387
  - 1f0dee641bb7
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   388
  $ hg rollback
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
   389
  repository tip rolled back to revision 6 (undo pull)
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   390
  working directory now based on revision 3
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   391
  $ hg summary
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   392
  parent: 3:725c380fe99b 
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   393
   add obsol_c'
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   394
  branch: default
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   395
  commit: 1 deleted, 2 unknown (clean)
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
   396
  update: 2 new changesets, 2 branch heads (merge)
479
b63da0fb8ee5 obsolete: add obsolete data to summary.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 473
diff changeset
   397
  unstable: 1 changesets
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   398
  $ qlog
135
1a08daef8a53 obsolete: add revset for various error case
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 112
diff changeset
   399
  6
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   400
  - 909a0fb57e5d
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   401
  3
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   402
  - 725c380fe99b
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   403
  2
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   404
  - 0d3f46688ccc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   405
  1
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   406
  - 7c3bad9141dc
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   407
  0
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   408
  - 1f0dee641bb7
215
0eceb5a48485 obsolete: fix changelog reload
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 214
diff changeset
   409
  $ cd ../local
52
62bdc2567099 Rollback support
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 51
diff changeset
   410
112
eae9be0ee00e adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 98
diff changeset
   411
obsolete public changeset
eae9be0ee00e adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 98
diff changeset
   412
eae9be0ee00e adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 98
diff changeset
   413
# move draft boundary from 0 to 1
eae9be0ee00e adapt obsolete to phase.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 98
diff changeset
   414
  $ sed -e 's/1f0dee641bb7258c56bd60e93edfa2405381c41e/7c3bad9141dcb46ff89abf5f61856facd56e476c/' -i'.back' .hg/store/phaseroots
75
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
   415
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
   416
  $ hg up null
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
   417
  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
80
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   418
  $ mkcommit toto # 9
75
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
   419
  created new head
80
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   420
  $ hg id -n
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   421
  9
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
   422
  $ hg debugobsolete `getid 0` `getid 9`
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
   423
83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
   424
# at core level the warning is not issued
593
26f76b38f879 evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
   425
# this is now a big issue now that we have bumped warning
75
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
   426
  $ qlog -r 'obsolete()'
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
   427
  3
d7b11772f0b5 [obsolete] published changeset can't be obsoleted
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 52
diff changeset
   428
  - 0d3f46688ccc
80
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   429
allow to just kill changeset
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   430
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   431
  $ qlog
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   432
  9
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   433
  - 83b5778897ad
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   434
  8
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   435
  - 159dfc9fa5d3
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   436
  4
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   437
  - 725c380fe99b
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   438
  3
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   439
  - 0d3f46688ccc
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   440
  1
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   441
  - 7c3bad9141dc
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   442
  0
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   443
  - 1f0dee641bb7
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   444
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
   445
  $ hg debugobsolete `getid 9` #kill
80
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   446
  $ hg up null -q # to be not based on 9 anymore
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   447
  $ qlog
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   448
  8
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   449
  - 159dfc9fa5d3
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   450
  4
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   451
  - 725c380fe99b
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   452
  3
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   453
  - 0d3f46688ccc
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   454
  1
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   455
  - 7c3bad9141dc
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   456
  0
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   457
  - 1f0dee641bb7
5d029a358252 [obsolete] add kill support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 79
diff changeset
   458
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   459
Check that auto update ignores hidden changeset
473
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
   460
  $ hg up 0
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
   461
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
   462
  $ hg up 
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
   463
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
   464
  $ hg id -n
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
   465
  8
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
   466
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   467
Check that named update does too
480
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
   468
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
   469
  $ hg update default
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
   470
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
   471
  $ hg id -n
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
   472
  8
cd1d5b7308be obsolete: ignore hidden changeset when resolving `branchname` revision
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 479
diff changeset
   473
473
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
   474
  $ hg up null -q # to be not based on 9 anymore
1f8f8dd75d18 obsolete: prevent bare hg update to select hidden changeset
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 471
diff changeset
   475
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   476
check rebase compat
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   477
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   478
  $ hg log -G  --template='{rev} - {node|short} {desc}\n'
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   479
  o  8 - 159dfc9fa5d3 add obsol_d''
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   480
  |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   481
  | o  4 - 725c380fe99b add obsol_c'
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   482
  | |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   483
  x |  3 - 0d3f46688ccc add obsol_c
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   484
  |/
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   485
  o  1 - 7c3bad9141dc add b
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   486
  |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   487
  o  0 - 1f0dee641bb7 add a
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   488
  
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   489
990
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   490
  $ hg log -G  --template='{rev} - {node|short} {desc}\n' --hidden
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   491
  x  9 - 83b5778897ad add toto
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   492
  
990
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   493
  o  8 - 159dfc9fa5d3 add obsol_d''
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   494
  |
990
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   495
  | x  7 - 909a0fb57e5d add obsol_d'
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   496
  |/
990
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   497
  | x  6 - 95de7fc6918d add obsol_d
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   498
  |/
990
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   499
  | x  5 - a7a6f2b5d8a5 add d
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   500
  |/
990
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   501
  | o  4 - 725c380fe99b add obsol_c'
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   502
  | |
990
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   503
  x |  3 - 0d3f46688ccc add obsol_c
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   504
  |/
990
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   505
  | x  2 - 4538525df7e2 add c
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   506
  |/
990
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   507
  o  1 - 7c3bad9141dc add b
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   508
  |
990
c863269aed01 test-obsolete: make log templates more consistent: add {desc} to one
Greg Ward <greg@gerg.ca>
parents: 989
diff changeset
   509
  o  0 - 1f0dee641bb7 add a
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   510
  
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   511
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   512
should not rebase extinct changesets
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   513
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   514
#excluded 'whole rebase set is extinct and ignored.' message not in core
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   515
  $ hg rebase -b '3' -d 4 --traceback
1188
0c879e986ce4 test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1130
diff changeset
   516
  rebasing 3:0d3f46688ccc "add obsol_c"
0c879e986ce4 test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1130
diff changeset
   517
  rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip)
586
f01721161532 evolve: rename conflicting into divergent
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 572
diff changeset
   518
  2 new divergent changesets
989
33096d7d094b test-obsolete: explicitly show which changesets are divergent
Greg Ward <greg@gerg.ca>
parents: 984
diff changeset
   519
  $ hg --hidden log -q -r 'successors(3)'
33096d7d094b test-obsolete: explicitly show which changesets are divergent
Greg Ward <greg@gerg.ca>
parents: 984
diff changeset
   520
  4:725c380fe99b
33096d7d094b test-obsolete: explicitly show which changesets are divergent
Greg Ward <greg@gerg.ca>
parents: 984
diff changeset
   521
  10:2033b4e49474
747
9300f48786de test: prepare test for core changeset 9c78ed396075
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 745
diff changeset
   522
  $ hg up tip
9300f48786de test: prepare test for core changeset 9c78ed396075
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 745
diff changeset
   523
  ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   524
  $ hg log -G --template='{rev} - {node|short} {desc}\n'
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   525
  @  11 - 9468a5f5d8b2 add obsol_d''
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   526
  |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   527
  o  10 - 2033b4e49474 add obsol_c
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   528
  |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   529
  o  4 - 725c380fe99b add obsol_c'
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   530
  |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   531
  o  1 - 7c3bad9141dc add b
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   532
  |
572
dc107acd0bd2 adapt to core rebase support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 571
diff changeset
   533
  o  0 - 1f0dee641bb7 add a
150
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   534
  
f12fd2410a60 obsolete: improve rebase compat
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 144
diff changeset
   535
218
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   536
Does not complain about new head if you obsolete the old one
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   537
(re necessary when we start running discovery on unfiltered repo in core)
218
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   538
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   539
  $ hg push ../other-new --traceback
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   540
  pushing to ../other-new
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   541
  searching for changes
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   542
  adding changesets
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   543
  adding manifests
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   544
  adding file changes
756
64c6bdfd0518 evolve: use super for calling parent class method
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 750
diff changeset
   545
  added 2 changesets with 1 changes to [12] files (re)
1130
be31c34bb341 test: ignore bytes lenght in message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1092
diff changeset
   546
  pushing 7 obsolescence markers (* bytes) (glob)
1092
85c699c4fba4 compat: update the tests after the jump
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1068
diff changeset
   547
  3 obsolescence markers added
218
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   548
  $ hg up -q 10
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   549
  $ mkcommit "obsol_d'''"
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   550
  created new head
343
6b92f8d5ae58 adapt for new mercurial
Pierre-Yves.David@ens-lyon.org
parents: 320
diff changeset
   551
  $ hg debugobsolete `getid 11` `getid 12`
218
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   552
  $ hg push ../other-new --traceback
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   553
  pushing to ../other-new
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   554
  searching for changes
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   555
  adding changesets
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   556
  adding manifests
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   557
  adding file changes
ace5608350b6 obsolete: do no complain when push create a new head but obsolete an old one.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 217
diff changeset
   558
  added 1 changesets with 1 changes to 1 files (+1 heads)
1130
be31c34bb341 test: ignore bytes lenght in message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1092
diff changeset
   559
  pushing 8 obsolescence markers (* bytes) (glob)
1092
85c699c4fba4 compat: update the tests after the jump
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1068
diff changeset
   560
  1 obsolescence markers added
274
6622a24f3b0f obsolete: fix rebase wrapping
Patrick Mezard <patrick@mezard.eu>
parents: 225
diff changeset
   561
  $ cd ..
307
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   562
593
26f76b38f879 evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
   563
check bumped detection
307
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   564
(make an obsolete changeset public)
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   565
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   566
  $ cd local
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
   567
  $ hg phase --hidden --public 11
593
26f76b38f879 evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
   568
  1 new bumped changesets
570
1c45a07dda51 test-obsolete: clean up useless inlined option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 554
diff changeset
   569
  $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
307
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   570
  @  12 - (draft) 6db5e282cb91 add obsol_d'''
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   571
  |
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   572
  | o  11 - (public) 9468a5f5d8b2 add obsol_d''
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   573
  |/
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   574
  o  10 - (public) 2033b4e49474 add obsol_c
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   575
  |
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   576
  o  4 - (public) 725c380fe99b add obsol_c'
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   577
  |
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   578
  o  1 - (public) 7c3bad9141dc add b
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   579
  |
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   580
  o  0 - (public) 1f0dee641bb7 add a
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   581
  
593
26f76b38f879 evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
   582
  $ hg log -r 'bumped()'
307
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   583
  changeset:   12:6db5e282cb91
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   584
  tag:         tip
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   585
  parent:      10:2033b4e49474
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   586
  user:        test
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   587
  date:        Thu Jan 01 00:00:00 1970 +0000
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   588
  summary:     add obsol_d'''
9ac56d36d6ff obsolete: add latecomer computation and display
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 306
diff changeset
   589
  
308
23ef1c71d164 obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 307
diff changeset
   590
  $ hg push ../other-new/
23ef1c71d164 obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 307
diff changeset
   591
  pushing to ../other-new/
23ef1c71d164 obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 307
diff changeset
   592
  searching for changes
590
02cadd3dc9f4 evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
   593
  abort: push includes bumped changeset: 6db5e282cb91!
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 491
diff changeset
   594
  (use 'hg evolve' to get a stable history or --force to ignore warnings)
308
23ef1c71d164 obsolete: detect late comer during push
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 307
diff changeset
   595
  [255]
320
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   596
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   597
Check hg commit --amend compat
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   598
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   599
  $ hg up 'desc(obsol_c)'
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   600
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   601
  $ mkcommit f
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   602
  created new head
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   603
  $ echo 42 >> f
554
39eb12bb47c0 commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   604
  $ hg commit --amend --traceback --quiet
570
1c45a07dda51 test-obsolete: clean up useless inlined option
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 554
diff changeset
   605
  $ hg log -G
590
02cadd3dc9f4 evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
   606
  @  changeset:   15:705ab2a6b72e
320
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   607
  |  tag:         tip
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   608
  |  parent:      10:2033b4e49474
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   609
  |  user:        test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   610
  |  date:        Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   611
  |  summary:     add f
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   612
  |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   613
  | o  changeset:   12:6db5e282cb91
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   614
  |/   parent:      10:2033b4e49474
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   615
  |    user:        test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   616
  |    date:        Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   617
  |    summary:     add obsol_d'''
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   618
  |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   619
  | o  changeset:   11:9468a5f5d8b2
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   620
  |/   user:        test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   621
  |    date:        Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   622
  |    summary:     add obsol_d''
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   623
  |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   624
  o  changeset:   10:2033b4e49474
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   625
  |  parent:      4:725c380fe99b
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   626
  |  user:        test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   627
  |  date:        Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   628
  |  summary:     add obsol_c
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   629
  |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   630
  o  changeset:   4:725c380fe99b
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   631
  |  parent:      1:7c3bad9141dc
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   632
  |  user:        test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   633
  |  date:        Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   634
  |  summary:     add obsol_c'
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   635
  |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   636
  o  changeset:   1:7c3bad9141dc
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   637
  |  user:        test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   638
  |  date:        Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   639
  |  summary:     add b
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   640
  |
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   641
  o  changeset:   0:1f0dee641bb7
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   642
     user:        test
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   643
     date:        Thu Jan 01 00:00:00 1970 +0000
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   644
     summary:     add a
63f267bd2176 obsolete: basic commit --amend support
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 308
diff changeset
   645
  
554
39eb12bb47c0 commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   646
  $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   647
  4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   648
  0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   649
  a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   650
  95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   651
  909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   652
  1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   653
  83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   654
  0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (*) {'user': 'test'} (glob)
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   655
  159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (*) {'user': 'test'} (glob)
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   656
  9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   657
  0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'user': 'test'} (glob)
554
39eb12bb47c0 commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   658
#no produced by 2.3
39eb12bb47c0 commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   659
33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
354
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   660
803
b96d51a357bd test: get rid of all reference to conflicting changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 763
diff changeset
   661
Check divergence detection
354
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   662
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   663
  $ hg up 9468a5f5d8b2 #  add obsol_d''
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   664
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   665
  $ mkcommit "obsolet_conflicting_d"
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   666
  $ hg summary
554
39eb12bb47c0 commit --amend: adap to core 63e45aee46d4
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   667
  parent: 1[46]:50f11e5e3a63 tip (re)
354
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   668
   add obsolet_conflicting_d
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   669
  branch: default
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   670
  commit: (clean)
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 594
diff changeset
   671
  update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
593
26f76b38f879 evolve: Rename latecomer into bumped
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
   672
  bumped: 1 changesets
359
43f79983f638 merge with conflicting detection
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 346 356
diff changeset
   673
  $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
803
b96d51a357bd test: get rid of all reference to conflicting changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 763
diff changeset
   674
  $ hg log -r 'divergent()'
587
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
   675
  changeset:   12:6db5e282cb91
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
   676
  parent:      10:2033b4e49474
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
   677
  user:        test
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
   678
  date:        Thu Jan 01 00:00:00 1970 +0000
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
   679
  summary:     add obsol_d'''
8152fedbac65 evolve: smarter code for divergent changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 586
diff changeset
   680
  
590
02cadd3dc9f4 evolve: adapt to 2.4 code
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 587
diff changeset
   681
  changeset:   16:50f11e5e3a63
354
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   682
  tag:         tip
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   683
  parent:      11:9468a5f5d8b2
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   684
  user:        test
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   685
  date:        Thu Jan 01 00:00:00 1970 +0000
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   686
  summary:     add obsolet_conflicting_d
bd26eb9714fb obsolete: Detect conflicting changeset!
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 320
diff changeset
   687
  
750
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   688
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   689
  $ hg up --hidden 3 -q
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   690
  working directory parent is obsolete!
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   691
  $ hg evolve
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   692
  parent is obsolete with multiple successors:
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   693
  [4] add obsol_c'
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   694
  [10] add obsol_c
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   695
  [2]
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   696
  $ hg olog
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   697
  changeset:   2:4538525df7e2
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   698
  user:        test
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   699
  date:        Thu Jan 01 00:00:00 1970 +0000
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   700
  summary:     add c
ddbea2fdee5e evolve: allow updating to the successor if the parent is obsolete
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 747
diff changeset
   701
  
763
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
   702
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
   703
Check import reports new unstable changeset:
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
   704
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
   705
  $ hg up --hidden 2
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
   706
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
   707
  working directory parent is obsolete!
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
   708
  $ hg export 9468a5f5d8b2 | hg import -
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
   709
  applying patch from stdin
966e2659e989 import: warn about new unstable changesets
Dan Villiom Podlaski Christiansen <dan@cabo.dk>
parents: 756
diff changeset
   710
  1 new unstable changesets
816
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   711
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   712
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   713
Relevant marker computation
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   714
==============================
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   715
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   716
  $ hg log -G --hidden
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   717
  @  changeset:   17:a5f7a21fe7bc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   718
  |  tag:         tip
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   719
  |  parent:      2:4538525df7e2
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   720
  |  user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   721
  |  date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   722
  |  summary:     add obsol_d''
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   723
  |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   724
  | o  changeset:   16:50f11e5e3a63
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   725
  | |  parent:      11:9468a5f5d8b2
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   726
  | |  user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   727
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   728
  | |  summary:     add obsolet_conflicting_d
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   729
  | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   730
  | | o  changeset:   15:705ab2a6b72e
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   731
  | | |  parent:      10:2033b4e49474
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   732
  | | |  user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   733
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   734
  | | |  summary:     add f
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   735
  | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   736
  | | | x  changeset:   14:33d458d86621
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   737
  | | | |  user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   738
  | | | |  date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   739
  | | | |  summary:     temporary amend commit for 0b1b6dd009c0
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   740
  | | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   741
  | | | x  changeset:   13:0b1b6dd009c0
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   742
  | | |/   parent:      10:2033b4e49474
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   743
  | | |    user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   744
  | | |    date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   745
  | | |    summary:     add f
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   746
  | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   747
  | | | o  changeset:   12:6db5e282cb91
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   748
  | | |/   parent:      10:2033b4e49474
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   749
  | | |    user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   750
  | | |    date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   751
  | | |    summary:     add obsol_d'''
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   752
  | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   753
  | o |  changeset:   11:9468a5f5d8b2
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   754
  | |/   user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   755
  | |    date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   756
  | |    summary:     add obsol_d''
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   757
  | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   758
  | o  changeset:   10:2033b4e49474
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   759
  | |  parent:      4:725c380fe99b
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   760
  | |  user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   761
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   762
  | |  summary:     add obsol_c
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   763
  | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   764
  | | x  changeset:   9:83b5778897ad
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   765
  | |    parent:      -1:000000000000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   766
  | |    user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   767
  | |    date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   768
  | |    summary:     add toto
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   769
  | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   770
  | | x  changeset:   8:159dfc9fa5d3
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   771
  | | |  parent:      3:0d3f46688ccc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   772
  | | |  user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   773
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   774
  | | |  summary:     add obsol_d''
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   775
  | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   776
  | | | x  changeset:   7:909a0fb57e5d
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   777
  | | |/   parent:      3:0d3f46688ccc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   778
  | | |    user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   779
  | | |    date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   780
  | | |    summary:     add obsol_d'
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   781
  | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   782
  | | | x  changeset:   6:95de7fc6918d
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   783
  | | |/   parent:      3:0d3f46688ccc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   784
  | | |    user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   785
  | | |    date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   786
  | | |    summary:     add obsol_d
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   787
  | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   788
  | | | x  changeset:   5:a7a6f2b5d8a5
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   789
  | | |/   parent:      3:0d3f46688ccc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   790
  | | |    user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   791
  | | |    date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   792
  | | |    summary:     add d
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   793
  | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   794
  | o |  changeset:   4:725c380fe99b
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   795
  | | |  parent:      1:7c3bad9141dc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   796
  | | |  user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   797
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   798
  | | |  summary:     add obsol_c'
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   799
  | | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   800
  | | x  changeset:   3:0d3f46688ccc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   801
  | |/   parent:      1:7c3bad9141dc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   802
  | |    user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   803
  | |    date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   804
  | |    summary:     add obsol_c
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   805
  | |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   806
  x |  changeset:   2:4538525df7e2
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   807
  |/   user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   808
  |    date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   809
  |    summary:     add c
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   810
  |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   811
  o  changeset:   1:7c3bad9141dc
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   812
  |  user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   813
  |  date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   814
  |  summary:     add b
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   815
  |
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   816
  o  changeset:   0:1f0dee641bb7
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   817
     user:        test
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   818
     date:        Thu Jan 01 00:00:00 1970 +0000
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   819
     summary:     add a
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   820
  
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   821
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   822
Simple rewrite
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   823
1068
9f87b103f7b5 evolve: drop debugobsoleterelevant
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1067
diff changeset
   824
  $ hg  --hidden debugobsolete --rev 3
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   825
  4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
816
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   826
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   827
simple rewrite with a prune attached to it
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   828
1068
9f87b103f7b5 evolve: drop debugobsoleterelevant
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1067
diff changeset
   829
  $ hg debugobsolete --rev 15
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   830
  0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'user': 'test'} (glob)
1067
5d063fed9e3d evolve: yield to relevant markers handling in core
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1065
diff changeset
   831
  33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'user': 'test'} (glob)
816
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   832
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   833
Transitive rewrite
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   834
1068
9f87b103f7b5 evolve: drop debugobsoleterelevant
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1067
diff changeset
   835
  $ hg --hidden debugobsolete --rev 8
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   836
  909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   837
  95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
   838
  a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
816
03587920dfd9 evolve: add relevant marker exchange machinery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 803
diff changeset
   839