tests/test-obsolete.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 15 Jan 2020 15:47:03 +0100
changeset 44097 2f1d6180737f
parent 42899 34a46d48d24e
child 44555 bd7b2c8d06cc
permissions -rw-r--r--
transaction: allow finalizer to add finalizer It will make some code (persistent nodemap related) simpler to write, because higher level code can blindly queue finalization without thinking too hard about the context. Differential Revision: https://phab.mercurial-scm.org/D7833
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
     1
  $ cat >> $HGRCPATH << EOF
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
     2
  > [phases]
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
     3
  > # public changeset are not obsolete
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
     4
  > publish=false
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
     5
  > [ui]
34847
e27f1f04c2cf templatekw: introduce obsfate keyword
Boris Feld <boris.feld@octobus.net>
parents: 34717
diff changeset
     6
  > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}{if(obsfate, " [{join(obsfate, "; ")}]")}\n"
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
     7
  > EOF
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
     8
  $ mkcommit() {
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
     9
  >    echo "$1" > "$1"
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    10
  >    hg add "$1"
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    11
  >    hg ci -m "add $1"
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    12
  > }
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    13
  $ getid() {
24162
758dd85b6ad6 test-obsolete: use 'log -T {node}' instead of 'id --debug -i' to lookup hash
Matt Harbison <matt_harbison@yahoo.com>
parents: 24136
diff changeset
    14
  >    hg log -T "{node}\n" --hidden -r "desc('$1')"
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    15
  > }
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    16
17252
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
    17
  $ cat > debugkeys.py <<EOF
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
    18
  > def reposetup(ui, repo):
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
    19
  >     class debugkeysrepo(repo.__class__):
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
    20
  >         def listkeys(self, namespace):
36524
f1e05fe1a78f py3: add b'' prefixes in tests/test-obsolete.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36355
diff changeset
    21
  >             ui.write(b'listkeys %s\n' % (namespace,))
17252
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
    22
  >             return super(debugkeysrepo, self).listkeys(namespace)
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
    23
  > 
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
    24
  >     if repo.local():
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
    25
  >         repo.__class__ = debugkeysrepo
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
    26
  > EOF
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    27
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    28
  $ hg init tmpa
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    29
  $ cd tmpa
17296
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17292
diff changeset
    30
  $ mkcommit kill_me
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17292
diff changeset
    31
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17292
diff changeset
    32
Checking that the feature is properly disabled
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17292
diff changeset
    33
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17292
diff changeset
    34
  $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
22950
bb8278b289ee obsolete: add readonly flag to obstore constructor
Durham Goode <durham@fb.com>
parents: 22948
diff changeset
    35
  abort: creating obsolete markers is not enabled on this repo
17296
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17292
diff changeset
    36
  [255]
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17292
diff changeset
    37
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17292
diff changeset
    38
Enabling it
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17292
diff changeset
    39
22955
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 22950
diff changeset
    40
  $ cat >> $HGRCPATH << EOF
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 22950
diff changeset
    41
  > [experimental]
34866
1644623ab096 config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents: 34853
diff changeset
    42
  > evolution=exchange
1644623ab096 config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents: 34853
diff changeset
    43
  > evolution.createmarkers=True
17296
a1f8869f2eee obsolete: introduce an `_enabled` switch to disable the feature by default
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17292
diff changeset
    44
  > EOF
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    45
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    46
Killing a single changeset without replacement
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    47
17292
8da6fe276a23 debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents: 17252
diff changeset
    48
  $ hg debugobsolete 0
8da6fe276a23 debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents: 17252
diff changeset
    49
  abort: changeset references must be full hexadecimal node identifiers
8da6fe276a23 debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents: 17252
diff changeset
    50
  [255]
8da6fe276a23 debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents: 17252
diff changeset
    51
  $ hg debugobsolete '00'
8da6fe276a23 debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents: 17252
diff changeset
    52
  abort: changeset references must be full hexadecimal node identifiers
8da6fe276a23 debugobsolete: do not traceback on invalid node identifiers
Patrick Mezard <patrick@mezard.eu>
parents: 17252
diff changeset
    53
  [255]
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    54
  $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
    55
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
    56
  obsoleted 1 changesets
17074
178a2e85d426 debugobsolete: list all obsolete marker if no argument are specified
Pierre-Yves.David@ens-lyon.org
parents: 17071
diff changeset
    57
  $ hg debugobsolete
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
    58
  97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}
18464
a2e9fe93d9ea changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18428
diff changeset
    59
a2e9fe93d9ea changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18428
diff changeset
    60
(test that mercurial is not confused)
a2e9fe93d9ea changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18428
diff changeset
    61
a2e9fe93d9ea changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18428
diff changeset
    62
  $ hg up null --quiet # having 0 as parent prevents it to be hidden
a2e9fe93d9ea changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18428
diff changeset
    63
  $ hg tip
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
    64
  -1:000000000000 (public) [tip ] 
18464
a2e9fe93d9ea changectx: fix the handling of `tip`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18428
diff changeset
    65
  $ hg up --hidden tip --quiet
37964
ea63a2004d09 update: print warning about hidden changeset after update
Martin von Zweigbergk <martinvonz@google.com>
parents: 37892
diff changeset
    66
  updated to hidden changeset 97b7c2d76b18
35711
35a0f6f31eef update: display the obsfate of hidden revision we update to
Boris Feld <boris.feld@octobus.net>
parents: 35710
diff changeset
    67
  (hidden revision '97b7c2d76b18' is pruned)
22177
a56038e6a3c9 obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
    68
a56038e6a3c9 obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
    69
Killing a single changeset with itself should fail
a56038e6a3c9 obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
    70
(simple local safeguard)
a56038e6a3c9 obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
    71
a56038e6a3c9 obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
    72
  $ hg debugobsolete `getid kill_me` `getid kill_me`
a56038e6a3c9 obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
    73
  abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0
a56038e6a3c9 obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
    74
  [255]
a56038e6a3c9 obsstore.create: add a simple safeguard against cyclic markers
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
    75
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    76
  $ cd ..
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    77
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    78
Killing a single changeset with replacement
22948
c136e26953aa obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents: 22853
diff changeset
    79
(and testing the format option)
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    80
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    81
  $ hg init tmpb
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    82
  $ cd tmpb
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    83
  $ mkcommit a
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    84
  $ mkcommit b
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    85
  $ mkcommit original_c
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    86
  $ hg up "desc('b')"
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    87
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    88
  $ mkcommit new_c
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
    89
  created new head
