tests/test-wireproto.t
author Sushil khanchi <sushilkhanchi97@gmail.com>
Sat, 23 Nov 2019 16:17:04 +0530
branchstable
changeset 4991 2928f35023a1
parent 4903 86b3efd4303e
child 4905 f3e39a354378
child 5165 7d0d066329f4
child 5198 cbfd36046969
permissions -rw-r--r--
evolve: make sure divergence resolution doesn't undo changes (issue6203) Before this patch, in content-divergence resolution logic if resolution parent is not the parent of any of the two divergent changesets then it could undo some changes introduced by previous revs (while resolving stack of content-divergent changesets) as demonstrated by the test added in previous patch. To solve this, what this patch doing is: if divergent cset has obsolete parent with a successor then first resolve the "orphan" instability of divergent cset by relocating, then perform the content-divergence resolution. After this change in logic, I found that it's kind of more correct as reflected by the changes in tests/test-evolve-content-divergent-corner-cases.t where it prevented creating conflicts while merging. Changes in tests/test-evolve-content-divergent-stack.t demonstrate the fixed behaviour. Next patches will be covering the `evolve --continue` case for the relocation of "divergent" cset.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     1
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     2
  $ cat >> $HGRCPATH <<EOF
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     3
  > [defaults]
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     4
  > amend=-d "0 0"
1276
18a18131e92f test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
     5
  > [experimental]
18a18131e92f test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
     6
  > obsmarkers-exchange-debug=true
18a18131e92f test-wireprotocol: test with both bundle1 and bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
     7
  > bundle2-exp=true
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     8
  > [ui]
1523
34e0b17858e3 test: use 'dummyssh' from the run-tests directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1452
diff changeset
     9
  > ssh=python "$RUNTESTDIR/dummyssh"
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    10
  > [phases]
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    11
  > publish = False
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    12
  > [extensions]
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    13
  > EOF
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1562
diff changeset
    14
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    15
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    16
  $ mkcommit() {
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    17
  >    echo "$1" > "$1"
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    18
  >    hg add "$1"
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    19
  >    hg ci -m "add $1"
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    20
  > }
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    21
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    22
setup repo
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    23
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    24
  $ hg init server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    25
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    26
  $ hg clone ssh://user@dummy/server client
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    27
  no changes found
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    28
  updating to branch default
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    30
  $ cp -r client other
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    31
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    32
Smoke testing
2084
b1f029dcf573 discovery: implement some range based discovery
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1806
diff changeset
    33
===============.t
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    34
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    35
  $ cd client
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    36
  $ mkcommit 0
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    37
  $ mkcommit a
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
  $ hg push
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
  pushing to ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    40
  searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    41
  remote: adding changesets
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    42
  remote: adding manifests
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    43
  remote: adding file changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    44
  remote: added 2 changesets with 2 changes to 2 files
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    45
  $ hg pull
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    46
  pulling from ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    47
  searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    48
  no changes found
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    49
  $ hg pull -R ../other
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    50
  pulling from ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    51
  requesting all changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    52
  adding changesets
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    53
  adding manifests
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    54
  adding file changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    55
  added 2 changesets with 2 changes to 2 files
4197
1dd5c6e6cd53 test-compat: backed out changeset ccbfbeee6cf3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
    56
  new changesets 8685c6d34325:4957bfdac07e (2 drafts)
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
  (run 'hg update' to get a working copy)
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
  $ hg push -R ../other
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
  pushing to ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
  searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    61
  no changes found
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    62
  [1]
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    63
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    64
Push
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    65
=============
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    66
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    67
  $ echo 'A' > a
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    68
  $ hg amend
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  $ hg push
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    70
  pushing to ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    71
  searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    72
  remote: adding changesets
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    73
  remote: adding manifests
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
  remote: adding file changes
4903
86b3efd4303e test-output: reinstalled test change for 5.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
    75
  remote: obsmarker-exchange: 92 bytes received
4860
015cdd3fa469 test: backed out test change applied in 62b60fc1983d
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4840
diff changeset
    76
  remote: added 1 changesets with 1 changes to 1 files (+1 heads)
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    77
  remote: 1 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2709
diff changeset
    78
  remote: obsoleted 1 changesets
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    79
  $ hg push
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    80
  pushing to ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    81
  searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    82
  no changes found
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    83
  [1]
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    84
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    85
Pull
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    86
=============
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    87
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    88
  $ hg -R ../other pull
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    89
  pulling from ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    90
  searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    91
  adding changesets
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    92
  adding manifests
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    93
  adding file changes