17390
74b44f25b4b1 revset: add hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents: 17306
diff changeset
    90
  $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
    91
  $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c`  `getid new_c` -d '121 120'
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
    92
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
    93
  obsoleted 1 changesets
17390
74b44f25b4b1 revset: add hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents: 17306
diff changeset
    94
  $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
74b44f25b4b1 revset: add hidden() revset
Patrick Mezard <patrick@mezard.eu>
parents: 17306
diff changeset
    95
  2:245bde4270cd add original_c
21033
254f55b64e31 debugrevlog: use unfiltered view for changelog
Matt Mackall <mpm@selenic.com>
parents: 20807
diff changeset
    96
  $ hg debugrevlog -cd
22311
5038dee5bdd6 debugrevlog: add chainlen column to --dump output
Sune Foldager <cryo@cyanite.org>
parents: 22274
diff changeset
    97
  # rev p1rev p2rev start   end deltastart base   p1   p2 rawsize totalsize compression heads chainlen
5038dee5bdd6 debugrevlog: add chainlen column to --dump output
Sune Foldager <cryo@cyanite.org>
parents: 22274
diff changeset
    98
      0    -1    -1     0    59          0    0    0    0      58        58           0     1        0
5038dee5bdd6 debugrevlog: add chainlen column to --dump output
Sune Foldager <cryo@cyanite.org>
parents: 22274
diff changeset
    99
      1     0    -1    59   118         59   59    0    0      58       116           0     1        0
23285
6cc1f388ac80 revlog: store fulltext when compressed delta is bigger than it
Siddharth Agarwal <sid0@fb.com>
parents: 23094
diff changeset
   100
      2     1    -1   118   193        118  118   59    0      76       192           0     1        0
6cc1f388ac80 revlog: store fulltext when compressed delta is bigger than it
Siddharth Agarwal <sid0@fb.com>
parents: 23094
diff changeset
   101
      3     1    -1   193   260        193  193   59    0      66       258           0     2        0
17074
178a2e85d426 debugobsolete: list all obsolete marker if no argument are specified
Pierre-Yves.David@ens-lyon.org
parents: 17071
diff changeset
   102
  $ hg debugobsolete
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   103
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   104
22948
c136e26953aa obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents: 22853
diff changeset
   105
(check for version number of the obsstore)
c136e26953aa obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents: 22853
diff changeset
   106
c136e26953aa obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents: 22853
diff changeset
   107
  $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null
c136e26953aa obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents: 22853
diff changeset
   108
  \x00 (no-eol) (esc)
c136e26953aa obsstore: fix defaultformat option passing
Durham Goode <durham@fb.com>
parents: 22853
diff changeset
   109
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   110
do it again (it read the obsstore before adding new changeset)
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   111
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   112
  $ hg up '.^'
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   113
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   114
  $ mkcommit new_2_c
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   115
  created new head
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   116
  $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   117
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   118
  obsoleted 1 changesets
17074
178a2e85d426 debugobsolete: list all obsolete marker if no argument are specified
Pierre-Yves.David@ens-lyon.org
parents: 17071
diff changeset
   119
  $ hg debugobsolete
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   120
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   121
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   122
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   123
Register two markers with a missing node
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   124
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   125
  $ hg up '.^'
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   126
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   127
  $ mkcommit new_3_c
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   128
  created new head
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   129
  $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   130
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   131
  obsoleted 1 changesets
17071
11f26e2669aa command: creation of obsolete marker
Pierre-Yves.David@ens-lyon.org
parents:
diff changeset
   132
  $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   133
  1 new obsolescence markers
17074
178a2e85d426 debugobsolete: list all obsolete marker if no argument are specified
Pierre-Yves.David@ens-lyon.org
parents: 17071
diff changeset
   134
  $ hg debugobsolete
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   135
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   136
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   137
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   138
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   139
28613
6433da9c96a9 debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents: 28612
diff changeset
   140
Test the --index option of debugobsolete command
6433da9c96a9 debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents: 28612
diff changeset
   141
  $ hg debugobsolete --index
6433da9c96a9 debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents: 28612
diff changeset
   142
  0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
6433da9c96a9 debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents: 28612
diff changeset
   143
  1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
6433da9c96a9 debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents: 28612
diff changeset
   144
  2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
6433da9c96a9 debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents: 28612
diff changeset
   145
  3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
6433da9c96a9 debugobsolete: add an option to show marker index
Kostia Balytskyi <ikostia@fb.com>
parents: 28612
diff changeset
   146
17774
0496d4f73cf4 obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17390
diff changeset
   147
Refuse pathological nullid successors
0496d4f73cf4 obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17390
diff changeset
   148
  $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000
0496d4f73cf4 obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17390
diff changeset
   149
  transaction abort!
0496d4f73cf4 obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17390
diff changeset
   150
  rollback completed
0496d4f73cf4 obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17390
diff changeset
   151
  abort: bad obsolescence marker detected: invalid successors nullid
0496d4f73cf4 obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17390
diff changeset
   152
  [255]
0496d4f73cf4 obsolete: cheap detection of nullid as successors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17390
diff changeset
   153
17119
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   154
Check that graphlog detect that a changeset is obsolete:
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   155
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 18684
diff changeset
   156
  $ hg log -G
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   157
  @  5:5601fb93a350 (draft) [tip ] add new_3_c
17119
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   158
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   159
  o  1:7c3bad9141dc (draft) [ ] add b
17119
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   160
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   161
  o  0:1f0dee641bb7 (draft) [ ] add a
17119
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   162
  
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   163
18268
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   164
check that heads does not report them
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   165
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   166
  $ hg heads
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   167
  5:5601fb93a350 (draft) [tip ] add new_3_c
18268
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   168
  $ hg heads --hidden
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   169
  5:5601fb93a350 (draft) [tip ] add new_3_c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   170
  4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   171
  3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   172
  2:245bde4270cd (draft *obsolete*) [ ] add original_c [rewritten as 3:cdbce2fbb163]
18268
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   173
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   174
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   175
check that summary does not report them
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   176
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   177
  $ hg init ../sink
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   178
  $ echo '[paths]' >> .hg/hgrc
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   179
  $ echo 'default=../sink' >> .hg/hgrc
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   180
  $ hg summary --remote
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   181
  parent: 5:5601fb93a350 tip
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   182
   add new_3_c
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   183
  branch: default
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   184
  commit: (clean)
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   185
  update: (current)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25351
diff changeset
   186
  phases: 3 draft
18268
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   187
  remote: 3 outgoing
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   188
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   189
  $ hg summary --remote --hidden
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   190
  parent: 5:5601fb93a350 tip
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   191
   add new_3_c
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   192
  branch: default
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   193
  commit: (clean)
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   194
  update: 3 new changesets, 4 branch heads (merge)
25382
6084926366b9 summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents: 25351
diff changeset
   195
  phases: 6 draft
18268
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   196
  remote: 3 outgoing
ed25fe3a7e2f clfilter: ensure that hidden filtering is working on all commands
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18267
diff changeset
   197
18423
5d6ee2494f63 clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18401
diff changeset
   198
check that various commands work well with filtering
5d6ee2494f63 clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18401
diff changeset
   199
5d6ee2494f63 clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18401
diff changeset
   200
  $ hg tip
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   201
  5:5601fb93a350 (draft) [tip ] add new_3_c
18423
5d6ee2494f63 clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18401
diff changeset
   202
  $ hg log -r 6
5d6ee2494f63 clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18401
diff changeset
   203
  abort: unknown revision '6'!
5d6ee2494f63 clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18401
diff changeset
   204
  [255]
5d6ee2494f63 clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18401
diff changeset
   205
  $ hg log -r 4
35571
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents: 35522
diff changeset
   206
  abort: hidden revision '4' was rewritten as: 5601fb93a350!
23046
c1aede895072 repoview: issue a special message when filtering hidden changesets
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23045
diff changeset
   207
  (use --hidden to access hidden revisions)
18423
5d6ee2494f63 clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18401
diff changeset
   208
  [255]
23062
ba89f7b542c9 revset: have rev() drop out-of-range or filtered rev explicitly (issue4396)
Yuya Nishihara <yuya@tcha.org>
parents: 23046
diff changeset
   209
  $ hg debugrevspec 'rev(6)'
ba89f7b542c9 revset: have rev() drop out-of-range or filtered rev explicitly (issue4396)
Yuya Nishihara <yuya@tcha.org>
parents: 23046
diff changeset
   210
  $ hg debugrevspec 'rev(4)'
24204
d2de20e1451f revset: extend fullreposet to make "null" revision magically appears in set
Yuya Nishihara <yuya@tcha.org>
parents: 24162
diff changeset
   211
  $ hg debugrevspec 'null'
d2de20e1451f revset: extend fullreposet to make "null" revision magically appears in set
Yuya Nishihara <yuya@tcha.org>
parents: 24162
diff changeset
   212
  -1
18423
5d6ee2494f63 clfilter: stronger detection of filtered changeset in changectx.__init__
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18401
diff changeset
   213
17119
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   214
Check that public changeset are not accounted as obsolete:
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   215
18267
5bb610f87d1d clfilter: enforce hidden changeset globally
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18104
diff changeset
   216
  $ hg --hidden phase --public 2
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35611
diff changeset
   217
  1 new phase-divergent changesets
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 18684
diff changeset
   218
  $ hg log -G
33715
9c27a2891b75 evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33695
diff changeset
   219
  @  5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
17119
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   220
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   221
  | o  2:245bde4270cd (public) [ ] add original_c
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   222
  |/
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   223
  o  1:7c3bad9141dc (public) [ ] add b
17119
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   224
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   225
  o  0:1f0dee641bb7 (public) [ ] add a
17119
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   226
  
2e13c1bd34dc graphlog: display obsolete changeset as "x"
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17075
diff changeset
   227
17829
c73f7a28953c revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17774
diff changeset
   228
And that bumped changeset are detected
c73f7a28953c revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17774
diff changeset
   229
--------------------------------------
c73f7a28953c revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17774
diff changeset
   230
c73f7a28953c revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17774
diff changeset
   231
If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also
c73f7a28953c revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17774
diff changeset
   232
note that the bumped changeset (5:5601fb93a350) is not a direct successor of
c73f7a28953c revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17774
diff changeset
   233
the public changeset
c73f7a28953c revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17774
diff changeset
   234
33797
ed99d3afef88 revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents: 33795
diff changeset
   235
  $ hg log --hidden -r 'phasedivergent()'
33715
9c27a2891b75 evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33695
diff changeset
   236
  5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
17829
c73f7a28953c revset: add a bumped revset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17774
diff changeset
   237
17834
743d04dd48ec push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17833
diff changeset
   238
And that we can't push bumped changeset
743d04dd48ec push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17833
diff changeset
   239
18085
4c53f015564f test: fix truncated comment in test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18015
diff changeset
   240
  $ hg push ../tmpa -r 0 --force #(make repo related)
18015
42f56a0418b3 clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17834
diff changeset
   241
  pushing to ../tmpa
42f56a0418b3 clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17834
diff changeset
   242
  searching for changes
18104
a2cebd3e4daa clfilter: use filtering in `visibleheads`
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18085
diff changeset
   243
  warning: repository is unrelated
18015
42f56a0418b3 clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17834
diff changeset
   244
  adding changesets
42f56a0418b3 clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17834
diff changeset
   245
  adding manifests
42f56a0418b3 clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17834
diff changeset
   246
  adding file changes
42f56a0418b3 clfilter: fix a false positive in the test-obsolete.t
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17834
diff changeset
   247
  added 1 changesets with 1 changes to 1 files (+1 heads)
17834
743d04dd48ec push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17833
diff changeset
   248
  $ hg push ../tmpa
743d04dd48ec push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17833
diff changeset
   249
  pushing to ../tmpa
743d04dd48ec push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17833
diff changeset
   250
  searching for changes
33715
9c27a2891b75 evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33695
diff changeset
   251
  abort: push includes phase-divergent changeset: 5601fb93a350!
17834
743d04dd48ec push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17833
diff changeset
   252
  [255]
743d04dd48ec push: refuse to push bumped changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17833
diff changeset
   253
17831
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   254
Fixing "bumped" situation
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   255
We need to create a clone of 5 and add a special marker with a flag
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   256
27385
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   257
  $ hg summary
33715
9c27a2891b75 evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33695
diff changeset
   258
  parent: 5:5601fb93a350 tip (phase-divergent)
27385
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   259
   add new_3_c
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   260
  branch: default
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   261
  commit: (clean)
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   262
  update: 1 new changesets, 2 branch heads (merge)
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   263
  phases: 1 draft
33715
9c27a2891b75 evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33695
diff changeset
   264
  phase-divergent: 1 changesets
17831
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   265
  $ hg up '5^'
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   266
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   267
  $ hg revert -ar 5
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   268
  adding new_3_c
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   269
  $ hg ci -m 'add n3w_3_c'
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   270
  created new head
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   271
  $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   272
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   273
  obsoleted 1 changesets
33797
ed99d3afef88 revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents: 33795
diff changeset
   274
  $ hg log -r 'phasedivergent()'
17831
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   275
  $ hg log -G
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   276
  @  6:6f9641995072 (draft) [tip ] add n3w_3_c
17831
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   277
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   278
  | o  2:245bde4270cd (public) [ ] add original_c
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   279
  |/
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   280
  o  1:7c3bad9141dc (public) [ ] add b
17831
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   281
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   282
  o  0:1f0dee641bb7 (public) [ ] add a
17831
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   283
  
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   284
32649
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   285
Basic exclusive testing
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   286
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   287
  $ hg log -G --hidden
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   288
  @  6:6f9641995072 (draft) [tip ] add n3w_3_c
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   289
  |
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   290
  | x  5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072]
32649
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   291
  |/
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   292
  | x  4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
32649
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   293
  |/
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   294
  | x  3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
32649
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   295
  |/
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   296
  | o  2:245bde4270cd (public) [ ] add original_c
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   297
  |/
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   298
  o  1:7c3bad9141dc (public) [ ] add b
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   299
  |
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   300
  o  0:1f0dee641bb7 (public) [ ] add a
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   301
  
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   302
  $ hg debugobsolete --rev 6f9641995072
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   303
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   304
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   305
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   306
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   307
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   308
  $ hg debugobsolete --rev 6f9641995072 --exclusive
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   309
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   310
  $ hg debugobsolete --rev 5601fb93a350 --hidden
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   311
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   312
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   313
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   314
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   315
  $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   316
  $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   317
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   318
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   319
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
00a7f7b1af9c obsolete: add a function to compute "exclusive-markers" for a set of nodes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32646
diff changeset
   320
24681
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   321
  $ cd ..
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   322
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   323
Revision 0 is hidden
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   324
--------------------
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   325
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   326
  $ hg init rev0hidden
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   327
  $ cd rev0hidden
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   328
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   329
  $ mkcommit kill0
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   330
  $ hg up -q null
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   331
  $ hg debugobsolete `getid kill0`
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   332
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   333
  obsoleted 1 changesets
24681
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   334
  $ mkcommit a
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   335
  $ mkcommit b
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   336
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   337
Should pick the first visible revision as "repo" node
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   338
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   339
  $ hg archive ../archive-null
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   340
  $ cat ../archive-null/.hg_archival.txt
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   341
  repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   342
  node: 7c3bad9141dcb46ff89abf5f61856facd56e476c
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   343
  branch: default
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   344
  latesttag: null
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   345
  latesttagdistance: 2
33ab99a6ad9b archive: look for first visible revision to build repo identity (issue4591)
Yuya Nishihara <yuya@tcha.org>
parents: 24234
diff changeset
   346
  changessincelatesttag: 2
17831
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   347
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   348
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   349
  $ cd ..
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   350
35710
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   351
Can disable transaction summary report
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   352
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   353
  $ hg init transaction-summary
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   354
  $ cd transaction-summary
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   355
  $ mkcommit a
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   356
  $ mkcommit b
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   357
  $ hg up -q null
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   358
  $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a`
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   359
  1 new obsolescence markers
35710
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   360
  obsoleted 1 changesets
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   361
  $ cd ..
5cd60b0587a8 evolution: make reporting of new unstable changesets optional
Martin von Zweigbergk <martinvonz@google.com>
parents: 35709
diff changeset
   362
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   363
Exchange Test
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   364
============================
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   365
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   366
Destination repo does not have any data
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   367
---------------------------------------
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   368
18493
fe67107094fd discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18492
diff changeset
   369
Simple incoming test
fe67107094fd discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18492
diff changeset
   370
fe67107094fd discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18492
diff changeset
   371
  $ hg init tmpc
fe67107094fd discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18492
diff changeset
   372
  $ cd tmpc
fe67107094fd discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18492
diff changeset
   373
  $ hg incoming ../tmpb
fe67107094fd discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18492
diff changeset
   374
  comparing with ../tmpb
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   375
  0:1f0dee641bb7 (public) [ ] add a
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   376
  1:7c3bad9141dc (public) [ ] add b
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   377
  2:245bde4270cd (public) [ ] add original_c
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   378
  6:6f9641995072 (draft) [tip ] add n3w_3_c
18493
fe67107094fd discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18492
diff changeset
   379
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   380
Try to pull markers
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   381
(extinct changeset are excluded but marker are pushed)
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   382
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   383
  $ hg pull ../tmpb
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   384
  pulling from ../tmpb
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   385
  requesting all changes
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   386
  adding changesets
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   387
  adding manifests
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   388
  adding file changes
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   389
  added 4 changesets with 4 changes to 4 files (+1 heads)
25351
97513f9d2e38 test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25297
diff changeset
   390
  5 new obsolescence markers
39497
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38251
diff changeset
   391
  new changesets 1f0dee641bb7:6f9641995072 (1 drafts)
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   392
  (run 'hg heads' to see heads, 'hg merge' to merge)
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   393
  $ hg debugobsolete
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   394
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   395
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   396
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   397
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   398
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
17126
8fa8717b47b6 obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17119
diff changeset
   399
8fa8717b47b6 obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17119
diff changeset
   400
Rollback//Transaction support
8fa8717b47b6 obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17119
diff changeset
   401
8fa8717b47b6 obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17119
diff changeset
   402
  $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   403
  1 new obsolescence markers
17126
8fa8717b47b6 obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17119
diff changeset
   404
  $ hg debugobsolete
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   405
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   406
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   407
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   408
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   409
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   410
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'}
17126
8fa8717b47b6 obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17119
diff changeset
   411
  $ hg rollback -n
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   412
  repository tip rolled back to revision 3 (undo debugobsolete)
17126
8fa8717b47b6 obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17119
diff changeset
   413
  $ hg rollback
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   414
  repository tip rolled back to revision 3 (undo debugobsolete)
17126
8fa8717b47b6 obsolete: write obsolete marker inside a transaction
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17119
diff changeset
   415
  $ hg debugobsolete
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   416
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   417
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   418
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   419
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   420
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   421
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   422
  $ cd ..
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   423
18492
45445187d286 test: minor documentation fix
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18464
diff changeset
   424