4903
86b3efd4303e test-output: reinstalled test change for 5.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
    94
  obsmarker-exchange: 92 bytes received
4860
015cdd3fa469 test: backed out test change applied in 62b60fc1983d
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4840
diff changeset
    95
  added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    96
  1 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2709
diff changeset
    97
  obsoleted 1 changesets
4197
1dd5c6e6cd53 test-compat: backed out changeset ccbfbeee6cf3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
    98
  new changesets 9d1c114e7797 (1 drafts)
2398
612c17c8ab69 tests: apply output changes from core fix
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2084
diff changeset
    99
  (run 'hg heads' to see heads)
943
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   100
  $ hg -R ../other pull
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   101
  pulling from ssh://user@dummy/server
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
  searching for changes
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   103
  no changes found
5b8d9c2ab480 evolve: test exchange through wireprotocol
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   104
1277
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   105
Test some markers discovery
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   106
===========================
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   107
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   108
  $ echo c > C
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   109
  $ hg add C
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   110
  $ hg commit -m C
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   111
  $ echo c >> C
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   112
  $ hg amend
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   113
  $ hg push
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   114
  pushing to ssh://user@dummy/server
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   115
  searching for changes
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   116
  remote: adding changesets
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   117
  remote: adding manifests
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   118
  remote: adding file changes
4903
86b3efd4303e test-output: reinstalled test change for 5.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
   119
  remote: obsmarker-exchange: 92 bytes received
4860
015cdd3fa469 test: backed out test change applied in 62b60fc1983d
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4840
diff changeset
   120
  remote: added 1 changesets with 1 changes to 1 files
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   121
  remote: 1 new obsolescence markers
1277
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   122
  $ hg -R ../other pull
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   123
  pulling from ssh://user@dummy/server
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   124
  searching for changes
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   125
  adding changesets
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   126
  adding manifests
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   127
  adding file changes
4903
86b3efd4303e test-output: reinstalled test change for 5.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
   128
  obsmarker-exchange: 92 bytes received
4860
015cdd3fa469 test: backed out test change applied in 62b60fc1983d
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4840
diff changeset
   129
  added 1 changesets with 1 changes to 1 files
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   130
  1 new obsolescence markers
4197
1dd5c6e6cd53 test-compat: backed out changeset ccbfbeee6cf3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   131
  new changesets a5687ec59dd4 (1 drafts)
1277
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   132
  (run 'hg update' to get a working copy)
0ac2ad8e7235 test-wireproto: add some obsmarker discovery usage.
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1276
diff changeset
   133
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   134
some common hidden
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   135
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   136
  $ hg touch .
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   137
  $ hg push
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   138
  pushing to ssh://user@dummy/server
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   139
  searching for changes
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   140
  remote: adding changesets
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   141
  remote: adding manifests
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   142
  remote: adding file changes
4903
86b3efd4303e test-output: reinstalled test change for 5.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
   143
  remote: obsmarker-exchange: 183 bytes received
4860
015cdd3fa469 test: backed out test change applied in 62b60fc1983d
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4840
diff changeset
   144
  remote: added 1 changesets with 0 changes to 1 files (+1 heads)
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   145
  remote: 1 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2709
diff changeset
   146
  remote: obsoleted 1 changesets
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   147
  $ hg -R ../other pull
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   148
  pulling from ssh://user@dummy/server
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   149
  searching for changes
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   150
  adding changesets
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   151
  adding manifests
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   152
  adding file changes
4903
86b3efd4303e test-output: reinstalled test change for 5.2
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4860
diff changeset
   153
  obsmarker-exchange: 183 bytes received
4860
015cdd3fa469 test: backed out test change applied in 62b60fc1983d
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4840
diff changeset
   154
  added 1 changesets with 0 changes to 1 files (+1 heads)
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   155
  1 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2709
diff changeset
   156
  obsoleted 1 changesets
3075
8feb2cae7eae test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3015
diff changeset
   157
  new changesets * (glob)
2398
612c17c8ab69 tests: apply output changes from core fix
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2084
diff changeset
   158
  (run 'hg heads' to see heads)
1278
5ff8a5d85b2b getbundleobsmarker: prevent crash from filtered content (issue4616)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1277
diff changeset
   159