Try to push markers
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   425
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   426
  $ hg init tmpd
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   427
  $ hg -R tmpb push tmpd
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   428
  pushing to tmpd
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   429
  searching for changes
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   430
  adding changesets
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   431
  adding manifests
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   432
  adding file changes
17169
c18ecebed3f1 push: refuse to push obsolete changesets
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17126
diff changeset
   433
  added 4 changesets with 4 changes to 4 files (+1 heads)
25351
97513f9d2e38 test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25297
diff changeset
   434
  5 new obsolescence markers
22349
9d1f3896f39c test-obsolete: sort the output of debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22348
diff changeset
   435
  $ hg -R tmpd debugobsolete | sort
9d1f3896f39c test-obsolete: sort the output of debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22348
diff changeset
   436
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   437
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
22349
9d1f3896f39c test-obsolete: sort the output of debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22348
diff changeset
   438
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
9d1f3896f39c test-obsolete: sort the output of debugobsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22348
diff changeset
   439
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   440
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   441
17252
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
   442
Check obsolete keys are exchanged only if source has an obsolete store
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
   443
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
   444
  $ hg init empty
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
   445
  $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
   446
  pushing to tmpd
22019
9fcf772f15ff push: perform phases discovery before the push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21978
diff changeset
   447
  listkeys phases
22239
0688010ee38f push: move bookmark discovery with other discovery steps
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22220
diff changeset
   448
  listkeys bookmarks
17252
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
   449
  no changes found
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
   450
  listkeys phases
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
   451
  [1]
16fad7323e56 push: do not try to push remote obsolete if local has none
Patrick Mezard <patrick@mezard.eu>
parents: 17249
diff changeset
   452
17249
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   453
clone support
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   454
(markers are copied and extinct changesets are included to allow hardlinks)
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   455
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   456
  $ hg clone tmpb clone-dest
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   457
  updating to branch default
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   458
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   459
  $ hg -R clone-dest log -G --hidden
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   460
  @  6:6f9641995072 (draft) [tip ] add n3w_3_c
17249
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   461
  |
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   462
  | x  5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c [rewritten as 6:6f9641995072]
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   463
  |/
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   464
  | x  4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c [rewritten as 5:5601fb93a350]
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   465
  |/
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   466
  | x  3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c [rewritten as 4:ca819180edb9]
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   467
  |/
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   468
  | o  2:245bde4270cd (public) [ ] add original_c
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   469
  |/
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   470
  o  1:7c3bad9141dc (public) [ ] add b
17249
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   471
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   472
  o  0:1f0dee641bb7 (public) [ ] add a
17249
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   473
  
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   474
  $ hg -R clone-dest debugobsolete
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   475
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   476
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   477
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   478
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   479
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
17249
7d4747c711a9 clone: copy obsolete markers during local clone
Pierre-Yves.David@ens-lyon.org
parents: 17214
diff changeset
   480
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   481
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   482
Destination repo have existing data
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   483
---------------------------------------
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   484
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   485
On pull
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   486
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   487
  $ hg init tmpe
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   488
  $ cd tmpe
22348
44092e6d5e13 test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22311
diff changeset
   489
  $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   490
  1 new obsolescence markers
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   491
  $ hg pull ../tmpb
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   492
  pulling from ../tmpb
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   493
  requesting all changes
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   494
  adding changesets
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   495
  adding manifests
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   496
  adding file changes
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   497
  added 4 changesets with 4 changes to 4 files (+1 heads)
25351
97513f9d2e38 test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25297
diff changeset
   498
  5 new obsolescence markers
39497
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38251
diff changeset
   499
  new changesets 1f0dee641bb7:6f9641995072 (1 drafts)
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   500
  (run 'hg heads' to see heads, 'hg merge' to merge)
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   501
  $ hg debugobsolete
22348
44092e6d5e13 test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22311
diff changeset
   502
  1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   503
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   504
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   505
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   506
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   507
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   508
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   509
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   510
On push
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   511
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   512
  $ hg push ../tmpc
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   513
  pushing to ../tmpc
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   514
  searching for changes
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   515
  no changes found
25351
97513f9d2e38 test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25297
diff changeset
   516
  1 new obsolescence markers
17075
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   517
  [1]
28ed1c4511ce obsolete: exchange obsolete marker over pushkey
Pierre-Yves.David@ens-lyon.org
parents: 17074
diff changeset
   518
  $ hg -R ../tmpc debugobsolete
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   519
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   520
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   521
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
22220
908c76e84ec5 debugobsolete: explicitly display date in the output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22207
diff changeset
   522
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   523
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
22348
44092e6d5e13 test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22311
diff changeset
   524
  1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   525
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   526
detect outgoing obsolete and unstable
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   527
---------------------------------------
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   528
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   529
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 18684
diff changeset
   530
  $ hg log -G
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   531
  o  3:6f9641995072 (draft) [tip ] add n3w_3_c
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   532
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   533
  | o  2:245bde4270cd (public) [ ] add original_c
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   534
  |/
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   535
  o  1:7c3bad9141dc (public) [ ] add b
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   536
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   537
  o  0:1f0dee641bb7 (public) [ ] add a
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   538
  
17831
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   539
  $ hg up 'desc("n3w_3_c")'
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   540
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   541
  $ mkcommit original_d
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   542
  $ mkcommit original_e
22272
406181ee335f debugobsolete: add a way to record parent information
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22239
diff changeset
   543
  $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   544
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   545
  obsoleted 1 changesets
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35611
diff changeset
   546
  1 new orphan changesets
22272
406181ee335f debugobsolete: add a way to record parent information
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22239
diff changeset
   547
  $ hg debugobsolete | grep `getid original_d`
406181ee335f debugobsolete: add a way to record parent information
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22239
diff changeset
   548
  94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   549
  $ hg log -r 'obsolete()'
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   550
  4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
27385
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   551
  $ hg summary
33695
03039ff3082b evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents: 33542
diff changeset
   552
  parent: 5:cda648ca50f5 tip (orphan)
27385
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   553
   add original_e
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   554
  branch: default
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   555
  commit: (clean)
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   556
  update: 1 new changesets, 2 branch heads (merge)
20e7de6205e7 summary: add troubles list to the output of hg summary
Laurent Charignon <lcharignon@fb.com>
parents: 27319
diff changeset
   557
  phases: 3 draft
33695
03039ff3082b evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents: 33542
diff changeset
   558
  orphan: 1 changesets
33795
9dcc3529e002 revset: rename unstable into orphan
Boris Feld <boris.feld@octobus.net>
parents: 33794
diff changeset
   559
  $ hg log -G -r '::orphan()'
33695
03039ff3082b evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents: 33542
diff changeset
   560
  @  5:cda648ca50f5 (draft orphan) [tip ] add original_e
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   561
  |
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   562
  x  4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   563
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   564
  o  3:6f9641995072 (draft) [ ] add n3w_3_c
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   565
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   566
  o  1:7c3bad9141dc (public) [ ] add b
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   567
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   568
  o  0:1f0dee641bb7 (public) [ ] add a
17171
9c750c3e4fac obsolete: compute unstable changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17170
diff changeset
   569
  
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   570
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   571
refuse to push obsolete changeset
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   572
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   573
  $ hg push ../tmpc/ -r 'desc("original_d")'
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   574
  pushing to ../tmpc/
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   575
  searching for changes
17833
0c1185f6ddd7 obsolete: simplify push abort message
push includes an xxx changeset: yyyyyyyyyy
parents: 17831
diff changeset
   576
  abort: push includes obsolete changeset: 94b33453f93b!
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   577
  [255]
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   578
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   579
refuse to push unstable changeset
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   580
17172
12fdaa30063a push: refuse to push unstable changesets without force
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17171
diff changeset
   581
  $ hg push ../tmpc/
12fdaa30063a push: refuse to push unstable changesets without force
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17171
diff changeset
   582
  pushing to ../tmpc/
12fdaa30063a push: refuse to push unstable changesets without force
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17171
diff changeset
   583
  searching for changes
33695
03039ff3082b evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents: 33542
diff changeset
   584
  abort: push includes orphan changeset: cda648ca50f5!
17172
12fdaa30063a push: refuse to push unstable changesets without force
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17171
diff changeset
   585
  [255]
17173
c621f84dbb35 obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17172
diff changeset
   586
c621f84dbb35 obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17172
diff changeset
   587
Test that extinct changeset are properly detected
c621f84dbb35 obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17172
diff changeset
   588
c621f84dbb35 obsolete: compute extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17172
diff changeset
   589
  $ hg log -r 'extinct()'
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   590
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   591
Don't try to push extinct changeset
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   592
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   593
  $ hg init ../tmpf
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   594
  $ hg out  ../tmpf
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   595
  comparing with ../tmpf
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   596
  searching for changes
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   597
  0:1f0dee641bb7 (public) [ ] add a
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   598
  1:7c3bad9141dc (public) [ ] add b
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   599
  2:245bde4270cd (public) [ ] add original_c
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   600
  3:6f9641995072 (draft) [ ] add n3w_3_c
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   601
  4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
33695
03039ff3082b evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents: 33542
diff changeset
   602
  5:cda648ca50f5 (draft orphan) [tip ] add original_e
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   603
  $ hg push ../tmpf -f # -f because be push unstable too
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   604
  pushing to ../tmpf
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   605
  searching for changes
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   606
  adding changesets
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   607
  adding manifests
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   608
  adding file changes
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   609
  added 6 changesets with 6 changes to 6 files (+1 heads)
25351
97513f9d2e38 test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25297
diff changeset
   610
  7 new obsolescence markers
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35611
diff changeset
   611
  1 new orphan changesets
17206
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   612
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   613
no warning displayed
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   614
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   615
  $ hg push ../tmpf
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   616
  pushing to ../tmpf
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   617
  searching for changes
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   618
  no changes found
70ebb4bd8083 obsolete: do not exchange extinct changesets
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 17173
diff changeset
   619
  [1]
17214
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   620
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   621
Do not warn about new head when the new head is a successors of a remote one
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   622
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 18684
diff changeset
   623
  $ hg log -G
33695
03039ff3082b evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents: 33542
diff changeset
   624
  @  5:cda648ca50f5 (draft orphan) [tip ] add original_e
17214
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   625
  |
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   626
  x  4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   627
  |
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   628
  o  3:6f9641995072 (draft) [ ] add n3w_3_c
17214
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   629
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   630
  | o  2:245bde4270cd (public) [ ] add original_c
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   631
  |/
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   632
  o  1:7c3bad9141dc (public) [ ] add b
17214
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   633
  |
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   634
  o  0:1f0dee641bb7 (public) [ ] add a
17214
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   635
  
17831
70b08df24fef obsolete: add a flag that allows fixing "bumped" changeset
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17830
diff changeset
   636
  $ hg up -q 'desc(n3w_3_c)'
17214
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   637
  $ mkcommit obsolete_e
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   638
  created new head
32761
8f83f924ee1c test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents: 32652
diff changeset
   639
  $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \
8f83f924ee1c test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents: 32652
diff changeset
   640
  > -u 'test <test@example.net>'
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   641
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   642
  obsoleted 1 changesets
18493
fe67107094fd discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18492
diff changeset
   643
  $ hg outgoing ../tmpf # parasite hg outgoing testin
fe67107094fd discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18492
diff changeset
   644
  comparing with ../tmpf
fe67107094fd discovery: outgoing pass unfiltered repo to findcommonincoming (issue3776)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18492
diff changeset
   645
  searching for changes
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   646
  6:3de5eca88c00 (draft) [tip ] add obsolete_e
17214
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   647
  $ hg push ../tmpf
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   648
  pushing to ../tmpf
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   649
  searching for changes
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   650
  adding changesets
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   651
  adding manifests
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   652
  adding file changes
738ad56dd8a6 checkheads: take future obsoleted heads into account
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17208
diff changeset
   653
  added 1 changesets with 1 changes to 1 files (+1 heads)
25351
97513f9d2e38 test: use bundle2 for exchange in test-obsolete
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25297
diff changeset
   654
  1 new obsolescence markers
33252
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 33109
diff changeset
   655
  obsoleted 1 changesets
17297
6955d69a52a4 obsolete: warns if markers exist in a repo where the feature is not enabled
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17296
diff changeset
   656
22274
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   657
test relevance computation
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   658
---------------------------------------
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   659
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   660
Checking simple case of "marker relevance".
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   661
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   662
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   663
Reminder of the repo situation
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   664
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   665
  $ hg log --hidden --graph
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   666
  @  6:3de5eca88c00 (draft) [tip ] add obsolete_e
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   667
  |
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   668
  | x  5:cda648ca50f5 (draft *obsolete*) [ ] add original_e [rewritten as 6:3de5eca88c00 by test <test@example.net>]
22274
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   669
  | |
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
   670
  | x  4:94b33453f93b (draft *obsolete*) [ ] add original_d [pruned]
22274
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   671
  |/
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   672
  o  3:6f9641995072 (draft) [ ] add n3w_3_c
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   673
  |
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   674
  | o  2:245bde4270cd (public) [ ] add original_c
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   675
  |/
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   676
  o  1:7c3bad9141dc (public) [ ] add b
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   677
  |
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   678
  o  0:1f0dee641bb7 (public) [ ] add a
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   679
  
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   680
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   681
List of all markers
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   682
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   683
  $ hg debugobsolete
22348
44092e6d5e13 test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22311
diff changeset
   684
  1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   685
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   686
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   687
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
22274
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   688
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
25118
e632a2429982 obsolete: sort obsmarkers during exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25111
diff changeset
   689
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
22274
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   690
  94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
32761
8f83f924ee1c test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents: 32652
diff changeset
   691
  cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
22274
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   692
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   693
List of changesets with no chain
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   694
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   695
  $ hg debugobsolete --hidden --rev ::2
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   696
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   697
List of changesets that are included on marker chain
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   698
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   699
  $ hg debugobsolete --hidden --rev 6
32761
8f83f924ee1c test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents: 32652
diff changeset
   700
  cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
22274
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   701
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   702
List of changesets with a longer chain, (including a pruned children)
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   703
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   704
  $ hg debugobsolete --hidden --rev 3
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   705
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
22348
44092e6d5e13 test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22311
diff changeset
   706
  1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   707
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
22274
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   708
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   709
  94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   710
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   711
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   712
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   713
List of both
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   714
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   715
  $ hg debugobsolete --hidden --rev 3::6
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   716
  1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
22348
44092e6d5e13 test-obsolete: change a marker so it is relevant to the exchanged set
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22311
diff changeset
   717
  1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
23094
32dbd1294ea7 tests: change obsolete timestamp to avoid "gmtime()" problem on Windows
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 23062
diff changeset
   718
  245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
22274
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   719
  5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   720
  94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   721
  ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'}
32761
8f83f924ee1c test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents: 32652
diff changeset
   722
  cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob)
22274
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   723
  cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
10e87c67f1c7 debugobsolete: add a --rev argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 22272
diff changeset
   724
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   725
List of all markers in JSON
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   726
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   727
  $ hg debugobsolete -Tjson
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   728
  [
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   729
   {
37770
31750413f8d7 formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents: 37705
diff changeset
   730
    "date": [1339, 0],
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   731
    "flag": 0,
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   732
    "metadata": {"user": "test"},
33877
eae63a9e59da obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents: 33804
diff changeset
   733
    "prednode": "1339133913391339133913391339133913391339",
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   734
    "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"]
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   735
   },
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   736
   {
37770
31750413f8d7 formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents: 37705
diff changeset
   737
    "date": [1339, 0],
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   738
    "flag": 0,
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   739
    "metadata": {"user": "test"},
33877
eae63a9e59da obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents: 33804
diff changeset
   740
    "prednode": "1337133713371337133713371337133713371337",
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   741
    "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"]
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   742
   },
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   743
   {
37770
31750413f8d7 formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents: 37705
diff changeset
   744
    "date": [121, 120],
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   745
    "flag": 12,
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   746
    "metadata": {"user": "test"},
33877
eae63a9e59da obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents: 33804
diff changeset
   747
    "prednode": "245bde4270cd1072a27757984f9cda8ba26f08ca",
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   748
    "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"]
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   749
   },
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   750
   {
37770
31750413f8d7 formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents: 37705
diff changeset
   751
    "date": [1338, 0],
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   752
    "flag": 1,
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   753
    "metadata": {"user": "test"},
33877
eae63a9e59da obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents: 33804
diff changeset
   754
    "prednode": "5601fb93a350734d935195fee37f4054c529ff39",
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   755
    "succnodes": ["6f96419950729f3671185b847352890f074f7557"]
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   756
   },
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   757
   {
37770
31750413f8d7 formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents: 37705
diff changeset
   758
    "date": [1338, 0],
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   759
    "flag": 0,
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   760
    "metadata": {"user": "test"},
33877
eae63a9e59da obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents: 33804
diff changeset
   761
    "prednode": "ca819180edb99ed25ceafb3e9584ac287e240b00",
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   762
    "succnodes": ["1337133713371337133713371337133713371337"]
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   763
   },
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   764
   {
37770
31750413f8d7 formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents: 37705
diff changeset
   765
    "date": [1337, 0],
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   766
    "flag": 0,
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   767
    "metadata": {"user": "test"},
33877
eae63a9e59da obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents: 33804
diff changeset
   768
    "prednode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f",
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   769
    "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"]
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   770
   },
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   771
   {
37770
31750413f8d7 formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents: 37705
diff changeset
   772
    "date": [0, 0],
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   773
    "flag": 0,
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   774
    "metadata": {"user": "test"},
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   775
    "parentnodes": ["6f96419950729f3671185b847352890f074f7557"],
33877
eae63a9e59da obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents: 33804
diff changeset
   776
    "prednode": "94b33453f93bdb8d457ef9b770851a618bf413e1",
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   777
    "succnodes": []
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   778
   },
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   779
   {
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   780
    "date": *, (glob)
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   781
    "flag": 0,
32763
f924dd043974 json: pass formatting options recursively
Yuya Nishihara <yuya@tcha.org>
parents: 32761
diff changeset
   782
    "metadata": {"user": "test <test@example.net>"},
33877
eae63a9e59da obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents: 33804
diff changeset
   783
    "prednode": "cda648ca50f50482b7055c0b0c4c117bba6733d9",
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   784
    "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"]
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   785
   }
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   786
  ]
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   787
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   788
Template keywords
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   789
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   790
  $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n'
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   791
  3de5eca88c00 ????-??-?? (glob)
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   792
  $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n'
32761
8f83f924ee1c test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents: 32652
diff changeset
   793
  user=test <test@example.net>
34426
12bfecd0ffe6 formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents: 34293
diff changeset
   794
  $ hg debugobsolete -r6 -T '{metadata}\n{metadata}\n'
12bfecd0ffe6 formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents: 34293
diff changeset
   795
  'user': 'test <test@example.net>'
32761
8f83f924ee1c test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents: 32652
diff changeset
   796
  'user': 'test <test@example.net>'
34426
12bfecd0ffe6 formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents: 34293
diff changeset
   797
  $ hg debugobsolete -r6 -T '{succnodes}\n{succnodes}\n'
12bfecd0ffe6 formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents: 34293
diff changeset
   798
  3de5eca88c00aa039da7399a220f4a5221faa585
12bfecd0ffe6 formatter: fix default list/dict generator to be evaluated more than once
Yuya Nishihara <yuya@tcha.org>
parents: 34293
diff changeset
   799
  3de5eca88c00aa039da7399a220f4a5221faa585
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   800
  $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n'
32761
8f83f924ee1c test-obsolete: include <> in user field to check JSON escapes
Yuya Nishihara <yuya@tcha.org>
parents: 32652
diff changeset
   801
  0 test <test@example.net>
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
   802
24733
c00e4338fa4b obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24681
diff changeset
   803
Test the debug output for exchange
c00e4338fa4b obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24681
diff changeset
   804
----------------------------------
c00e4338fa4b obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24681
diff changeset
   805
29702
30c59bdd4f41 tests: remove all remaining usage of experimental.bundle2-exp
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29677
diff changeset
   806
  $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2
24733
c00e4338fa4b obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24681
diff changeset
   807
  pulling from ../tmpb
c00e4338fa4b obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24681
diff changeset
   808
  searching for changes
c00e4338fa4b obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24681
diff changeset
   809
  no changes found
c00e4338fa4b obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24681
diff changeset
   810
  obsmarker-exchange: 346 bytes received
c00e4338fa4b obsolete: experimental flag to get debug about obsmarkers exchange
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24681
diff changeset
   811
18401
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   812
check hgweb does not explode
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   813
====================================
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   814
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   815
  $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   816
  adding changesets
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   817
  adding manifests
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   818
  adding file changes
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   819
  added 62 changesets with 63 changes to 9 files (+60 heads)
39497
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38251
diff changeset
   820
  new changesets 50c51b361e60:c15e9edfca13 (62 drafts)
39905
a89dd6d01df0 pullreport: rev duplicated and extinct into account
Boris Feld <boris.feld@octobus.net>
parents: 39904
diff changeset
   821
  (2 other changesets obsolete on arrival)