2521
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   160
test discovery avoid exchanging known markers
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   161
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   162
  $ hg push
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   163
  pushing to ssh://user@dummy/server
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   164
  searching for changes
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   165
  no changes found
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   166
  [1]
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   167
  $ hg -R ../other pull
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   168
  pulling from ssh://user@dummy/server
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   169
  searching for changes
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   170
  no changes found
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   171
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   172
test discovery can be disabled
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   173
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   174
  $ hg push --config experimental.evolution.obsdiscovery=no
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   175
  pushing to ssh://user@dummy/server
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   176
  searching for changes
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   177
  (skipping discovery of obsolescence markers, will exchange everything)
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   178
  (controled by 'experimental.evolution.obsdiscovery' configuration)
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   179
  no changes found
3568
eca57332ad03 touch: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3536
diff changeset
   180
  remote: obsmarker-exchange: 274 bytes received
2521
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   181
  [1]
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   182
  $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   183
  pulling from ssh://user@dummy/server
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   184
  searching for changes
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   185
  no changes found
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   186
  (skipping discovery of obsolescence markers, will exchange everything)
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   187
  (controled by 'experimental.evolution.obsdiscovery' configuration)
3568
eca57332ad03 touch: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3536
diff changeset
   188
  obsmarker-exchange: 274 bytes received
2521
29fc90b0e59c obsdiscovery: add an option to disable all obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2398
diff changeset
   189
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   190
  $ cd ..
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   191
3171
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
   192
And disable it server side too:
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
   193
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   194
  $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log  --config experimental.evolution.obsdiscovery=no
3171
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
   195
  $ cat hg.pid >> $DAEMON_PIDS
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
   196
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
   197
  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
4295
db87432df8de tests: add sparserevlog cap since hg now has sparse revlogs by default
Anton Shestakov <av6@dwimlabs.net>
parents: 4208
diff changeset
   198
  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   199
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   200
Check we cannot use pushkey for marker exchange anymore
3171
dbd340eafcb0 obsdiscovery: enforce the config on the server too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
   201
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   202
  $ hg debugpushkey http://localhost:$HGPORT/ obsolete
3173
3afe20410b55 wireproto: gracefully fail on http when trying to use older pushkey method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3172
diff changeset
   203
  abort: HTTP Error 410: won't exchange obsmarkers through pushkey
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   204
  [255]
3505
25155eb05f5f legacy-push: fix the code forbidding legacy obsmarkers pulling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3417
diff changeset
   205
  $ cat errors.log
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   206
  $ hg debugpushkey ssh://user@dummy/server obsolete
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   207
  remote: abort: won't exchange obsmarkers through pushkey
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   208
  remote: (upgrade your client or server to use the bundle2 protocol)
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   209
  abort: unexpected response: empty string
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   210
  [255]
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   211
3179
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   212
(do some extra pulling to be sure)
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   213
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   214
  $ hg -R client pull http://localhost:$HGPORT/
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   215
  pulling from http://localhost:$HGPORT/
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   216
  searching for changes
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   217
  no changes found
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   218
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   219
  $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   220
  pulling from http://localhost:$HGPORT/
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   221
  searching for changes
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   222
  no changes found
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   223
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   224
  $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers --config extensions.evolve='!'
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   225
  pulling from http://localhost:$HGPORT/
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   226
  searching for changes
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   227
  no changes found
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   228
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   229
But we do let it goes fine on repository with exchange disabled:
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   230
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   231
  $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   232
  $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log  --config experimental.evolution='!'
4289
cabe3b5d5139 tests: don't forget to add hg serve pid to DAEMON_PIDS in test-wireproto.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4199
diff changeset
   233
  $ cat hg.pid >> $DAEMON_PIDS
3172
aed2cac9edc3 wireproto: avoid exposing pushkey abort for server without evolution
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3171
diff changeset
   234
  $ hg debugpushkey http://localhost:$HGPORT/ obsolete
3179
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   235
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   236
(do some extra pulling to be sure)
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   237
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   238
  $ hg -R client pull http://localhost:$HGPORT/
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   239
  pulling from http://localhost:$HGPORT/
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   240
  searching for changes
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   241
  no changes found
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   242
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   243
  $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   244
  pulling from http://localhost:$HGPORT/
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   245
  searching for changes
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   246
  no changes found
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   247
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   248
  $ hg -R client pull http://localhost:$HGPORT/ --config experimental.evolution=createmarkers --config extensions.evolve='!'
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   249
  pulling from http://localhost:$HGPORT/
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   250
  searching for changes
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   251
  no changes found
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   252
cae57c9b5a94 tests: add more testing of pulling with various setting
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3173
diff changeset
   253
  $ $RUNTESTDIR/killdaemons.py $DAEMON_PIDS