18401
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   822
  (run 'hg heads .' to see heads, 'hg merge' to merge)
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   823
  $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`;
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   824
  > do
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   825
  >    hg debugobsolete $node
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   826
  > done
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   827
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   828
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   829
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   830
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   831
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   832
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   833
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   834
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   835
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   836
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   837
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   838
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   839
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   840
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   841
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   842
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   843
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   844
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   845
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   846
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   847
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   848
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   849
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   850
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   851
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   852
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   853
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   854
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   855
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   856
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   857
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   858
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   859
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   860
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   861
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   862
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   863
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   864
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   865
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   866
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   867
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   868
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   869
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   870
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   871
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   872
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   873
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   874
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   875
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   876
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   877
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   878
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   879
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   880
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   881
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   882
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   883
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   884
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   885
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   886
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   887
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   888
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   889
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   890
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   891
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   892
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   893
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   894
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   895
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   896
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   897
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   898
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   899
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   900
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   901
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   902
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   903
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   904
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   905
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   906
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   907
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   908
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   909
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   910
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   911
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   912
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   913
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   914
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   915
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   916
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   917
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   918
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   919
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   920
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   921
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   922
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   923
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   924
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   925
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   926
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   927
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   928
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   929
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   930
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   931
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   932
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   933
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   934
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   935
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   936
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   937
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   938
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   939
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   940
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   941
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   942
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   943
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   944
  obsoleted 1 changesets
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
   945
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
   946
  obsoleted 1 changesets
18401
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   947
  $ hg up tip
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   948
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   949
30733
66448a53bdac test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents: 30715
diff changeset
   950
#if serve
66448a53bdac test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents: 30715
diff changeset
   951
18401
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   952
  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   953
  $ cat hg.pid >> $DAEMON_PIDS
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   954
18426
01638b51df44 hgweb: ignore filtered revision in revnav
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18423
diff changeset
   955
check changelog view
01638b51df44 hgweb: ignore filtered revision in revnav
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18423
diff changeset
   956
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
   957
  $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/'
18426
01638b51df44 hgweb: ignore filtered revision in revnav
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18423
diff changeset
   958
  200 Script output follows
18401
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   959
18428
8c10f760ca34 hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18426
diff changeset
   960
check graph view
8c10f760ca34 hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18426
diff changeset
   961
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
   962
  $ get-with-headers.py --headeronly localhost:$HGPORT 'graph'
18428
8c10f760ca34 hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18426
diff changeset
   963
  200 Script output follows
8c10f760ca34 hgweb: walk the graph through the changelog
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18426
diff changeset
   964
18401
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   965
check filelog view
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   966
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
   967
  $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar'
18401
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   968
  200 Script output follows
18522
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   969
37362
c16b55edd408 tests: show that hgweb contains hidden revisions in /filelog/ view
Martin von Zweigbergk <martinvonz@google.com>
parents: 37346
diff changeset
   970
check filelog view for hidden commits (obsolete ones are hidden here)
c16b55edd408 tests: show that hgweb contains hidden revisions in /filelog/ view
Martin von Zweigbergk <martinvonz@google.com>
parents: 37346
diff changeset
   971
c16b55edd408 tests: show that hgweb contains hidden revisions in /filelog/ view
Martin von Zweigbergk <martinvonz@google.com>
parents: 37346
diff changeset
   972
  $ get-with-headers.py localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' | grep obsolete
37363
d3a2344446e6 hgweb: don't include hidden revisions in /filelog/ view
Martin von Zweigbergk <martinvonz@google.com>
parents: 37362
diff changeset
   973
  [1]
37362
c16b55edd408 tests: show that hgweb contains hidden revisions in /filelog/ view
Martin von Zweigbergk <martinvonz@google.com>
parents: 37346
diff changeset
   974
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
   975
  $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68'
18522
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   976
  200 Script output follows
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
   977
  $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
18532
a6088c05e43a test-obsolete: now gets 404 for hidden change
Matt Mackall <mpm@selenic.com>
parents: 18522
diff changeset
   978
  404 Not Found
18522
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   979
  [1]
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   980
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   981
check that web.view config option:
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   982
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
   983
  $ killdaemons.py hg.pid
18522
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   984
  $ cat >> .hg/hgrc << EOF
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   985
  > [web]
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   986
  > view=all
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   987
  > EOF
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   988
  $ wait
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   989
  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
   990
  $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
18522
36549fa712da hgweb: add a `web.view` to control filtering
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 18506
diff changeset
   991
  200 Script output follows
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
   992
  $ killdaemons.py hg.pid
18401
683a76a07325 hgweb: add test regarding filtering and hgweb
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18268
diff changeset
   993
17306
7d2967de2c04 obsolete: fix typos in comments introduced by 6955d69a52a4
Thomas Arendsen Hein <thomas@intevation.de>
parents: 17297
diff changeset
   994
Checking _enable=False warning if obsolete marker exists
17297
6955d69a52a4 obsolete: warns if markers exist in a repo where the feature is not enabled
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17296
diff changeset
   995
22955
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 22950
diff changeset
   996
  $ echo '[experimental]' >> $HGRCPATH
34866
1644623ab096 config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents: 34853
diff changeset
   997
  $ echo "evolution=" >> $HGRCPATH
17297
6955d69a52a4 obsolete: warns if markers exist in a repo where the feature is not enabled
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 17296
diff changeset
   998
  $ hg log -r tip
21978
c21c1c8c2017 test-obsolete: better logging template
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21823
diff changeset
   999
  68:c15e9edfca13 (draft) [tip ] add celestine
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1000
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1001
reenable for later test
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1002
22955
fab9dda0f2a3 obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents: 22950
diff changeset
  1003
  $ echo '[experimental]' >> $HGRCPATH
34868
44797aedfb35 config: use 'experimental.evolution.exchange'
Boris Feld <boris.feld@octobus.net>
parents: 34866
diff changeset
  1004
  $ echo "evolution.exchange=True" >> $HGRCPATH
34866
1644623ab096 config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents: 34853
diff changeset
  1005
  $ echo "evolution.createmarkers=True" >> $HGRCPATH
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1006
37892
89793289c891 tests: remove pid file by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37770
diff changeset
  1007
  $ rm access.log errors.log
18506
ef60083b5536 tests: fix for windows - slashes and no serve
Mads Kiilerich <madski@unity3d.com>
parents: 18493
diff changeset
  1008
#endif
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1009
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1010
Several troubles on the same changeset (create an unstable and bumped and content-divergent changeset)
30711
c03627d87d9d test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30342
diff changeset
  1011
c03627d87d9d test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30342
diff changeset
  1012
  $ hg debugobsolete `getid obsolete_e`
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
  1013
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
  1014
  obsoleted 1 changesets
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35611
diff changeset
  1015
  2 new orphan changesets
30711
c03627d87d9d test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30342
diff changeset
  1016
  $ hg debugobsolete `getid original_c` `getid babar`
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
  1017
  1 new obsolescence markers
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35611
diff changeset
  1018
  1 new phase-divergent changesets
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1019
  2 new content-divergent changesets
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1020
  $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan() and contentdivergent()'
30711
c03627d87d9d test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30342
diff changeset
  1021
  changeset:   7:50c51b361e60
c03627d87d9d test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30342
diff changeset
  1022
  user:        test
c03627d87d9d test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30342
diff changeset
  1023
  date:        Thu Jan 01 00:00:00 1970 +0000
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1024
  instability: orphan, phase-divergent, content-divergent
30711
c03627d87d9d test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30342
diff changeset
  1025
  summary:     add babar
c03627d87d9d test: test "trouble: " line in log output with multiple troubles
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30342
diff changeset
  1026
  
31704
568c4e7437b2 templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents: 30733
diff changeset
  1027
test the "obsolete" templatekw
568c4e7437b2 templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents: 30733
diff changeset
  1028
568c4e7437b2 templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents: 30733
diff changeset
  1029
  $ hg log -r 'obsolete()'
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
  1030
  6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e [pruned]
31704
568c4e7437b2 templatekw: add an "obsolete" keyword
Denis Laxalde <denis@laxalde.org>
parents: 30733
diff changeset
  1031
30712
5dde81de1e6d templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30711
diff changeset
  1032
test the "troubles" templatekw
5dde81de1e6d templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30711
diff changeset
  1033
33797
ed99d3afef88 revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents: 33795
diff changeset
  1034
  $ hg log -r 'phasedivergent() and orphan()'
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1035
  7:50c51b361e60 (draft orphan phase-divergent content-divergent) [ ] add babar
30712
5dde81de1e6d templatekw: add a "troubles" template keyword
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30711
diff changeset
  1036
30713
6d0b1a69f98c templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30712
diff changeset
  1037
test the default cmdline template
6d0b1a69f98c templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30712
diff changeset
  1038
33797
ed99d3afef88 revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents: 33795
diff changeset
  1039
  $ hg log -T default -r 'phasedivergent()'
30713
6d0b1a69f98c templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30712
diff changeset
  1040
  changeset:   7:50c51b361e60
6d0b1a69f98c templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30712
diff changeset
  1041
  user:        test
6d0b1a69f98c templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30712
diff changeset
  1042
  date:        Thu Jan 01 00:00:00 1970 +0000
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1043
  instability: orphan, phase-divergent, content-divergent
30713
6d0b1a69f98c templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30712
diff changeset
  1044
  summary:     add babar
6d0b1a69f98c templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30712
diff changeset
  1045
  
31707
00f996f05522 templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents: 31704
diff changeset
  1046
  $ hg log -T default -r 'obsolete()'
00f996f05522 templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents: 31704
diff changeset
  1047
  changeset:   6:3de5eca88c00
00f996f05522 templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents: 31704
diff changeset
  1048
  parent:      3:6f9641995072
00f996f05522 templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents: 31704
diff changeset
  1049
  user:        test
00f996f05522 templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents: 31704
diff changeset
  1050
  date:        Thu Jan 01 00:00:00 1970 +0000
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
  1051
  obsolete:    pruned
31707
00f996f05522 templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents: 31704
diff changeset
  1052
  summary:     add obsolete_e
00f996f05522 templates: add "changeset.obsolete" label in command line style
Denis Laxalde <denis@laxalde.org>
parents: 31704
diff changeset
  1053
  
30713
6d0b1a69f98c templates: display evolution "troubles" in command line style
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30712
diff changeset
  1054
33801
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1055
test the obsolete labels
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1056
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1057
  $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()'
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1058
  [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent instability.content-divergent|changeset:   7:50c51b361e60]
33801
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1059
  [log.user|user:        test]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1060
  [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1061
  [log.instability|instability: orphan, phase-divergent, content-divergent]
33801
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1062
  [log.summary|summary:     add babar]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1063
  
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1064
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1065
  $ hg log -T default -r 'phasedivergent()' --color=debug
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1066
  [log.changeset changeset.draft changeset.unstable instability.orphan instability.phase-divergent instability.content-divergent|changeset:   7:50c51b361e60]
33801
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1067
  [log.user|user:        test]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1068
  [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1069
  [log.instability|instability: orphan, phase-divergent, content-divergent]
33801
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1070
  [log.summary|summary:     add babar]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1071
  
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1072
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1073
  $ hg log --config ui.logtemplate= --color=debug -r "obsolete()"
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1074
  [log.changeset changeset.draft changeset.obsolete|changeset:   6:3de5eca88c00]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1075
  [log.parent changeset.draft|parent:      3:6f9641995072]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1076
  [log.user|user:        test]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1077
  [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
34900
3a3adbcbd3a0 obsfate: rename obsfate into obsolete in changeset_printer
Boris Feld <boris.feld@octobus.net>
parents: 34870
diff changeset
  1078
  [log.obsfate|obsolete:    pruned]
33801
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1079
  [log.summary|summary:     add obsolete_e]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1080
  
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1081
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1082
  $ hg log -T default -r 'obsolete()' --color=debug
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1083
  [log.changeset changeset.draft changeset.obsolete|changeset:   6:3de5eca88c00]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1084
  [log.parent changeset.draft|parent:      3:6f9641995072]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1085
  [log.user|user:        test]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1086
  [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
34901
ec765a71bd65 obsfate: rename obsfate into obsolete in default mapfile
Boris Feld <boris.feld@octobus.net>
parents: 34900
diff changeset
  1087
  [log.obsfate|obsolete:    pruned]
33801
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1088
  [log.summary|summary:     add obsolete_e]
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1089
  
2415ad743642 test: add a test for stabilization related labels
Boris Feld <boris.feld@octobus.net>
parents: 33797
diff changeset
  1090
30715
7b526670f540 summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30713
diff changeset
  1091
test summary output
7b526670f540 summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30713
diff changeset
  1092
33797
ed99d3afef88 revset: rename bumped into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents: 33795
diff changeset
  1093
  $ hg up -r 'phasedivergent() and orphan()'
30715
7b526670f540 summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30713
diff changeset
  1094
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
7b526670f540 summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30713
diff changeset
  1095
  $ hg summary
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1096
  parent: 7:50c51b361e60  (orphan, phase-divergent, content-divergent)
30715
7b526670f540 summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30713
diff changeset
  1097
   add babar
7b526670f540 summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30713
diff changeset
  1098
  branch: default
30733
66448a53bdac test-obsolete: stabilize output on platforms without 'serve' support
Matt Harbison <matt_harbison@yahoo.com>
parents: 30715
diff changeset
  1099
  commit: (clean)
30715
7b526670f540 summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30713
diff changeset
  1100
  update: 2 new changesets (update)
7b526670f540 summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30713
diff changeset
  1101
  phases: 4 draft
33695
03039ff3082b evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents: 33542
diff changeset
  1102
  orphan: 2 changesets
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1103
  content-divergent: 2 changesets
33715
9c27a2891b75 evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33695
diff changeset
  1104
  phase-divergent: 1 changesets
31708
cda83a1bfb3a summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents: 31707
diff changeset
  1105
  $ hg up -r 'obsolete()'
cda83a1bfb3a summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents: 31707
diff changeset
  1106
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cda83a1bfb3a summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents: 31707
diff changeset
  1107
  $ hg summary
cda83a1bfb3a summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents: 31707
diff changeset
  1108
  parent: 6:3de5eca88c00  (obsolete)
cda83a1bfb3a summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents: 31707
diff changeset
  1109
   add obsolete_e
cda83a1bfb3a summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents: 31707
diff changeset
  1110
  branch: default
cda83a1bfb3a summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents: 31707
diff changeset
  1111
  commit: (clean)
cda83a1bfb3a summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents: 31707
diff changeset
  1112
  update: 3 new changesets (update)
cda83a1bfb3a summary: display obsolete state of parents
Denis Laxalde <denis@laxalde.org>
parents: 31707
diff changeset
  1113
  phases: 4 draft
33695
03039ff3082b evolution: rename unstable to orphan
Boris Feld <boris.feld@octobus.net>
parents: 33542
diff changeset
  1114
  orphan: 2 changesets
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1115
  content-divergent: 2 changesets
33715
9c27a2891b75 evolution: rename bumped to phase-divergent
Boris Feld <boris.feld@octobus.net>
parents: 33695
diff changeset
  1116
  phase-divergent: 1 changesets
30715
7b526670f540 summary: add evolution "troubles" information to summary output
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 30713
diff changeset
  1117
36960
efc4fb344c05 debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents: 36524
diff changeset
  1118
test debugwhyunstable output
efc4fb344c05 debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents: 36524
diff changeset
  1119
efc4fb344c05 debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents: 36524
diff changeset
  1120
  $ hg debugwhyunstable 50c51b361e60
efc4fb344c05 debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents: 36524
diff changeset
  1121
  orphan: obsolete parent 3de5eca88c00aa039da7399a220f4a5221faa585
efc4fb344c05 debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents: 36524
diff changeset
  1122
  phase-divergent: immutable predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1123
  content-divergent: 6f96419950729f3671185b847352890f074f7557 (draft) predecessor 245bde4270cd1072a27757984f9cda8ba26f08ca
36960
efc4fb344c05 debug: add debugwhyunstable that explains instabilities
Anton Shestakov <av6@dwimlabs.net>
parents: 36524
diff changeset
  1124
37685
76cd5816268e templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 37416
diff changeset
  1125
test whyunstable template keyword
76cd5816268e templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 37416
diff changeset
  1126
76cd5816268e templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 37416
diff changeset
  1127
  $ hg log -r 50c51b361e60 -T '{whyunstable}\n'
76cd5816268e templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 37416
diff changeset
  1128
  orphan: obsolete parent 3de5eca88c00
76cd5816268e templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 37416
diff changeset
  1129
  phase-divergent: immutable predecessor 245bde4270cd
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1130
  content-divergent: 3:6f9641995072 (draft) predecessor 245bde4270cd
37705
82eeafd78784 tests: make custom templates that use {whyunstable} terser
Anton Shestakov <av6@dwimlabs.net>
parents: 37685
diff changeset
  1131
  $ hg log -r 50c51b361e60 -T '{whyunstable % "{instability}: {reason} {node|shortest}\n"}'
82eeafd78784 tests: make custom templates that use {whyunstable} terser
Anton Shestakov <av6@dwimlabs.net>
parents: 37685
diff changeset
  1132
  orphan: obsolete parent 3de5
82eeafd78784 tests: make custom templates that use {whyunstable} terser
Anton Shestakov <av6@dwimlabs.net>
parents: 37685
diff changeset
  1133
  phase-divergent: immutable predecessor 245b
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1134
  content-divergent: predecessor 245b
37685
76cd5816268e templates: add whyunstable template keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 37416
diff changeset
  1135
35112
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1136
#if serve
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1137
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1138
  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1139
  $ cat hg.pid >> $DAEMON_PIDS
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1140
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1141
check obsolete changeset
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1142
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1143
  $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=paper' | grep '<span class="obsolete">'
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1144
     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1145
  $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=coal' | grep '<span class="obsolete">'
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1146
     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1147
  $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=gitweb' | grep '<span class="logtags">'
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1148
    <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span>
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1149
  $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=monoblue' | grep '<span class="logtags">'
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1150
          <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="obsoletetag" title="obsolete">obsolete</span> </span>
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1151
  $ get-with-headers.py localhost:$HGPORT 'log?rev=first(obsolete())&style=spartan' | grep 'class="obsolete"'
36355
f3fd4fe0506f hgweb: show each obsfateentry on its own line
Anton Shestakov <av6@dwimlabs.net>
parents: 36354
diff changeset
  1152
  <th class="obsolete">obsolete:</th>
f3fd4fe0506f hgweb: show each obsfateentry on its own line
Anton Shestakov <av6@dwimlabs.net>
parents: 36354
diff changeset
  1153
  <td class="obsolete">pruned by &#116;&#101;&#115;&#116; <span class="age">Thu, 01 Jan 1970 00:00:00 +0000</span></td>
35489
1721ce06100a hgweb: display fate of obsolete changesets
Anton Shestakov <av6@dwimlabs.net>
parents: 35400
diff changeset
  1154
35117
38fe3fe4bbb6 hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35112
diff changeset
  1155
check changeset with instabilities
38fe3fe4bbb6 hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35112
diff changeset
  1156
38fe3fe4bbb6 hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35112
diff changeset
  1157
  $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=paper' | grep '<span class="instability">'
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1158
     <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> <span class="instability">content-divergent</span> 
35117
38fe3fe4bbb6 hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35112
diff changeset
  1159
  $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=coal' | grep '<span class="instability">'
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1160
     <span class="phase">draft</span> <span class="instability">orphan</span> <span class="instability">phase-divergent</span> <span class="instability">content-divergent</span> 
35117
38fe3fe4bbb6 hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35112
diff changeset
  1161
  $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=gitweb' | grep '<span class="logtags">'
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1162
    <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> <span class="instabilitytag" title="content-divergent">content-divergent</span> </span>
35117
38fe3fe4bbb6 hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35112
diff changeset
  1163
  $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=monoblue' | grep '<span class="logtags">'
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1164
          <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="instabilitytag" title="orphan">orphan</span> <span class="instabilitytag" title="phase-divergent">phase-divergent</span> <span class="instabilitytag" title="content-divergent">content-divergent</span> </span>
37027
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1165
  $ get-with-headers.py localhost:$HGPORT 'log?rev=first(phasedivergent())&style=spartan' | grep 'class="unstable"'
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1166
  <th class="unstable">unstable:</th>
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1167
  <td class="unstable">orphan:  obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1168
  <th class="unstable">unstable:</th>
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1169
  <td class="unstable">phase-divergent:  immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1170
  <th class="unstable">unstable:</th>
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1171
  <td class="unstable">content-divergent: <a href="/rev/6f9641995072?style=spartan">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
35117
38fe3fe4bbb6 hgweb: show instabilities of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35112
diff changeset
  1172
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1173
check explanation for an orphan, phase-divergent and content-divergent changeset
36961
f21798a6bc20 hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents: 36960
diff changeset
  1174
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1175
  $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=paper' | egrep '(orphan|phase-divergent|content-divergent):'
36961
f21798a6bc20 hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents: 36960
diff changeset
  1176
   <td>orphan:  obsolete parent <a href="/rev/3de5eca88c00?style=paper">3de5eca88c00</a><br>
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1177
  phase-divergent:  immutable predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a><br>
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1178
  content-divergent: <a href="/rev/6f9641995072?style=paper">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=paper">245bde4270cd</a></td>
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1179
  $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=coal' | egrep '(orphan|phase-divergent|content-divergent):'
36961
f21798a6bc20 hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents: 36960
diff changeset
  1180
   <td>orphan:  obsolete parent <a href="/rev/3de5eca88c00?style=coal">3de5eca88c00</a><br>
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1181
  phase-divergent:  immutable predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a><br>
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1182
  content-divergent: <a href="/rev/6f9641995072?style=coal">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=coal">245bde4270cd</a></td>
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1183
  $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=gitweb' | egrep '(orphan|phase-divergent|content-divergent):'
37027
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1184
  <td>orphan:  obsolete parent <a class="list" href="/rev/3de5eca88c00?style=gitweb">3de5eca88c00</a></td>
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1185
  <td>phase-divergent:  immutable predecessor <a class="list" href="/rev/245bde4270cd?style=gitweb">245bde4270cd</a></td>
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1186
  <td>content-divergent: <a class="list" href="/rev/6f9641995072?style=gitweb">6f9641995072</a> (draft) predecessor <a class="list" href="/rev/245bde4270cd?style=gitweb">245bde4270cd</a></td>
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1187
  $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=monoblue' | egrep '(orphan|phase-divergent|content-divergent):'
37027
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1188
  <dd>orphan:  obsolete parent <a href="/rev/3de5eca88c00?style=monoblue">3de5eca88c00</a></dd>
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1189
  <dd>phase-divergent:  immutable predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd>
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1190
  <dd>content-divergent: <a href="/rev/6f9641995072?style=monoblue">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=monoblue">245bde4270cd</a></dd>
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1191
  $ get-with-headers.py localhost:$HGPORT 'rev/50c51b361e60?style=spartan' | egrep '(orphan|phase-divergent|content-divergent):'
37027
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1192
  <td class="unstable">orphan:  obsolete parent <a href="/rev/3de5eca88c00?style=spartan">3de5eca88c00</a></td>
7c18798fc24d hgweb: explain instabilities of unstable changesets (the rest of the themes)
Anton Shestakov <av6@dwimlabs.net>
parents: 36971
diff changeset
  1193
  <td class="unstable">phase-divergent:  immutable predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
41152
191fac9ff9d3 obsutil: fix the issue5686
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 40082
diff changeset
  1194
  <td class="unstable">content-divergent: <a href="/rev/6f9641995072?style=spartan">6f9641995072</a> (draft) predecessor <a href="/rev/245bde4270cd?style=spartan">245bde4270cd</a></td>
36961
f21798a6bc20 hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents: 36960
diff changeset
  1195
35112
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1196
  $ killdaemons.py
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1197
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1198
  $ rm hg.pid access.log errors.log
36961
f21798a6bc20 hgweb: explain instabilities of unstable changesets
Anton Shestakov <av6@dwimlabs.net>
parents: 36960
diff changeset
  1199
35112
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1200
#endif
69ea10d5b00c hgweb: show obsolescence status of a commit
Anton Shestakov <av6@dwimlabs.net>
parents: 35017
diff changeset
  1201
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1202
Test incoming/outcoming with changesets obsoleted remotely, known locally
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1203
===============================================================================
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1204
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1205
This test issue 3805
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1206
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1207
  $ hg init repo-issue3805
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1208
  $ cd repo-issue3805
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1209
  $ echo "base" > base
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1210
  $ hg ci -Am "base"
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1211
  adding base
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1212
  $ echo "foo" > foo
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1213
  $ hg ci -Am "A"
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1214
  adding foo
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1215
  $ hg clone . ../other-issue3805
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1216
  updating to branch default
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1217
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1218
  $ echo "bar" >> foo
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1219
  $ hg ci --amend
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1220
  $ cd ../other-issue3805
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1221
  $ hg log -G
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1222
  @  1:29f0c6921ddd (draft) [tip ] A
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1223
  |
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1224
  o  0:d20a80d4def3 (draft) [ ] base
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1225
  
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1226
  $ hg log -G -R ../repo-issue3805
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1227
  @  2:323a9c3ddd91 (draft) [tip ] A
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1228
  |
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1229
  o  0:d20a80d4def3 (draft) [ ] base
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1230
  
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1231
  $ hg incoming
35400
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35117
diff changeset
  1232
  comparing with $TESTTMP/tmpe/repo-issue3805
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1233
  searching for changes
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1234
  2:323a9c3ddd91 (draft) [tip ] A
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1235
  $ hg incoming --bundle ../issue3805.hg
35400
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35117
diff changeset
  1236
  comparing with $TESTTMP/tmpe/repo-issue3805
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1237
  searching for changes
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1238
  2:323a9c3ddd91 (draft) [tip ] A
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1239
  $ hg outgoing
35400
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35117
diff changeset
  1240
  comparing with $TESTTMP/tmpe/repo-issue3805
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1241
  searching for changes
27319
b64b6fdc5c9b discovery: properly filter changeset in 'peer.known' (issue4982)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27318
diff changeset
  1242
  1:29f0c6921ddd (draft) [tip ] A
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1243
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1244
#if serve
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1245
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1246
  $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1247
  $ cat hg.pid >> $DAEMON_PIDS
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1248
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1249
  $ hg incoming http://localhost:$HGPORT
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1250
  comparing with http://localhost:$HGPORT/
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1251
  searching for changes
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1252
  2:323a9c3ddd91 (draft) [tip ] A
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1253
  $ hg outgoing http://localhost:$HGPORT
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1254
  comparing with http://localhost:$HGPORT/
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1255
  searching for changes
27319
b64b6fdc5c9b discovery: properly filter changeset in 'peer.known' (issue4982)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27318
diff changeset
  1256
  1:29f0c6921ddd (draft) [tip ] A
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1257
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
  1258
  $ killdaemons.py
18568
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1259
cd403d6d96ef incoming: fix incoming when a local head is remotely filtered (issue3805)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18532
diff changeset
  1260
#endif
18617
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1261
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1262
This test issue 3814
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1263
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1264
(nothing to push but locally hidden changeset)
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1265
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1266
  $ cd ..
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1267
  $ hg init repo-issue3814
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1268
  $ cd repo-issue3805
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1269
  $ hg push -r 323a9c3ddd91 ../repo-issue3814
18617
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1270
  pushing to ../repo-issue3814
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1271
  searching for changes
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1272
  adding changesets
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1273
  adding manifests
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1274
  adding file changes
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1275
  added 2 changesets with 2 changes to 2 files
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1276
  1 new obsolescence markers
18617
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1277
  $ hg out ../repo-issue3814
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1278
  comparing with ../repo-issue3814
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1279
  searching for changes
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1280
  no changes found
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1281
  [1]
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1282
20807
91d28bd0e04e repoview: add non-global tags to candidate list for blocking hidden changesets
Sean Farley <sean.michael.farley@gmail.com>
parents: 20117
diff changeset
  1283
Test that a local tag blocks a changeset from being hidden
18617
227479f61db9 outgoing: fix possible filtering crash in outgoing (issue3814)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 18568
diff changeset
  1284
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1285
  $ hg tag -l visible -r 1 --hidden
20807
91d28bd0e04e repoview: add non-global tags to candidate list for blocking hidden changesets
Sean Farley <sean.michael.farley@gmail.com>
parents: 20117
diff changeset
  1286
  $ hg log -G
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1287
  @  2:323a9c3ddd91 (draft) [tip ] A
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1288
  |
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
  1289
  | x  1:29f0c6921ddd (draft *obsolete*) [visible ] A [rewritten using amend as 2:323a9c3ddd91]
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1290
  |/
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1291
  o  0:d20a80d4def3 (draft) [ ] base
20807
91d28bd0e04e repoview: add non-global tags to candidate list for blocking hidden changesets
Sean Farley <sean.michael.farley@gmail.com>
parents: 20117
diff changeset
  1292
  
21823
925d1bb9a971 repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 21033
diff changeset
  1293
Test that removing a local tag does not cause some commands to fail
925d1bb9a971 repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 21033
diff changeset
  1294
925d1bb9a971 repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 21033
diff changeset
  1295
  $ hg tag -l -r tip tiptag
925d1bb9a971 repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 21033
diff changeset
  1296
  $ hg tags
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1297
  tiptag                             2:323a9c3ddd91
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1298
  tip                                2:323a9c3ddd91
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1299
  visible                            1:29f0c6921ddd
21823
925d1bb9a971 repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 21033
diff changeset
  1300
  $ hg --config extensions.strip= strip -r tip --no-backup
925d1bb9a971 repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 21033
diff changeset
  1301
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
925d1bb9a971 repoview: do not crash when localtags refers to non existing revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents: 21033
diff changeset
  1302
  $ hg tags
27318
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1303
  visible                            1:29f0c6921ddd
95a54824ab00 test: add an extra base changeset in test-obsolete.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25569
diff changeset
  1304
  tip                                1:29f0c6921ddd
24113
b08af8f0ac01 localrepo: don't reintroduce pruned tag entries when tagging
Matt Harbison <matt_harbison@yahoo.com>
parents: 23632
diff changeset
  1305
24882
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1306
Test bundle overlay onto hidden revision
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1307
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1308
  $ cd ..
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1309
  $ hg init repo-bundleoverlay
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1310
  $ cd repo-bundleoverlay
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1311
  $ echo "A" > foo
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1312
  $ hg ci -Am "A"
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1313
  adding foo
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1314
  $ echo "B" >> foo
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1315
  $ hg ci -m "B"
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1316
  $ hg up 0
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1317
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1318
  $ echo "C" >> foo
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1319
  $ hg ci -m "C"
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1320
  created new head
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1321
  $ hg log -G
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1322
  @  2:c186d7714947 (draft) [tip ] C
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1323
  |
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1324
  | o  1:44526ebb0f98 (draft) [ ] B
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1325
  |/
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1326
  o  0:4b34ecfb0d56 (draft) [ ] A
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1327
  
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1328
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1329
  $ hg clone -r1 . ../other-bundleoverlay
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1330
  adding changesets
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1331
  adding manifests
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1332
  adding file changes
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1333
  added 2 changesets with 2 changes to 1 files
39497
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38251
diff changeset
  1334
  new changesets 4b34ecfb0d56:44526ebb0f98 (2 drafts)
24882
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1335
  updating to branch default
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1336
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1337
  $ cd ../other-bundleoverlay
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1338
  $ echo "B+" >> foo
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1339
  $ hg ci --amend -m "B+"
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1340
  $ hg log -G --hidden
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1341
  @  2:b7d587542d40 (draft) [tip ] B+
24882
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1342
  |
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
  1343
  | x  1:44526ebb0f98 (draft *obsolete*) [ ] B [rewritten using amend as 2:b7d587542d40]
24882
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1344
  |/
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1345
  o  0:4b34ecfb0d56 (draft) [ ] A
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1346
  
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1347
37346
45a4799174a1 tests: disallow using simple store repo with bundlerepo
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37027
diff changeset
  1348
#if repobundlerepo
24882
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1349
  $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1350
  comparing with ../repo-bundleoverlay
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1351
  searching for changes
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1352
  1:44526ebb0f98 (draft) [ ] B
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1353
  2:c186d7714947 (draft) [tip ] C
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1354
  $ hg log -G -R ../bundleoverlay.hg
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1355
  o  3:c186d7714947 (draft) [tip ] C
24882
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1356
  |
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1357
  | @  2:b7d587542d40 (draft) [ ] B+
24882
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1358
  |/
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1359
  o  0:4b34ecfb0d56 (draft) [ ] A
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1360
  
37346
45a4799174a1 tests: disallow using simple store repo with bundlerepo
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37027
diff changeset
  1361
#endif
24882
995003a324da bundlerepo: disable filtering of changelog while constructing revision text
Yuya Nishihara <yuya@tcha.org>
parents: 24733
diff changeset
  1362
24136
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1363
#if serve
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1364
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1365
Test issue 4506
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1366
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1367
  $ cd ..
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1368
  $ hg init repo-issue4506
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1369
  $ cd repo-issue4506
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1370
  $ echo "0" > foo
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1371
  $ hg add foo
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1372
  $ hg ci -m "content-0"
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1373
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1374
  $ hg up null
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1375
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1376
  $ echo "1" > bar
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1377
  $ hg add bar
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1378
  $ hg ci -m "content-1"
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1379
  created new head
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1380
  $ hg up 0
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1381
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1382
  $ hg graft 1
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1383
  grafting 1:1c9eddb02162 "content-1" (tip)
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1384
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1385
  $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
  1386
  1 new obsolescence markers
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33515
diff changeset
  1387
  obsoleted 1 changesets
24136
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1388
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1389
  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1390
  $ cat hg.pid >> $DAEMON_PIDS
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1391
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
  1392
  $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1'
24136
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1393
  404 Not Found
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1394
  [1]
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
  1395
  $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar'
24136
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1396
  200 Script output follows
25472
4d2b9b304ad0 tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents: 25382
diff changeset
  1397
  $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar'
24136
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1398
  200 Script output follows
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1399
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
  1400
  $ killdaemons.py
24136
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1401
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1402
#endif
46d6cdfce4bf hgweb: use introrev() for finding parents (issue4506)
Anton Shestakov <engored@ya.ru>
parents: 24113
diff changeset
  1403
25297
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1404
Test heads computation on pending index changes with obsolescence markers
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1405
  $ cd ..
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1406
  $ cat >$TESTTMP/test_extension.py  << EOF
33988
a65f928e47d5 tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33877
diff changeset
  1407
  > from __future__ import absolute_import
a65f928e47d5 tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33877
diff changeset
  1408
  > from mercurial.i18n import _
38132
5a87bf0bd343 tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents: 37964
diff changeset
  1409
  > from mercurial import cmdutil, pycompat, registrar
5a87bf0bd343 tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents: 37964
diff changeset
  1410
  > from mercurial.utils import stringutil
25297
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1411
  > 
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1412
  > cmdtable = {}
32376
46ba2cdda476 registrar: move cmdutil.command to registrar module (API)
Yuya Nishihara <yuya@tcha.org>
parents: 32366
diff changeset
  1413
  > command = registrar.command(cmdtable)
36524
f1e05fe1a78f py3: add b'' prefixes in tests/test-obsolete.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36355
diff changeset
  1414
  > @command(b"amendtransient",[], _(b'hg amendtransient [rev]'))
25297
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1415
  > def amend(ui, repo, *pats, **opts):
38132
5a87bf0bd343 tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents: 37964
diff changeset
  1416
  >   opts = pycompat.byteskwargs(opts)
5a87bf0bd343 tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents: 37964
diff changeset
  1417
  >   opts[b'message'] = b'Test'
5a87bf0bd343 tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents: 37964
diff changeset
  1418
  >   opts[b'logfile'] = None
5a87bf0bd343 tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents: 37964
diff changeset
  1419
  >   cmdutil.amend(ui, repo, repo[b'.'], {}, pats, opts)
5a87bf0bd343 tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents: 37964
diff changeset
  1420
  >   ui.write(b'%s\n' % stringutil.pprint(repo.changelog.headrevs()))
25297
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1421
  > EOF
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1422
  $ cat >> $HGRCPATH << EOF
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1423
  > [extensions]
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1424
  > testextension=$TESTTMP/test_extension.py
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1425
  > EOF
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1426
  $ hg init repo-issue-nativerevs-pending-changes
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1427
  $ cd repo-issue-nativerevs-pending-changes
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1428
  $ mkcommit a
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1429
  $ mkcommit b
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1430
  $ hg up ".^"
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1431
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1432
  $ echo aa > a
3966e39fea98 changelog: fix bug in heads computation
Laurent Charignon <lcharignon@fb.com>
parents: 25118
diff changeset
  1433
  $ hg amendtransient
35709
1a09dad8b85a evolution: report new unstable changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 35611
diff changeset
  1434
  1 new orphan changesets
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1435
  [1, 2]
25569
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1436
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1437
Test cache consistency for the visible filter
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1438
1) We want to make sure that the cached filtered revs are invalidated when
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1439
bookmarks change
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1440
  $ cd ..
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1441
  $ cat >$TESTTMP/test_extension.py  << EOF
34009
aaa65baf460c tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33988
diff changeset
  1442
  > from __future__ import absolute_import, print_function
29065
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1443
  > import weakref
34009
aaa65baf460c tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33988
diff changeset
  1444
  > from mercurial import (
aaa65baf460c tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33988
diff changeset
  1445
  >   bookmarks,
aaa65baf460c tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33988
diff changeset
  1446
  >   cmdutil,
aaa65baf460c tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33988
diff changeset
  1447
  >   extensions,
aaa65baf460c tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33988
diff changeset
  1448
  >   repoview,
aaa65baf460c tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33988
diff changeset
  1449
  > )
25569
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1450
  > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs):
29065
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1451
  >  reporef = weakref.ref(bkmstoreinst._repo)
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1452
  >  def trhook(tr):
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1453
  >   repo = reporef()
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1454
  >   hidden1 = repoview.computehidden(repo)
36524
f1e05fe1a78f py3: add b'' prefixes in tests/test-obsolete.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36355
diff changeset
  1455
  >   hidden = repoview.filterrevs(repo, b'visible')
29065
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1456
  >   if sorted(hidden1) != sorted(hidden):
34009
aaa65baf460c tests: update test-obsolete to pass our import checker
Augie Fackler <raf@durin42.com>
parents: 33988
diff changeset
  1457
  >     print("cache inconsistency")
38132
5a87bf0bd343 tests: port inline extensions in test-obsolete.t to Python 3
Augie Fackler <augie@google.com>
parents: 37964
diff changeset
  1458
  >  bkmstoreinst._repo.currenttransaction().addpostclose(b'test_extension', trhook)
29065
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1459
  >  orig(bkmstoreinst, *args, **kwargs)
25569
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1460
  > def extsetup(ui):
33515
3325c7dcabaa bookmark: deprecate 'recordchange' in favor of 'applychanges'
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
  1461
  >   extensions.wrapfunction(bookmarks.bmstore, '_recordchange',
29065
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1462
  >                           _bookmarkchanged)
25569
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1463
  > EOF
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1464
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1465
  $ hg init repo-cache-inconsistency
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1466
  $ cd repo-issue-nativerevs-pending-changes
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1467
  $ mkcommit a
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1468
  a already tracked!
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1469
  $ mkcommit b
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1470
  $ hg id
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1471
  13bedc178fce tip
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1472
  $ echo "hello" > b
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1473
  $ hg commit --amend -m "message"
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1474
  $ hg book bookb -r 13bedc178fce --hidden
35611
7336ac5e786e bookmarks: add bookmarks to hidden revs if directaccess config is set
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35571
diff changeset
  1475
  bookmarking hidden changeset 13bedc178fce
35712
a1a5c3842b6f bookmarks: display the obsfate of hidden revision we create a bookmark on
Boris Feld <boris.feld@octobus.net>
parents: 35711
diff changeset
  1476
  (hidden revision '13bedc178fce' was rewritten as: a9b1f8652753)
25569
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1477
  $ hg log -r 13bedc178fce
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
  1478
  4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]
25569
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1479
  $ hg book -d bookb
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1480
  $ hg log -r 13bedc178fce
35571
265cd9e19d26 visibility: improve the message when accessing filtered obsolete rev
Boris Feld <boris.feld@octobus.net>
parents: 35522
diff changeset
  1481
  abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753!
25569
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1482
  (use --hidden to access hidden revisions)
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1483
  [255]
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1484
29065
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1485
Empty out the test extension, as it isn't compatible with later parts
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1486
of the test.
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1487
  $ echo > $TESTTMP/test_extension.py
dae4552390fc test-obsolete: update extension in test to actually work
Augie Fackler <augie@google.com>
parents: 28867
diff changeset
  1488
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1489
Test ability to pull changeset with locally applying obsolescence markers
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1490
(issue4945)
25569
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1491
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1492
  $ cd ..
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1493
  $ hg init issue4845
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1494
  $ cd issue4845
25569
2612e6dab189 repoview: invalidate 'visible' filtered revisions when bookmarks change
Laurent Charignon <lcharignon@fb.com>
parents: 25474
diff changeset
  1495
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1496
  $ echo foo > f0
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1497
  $ hg add f0
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1498
  $ hg ci -m '0'
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1499
  $ echo foo > f1
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1500
  $ hg add f1
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1501
  $ hg ci -m '1'
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1502
  $ echo foo > f2
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1503
  $ hg add f2
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1504
  $ hg ci -m '2'
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1505
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1506
  $ echo bar > f2
34866
1644623ab096 config: use 'experimental.evolution.create-markers'
Boris Feld <boris.feld@octobus.net>
parents: 34853
diff changeset
  1507
  $ hg commit --amend --config experimental.evolution.createmarkers=True
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1508
  $ hg log -G
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1509
  @  3:b0551702f918 (draft) [tip ] 2
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1510
  |
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1511
  o  1:e016b03fd86f (draft) [ ] 1
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1512
  |
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1513
  o  0:a78f55e5508c (draft) [ ] 0
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1514
  
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1515
  $ hg log -G --hidden
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1516
  @  3:b0551702f918 (draft) [tip ] 2
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1517
  |
34851
6f53a53245a2 obsfate: only display date in verbose mode
Boris Feld <boris.feld@octobus.net>
parents: 34850
diff changeset
  1518
  | x  2:e008cf283490 (draft *obsolete*) [ ] 2 [rewritten using amend as 3:b0551702f918]
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1519
  |/
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1520
  o  1:e016b03fd86f (draft) [ ] 1
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1521
  |
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1522
  o  0:a78f55e5508c (draft) [ ] 0
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1523
  
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1524
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1525
  $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no
35400
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35117
diff changeset
  1526
  saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-ede36964-backup.hg
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1527
  $ hg debugobsolete
35017
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1528
  e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1529
  $ hg log -G
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1530
  @  2:b0551702f918 (draft) [tip ] 2
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1531
  |
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1532
  o  1:e016b03fd86f (draft) [ ] 1
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1533
  |
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1534
  o  0:a78f55e5508c (draft) [ ] 0
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1535
  
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1536
  $ hg log -G --hidden
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1537
  @  2:b0551702f918 (draft) [tip ] 2
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1538
  |
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1539
  o  1:e016b03fd86f (draft) [ ] 1
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1540
  |
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1541
  o  0:a78f55e5508c (draft) [ ] 0
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1542
  
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1543
  $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg
34043
626a28f30dbd debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents: 34009
diff changeset
  1544
  Stream params: {Compression: BZ}
37836
d618558e4e8b debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents: 37770
diff changeset
  1545
  changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1546
      e008cf2834908e5d6b0f792a9d4b0e2272260fb8
37837
326b174c6a47 bundle2: mark the bundle2 part as advisory (issue5872)
Boris Feld <boris.feld@octobus.net>
parents: 37836
diff changeset
  1547
  cache:rev-branch-cache -- {} (mandatory: False)
37836
d618558e4e8b debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents: 37770
diff changeset
  1548
  phase-heads -- {} (mandatory: True)
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1549
      e008cf2834908e5d6b0f792a9d4b0e2272260fb8 draft
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1550
37416
7542e97c7867 tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37363
diff changeset
  1551
#if repobundlerepo
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1552
  $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1553
  pulling from .hg/strip-backup/e008cf283490-ede36964-backup.hg
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1554
  searching for changes
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1555
  no changes found
37416
7542e97c7867 tests: conditionalize tests for various repo features
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37363
diff changeset
  1556
#endif
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1557
  $ hg debugobsolete
35017
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1558
  e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1559
  $ hg log -G
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1560
  @  2:b0551702f918 (draft) [tip ] 2
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1561
  |
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1562
  o  1:e016b03fd86f (draft) [ ] 1
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1563
  |
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1564
  o  0:a78f55e5508c (draft) [ ] 0
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1565
  
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1566
  $ hg log -G --hidden
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1567
  @  2:b0551702f918 (draft) [tip ] 2
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1568
  |
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1569
  o  1:e016b03fd86f (draft) [ ] 1
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1570
  |
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1571
  o  0:a78f55e5508c (draft) [ ] 0
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1572
  
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1573
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1574
Testing that strip remove markers:
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1575
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1576
  $ hg strip -r 1 --config extensions.strip=
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1577
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35400
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35117
diff changeset
  1578
  saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1579
  $ hg debugobsolete
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1580
  $ hg log -G
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1581
  @  0:a78f55e5508c (draft) [tip ] 0
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1582
  
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1583
  $ hg log -G --hidden
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1584
  @  0:a78f55e5508c (draft) [tip ] 0
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1585
  
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1586
  $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg
34043
626a28f30dbd debugcommands: stabilize output of debugbundle by having a custom repr
Augie Fackler <raf@durin42.com>
parents: 34009
diff changeset
  1587
  Stream params: {Compression: BZ}
37836
d618558e4e8b debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents: 37770
diff changeset
  1588
  changegroup -- {nbchanges: 2, version: 02} (mandatory: True)
32646
ed566a59f660 strip: also backup obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32511
diff changeset
  1589
      e016b03fd86fcccc54817d120b90b751aaf367d6
ed566a59f660 strip: also backup obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32511
diff changeset
  1590
      b0551702f918510f01ae838ab03a463054c67b46
37837
326b174c6a47 bundle2: mark the bundle2 part as advisory (issue5872)
Boris Feld <boris.feld@octobus.net>
parents: 37836
diff changeset
  1591
  cache:rev-branch-cache -- {} (mandatory: False)
37836
d618558e4e8b debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents: 37770
diff changeset
  1592
  obsmarkers -- {} (mandatory: True)
35017
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1593
      version: 1 (92 bytes)
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1594
      e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
37836
d618558e4e8b debugbundle: also display if a part is mandatory or advisory
Boris Feld <boris.feld@octobus.net>
parents: 37770
diff changeset
  1595
  phase-heads -- {} (mandatory: True)
33044
8e3021fd1a44 strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents: 32763
diff changeset
  1596
      b0551702f918510f01ae838ab03a463054c67b46 draft
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1597
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1598
  $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1599
  adding changesets
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1600
  adding manifests
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1601
  adding file changes
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1602
  added 2 changesets with 2 changes to 2 files
34102
e8a7c1a0565a cmdutil: remove the redundant commit during amend
Saurabh Singh <singhsrb@fb.com>
parents: 34043
diff changeset
  1603
  1 new obsolescence markers
39497
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 38251
diff changeset
  1604
  new changesets e016b03fd86f:b0551702f918 (2 drafts)
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1605
  (run 'hg update' to get a working copy)
32652
71eb6a098315 strip: strip obsmarkers exclusive to the stripped changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32649
diff changeset
  1606
  $ hg debugobsolete | sort
35017
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1607
  e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1608
  $ hg log -G
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1609
  o  2:b0551702f918 (draft) [tip ] 2
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1610
  |
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1611
  o  1:e016b03fd86f (draft) [ ] 1
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1612
  |
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1613
  @  0:a78f55e5508c (draft) [ ] 0
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1614
  
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1615
  $ hg log -G --hidden
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1616
  o  2:b0551702f918 (draft) [tip ] 2
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1617
  |
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1618
  o  1:e016b03fd86f (draft) [ ] 1
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1619
  |
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1620
  @  0:a78f55e5508c (draft) [ ] 0
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1621
  
28845
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1622
Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1623
only a subset of those are displayed (because of --rev option)
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1624
  $ hg init doindexrev
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1625
  $ cd doindexrev
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1626
  $ echo a > a
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1627
  $ hg ci -Am a
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1628
  adding a
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1629
  $ hg ci --amend -m aa
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1630
  $ echo b > b
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1631
  $ hg ci -Am b
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1632
  adding b
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1633
  $ hg ci --amend -m bb
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1634
  $ echo c > c
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1635
  $ hg ci -Am c
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1636
  adding c
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1637
  $ hg ci --amend -m cc
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1638
  $ echo d > d
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1639
  $ hg ci -Am d
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1640
  adding d
34870
64f29fff1877 config: rename stabilization.track-operation
Boris Feld <boris.feld@octobus.net>
parents: 34868
diff changeset
  1641
  $ hg ci --amend -m dd --config experimental.evolution.track-operation=1
28845
5a398627db92 commands: make --rev and --index compatible in debugobsolete
Kostia Balytskyi <ikostia@fb.com>
parents: 28795
diff changeset
  1642
  $ hg debugobsolete --index --rev "3+7"
35017
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1643
  1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1644
  3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1645
  $ hg debugobsolete --index --rev "3+7" -Tjson
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1646
  [
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1647
   {
37770
31750413f8d7 formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents: 37705
diff changeset
  1648
    "date": [0, 0],
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1649
    "flag": 0,
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1650
    "index": 1,
35017
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1651
    "metadata": {"ef1": "1", "operation": "amend", "user": "test"},
33877
eae63a9e59da obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents: 33804
diff changeset
  1652
    "prednode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1",
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1653
    "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"]
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1654
   },
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1655
   {
37770
31750413f8d7 formatter: convert timestamp to int
Yuya Nishihara <yuya@tcha.org>
parents: 37705
diff changeset
  1656
    "date": [0, 0],
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1657
    "flag": 0,
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1658
    "index": 3,
35017
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1659
    "metadata": {"ef1": "1", "operation": "amend", "user": "test"},
33877
eae63a9e59da obsmarker: precnode was renamed into prednode
Boris Feld <boris.feld@octobus.net>
parents: 33804
diff changeset
  1660
    "prednode": "4715cf767440ed891755448016c2b8cf70760c30",
29806
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1661
    "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"]
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1662
   }
142ae01820a3 debugobsolete: add formatter support (issue5134)
Yuya Nishihara <yuya@tcha.org>
parents: 29702
diff changeset
  1663
  ]
28220
0209bdd553b9 bundlerepo: properly handle hidden linkrev in filelog (issue4945)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27917
diff changeset
  1664
28795
f456834b2f7e commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents: 28613
diff changeset
  1665
Test the --delete option of debugobsolete command
28867
ffcc649a4e8f debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents: 28845
diff changeset
  1666
  $ hg debugobsolete --index
35017
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1667
  0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1668
  1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1669
  2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1670
  3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
28867
ffcc649a4e8f debugobsolete: style fixes to debugobsolete that slipped from original commit
Kostia Balytskyi <ikostia@fb.com>
parents: 28845
diff changeset
  1671
  $ hg debugobsolete --delete 1 --delete 3
30342
318a24b52eeb spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents: 29806
diff changeset
  1672
  deleted 2 obsolescence markers
28795
f456834b2f7e commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents: 28613
diff changeset
  1673
  $ hg debugobsolete
35017
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1674
  cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
a7e49a5b3e6f obsolete: activate effect-flag by default
Boris Feld <boris.feld@octobus.net>
parents: 34901
diff changeset
  1675
  1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
32427
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1676
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1677
Test adding changeset after obsmarkers affecting it
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1678
(eg: during pull, or unbundle)
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1679
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1680
  $ mkcommit e
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1681
  $ hg bundle -r . --base .~1 ../bundle-2.hg
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1682
  1 changesets found
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1683
  $ getid .
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1684
  $ hg --config extensions.strip= strip -r .
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1685
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
35400
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35117
diff changeset
  1686
  saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg
32427
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1687
  $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b
42899
34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 41152
diff changeset
  1688
  1 new obsolescence markers
32427
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1689
  $ hg unbundle ../bundle-2.hg
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1690
  adding changesets
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1691
  adding manifests
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1692
  adding file changes
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1693
  added 1 changesets with 1 changes to 1 files
39904
f9232b0310ef pullreport: issue a message about "extinct" pulled changesets
Boris Feld <boris.feld@octobus.net>
parents: 39497
diff changeset
  1694
  (1 other changesets obsolete on arrival)
32427
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1695
  (run 'hg update' to get a working copy)
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1696
  $ hg log -G
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1697
  @  7:7ae79c5d60f0 (draft) [tip ] dd
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1698
  |
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1699
  | o  6:4715cf767440 (draft) [ ] d
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1700
  |/
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1701
  o  5:29346082e4a9 (draft) [ ] cc
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1702
  |
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1703
  o  3:d27fb9b06607 (draft) [ ] bb
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1704
  |
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1705
  | o  2:6fdef60fcbab (draft) [ ] b
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1706
  |/
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1707
  o  1:f9bd49731b0b (draft) [ ] aa
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1708
  
4e51b2a99847 obsolete: test an important corner case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 32393
diff changeset
  1709
28795
f456834b2f7e commands: allow debugobsolete to delete arbitrary obsmarkers
Kostia Balytskyi <ikostia@fb.com>
parents: 28613
diff changeset
  1710
  $ cd ..
40082
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1711
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1712
Test issue 5783
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1713
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1714
  $ hg init issue-5783 --config format.obsstore-version=0
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1715
  $ cd issue-5783
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1716
  $ touch a.cpp
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1717
  $ hg add a.cpp
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1718
  $ hg commit -m 'Add a.cpp'
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1719
  $ echo 'Hello' > a.cpp
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1720
  $ hg amend -n 'Testing::Obsstore' --config format.obsstore-version=0 --config extensions.amend=
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1721
  $ touch b.cpp
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1722
  $ hg add b.cpp
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1723
  $ hg commit -m 'Add b.cpp'
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1724
  $ echo 'Hello' > b.cpp
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1725
  $ hg amend -n 'Testing::Obsstore2' --config extensions.amend=
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1726
  $ hg debugobsolete
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1727
  d1b09fe3ad2b2a03e23a72f0c582e29a49570145 1a1a11184d2588af24e767e5335d5d9d07e8c550 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'Testing::Obsstore', 'operation': 'amend', 'user': 'test'}
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1728
  1bfd8e3868f641e048b6667cd672c68932f26d00 79959ca316d5b27ac6be1dd0cfd0843a5b5412eb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'Testing::Obsstore2', 'operation': 'amend', 'user': 'test'}
a4d62ff9a86d obsolete: fix ValueError when stored note contains ':' char (issue5783)
Zharaskhan Aman <aman.zharaskhan@gmail.com>
parents: 39905
diff changeset
  1729
  $ cd ..