tests/test-bundle2-multiple-changegroups.t
author Gregory Szorc <gregory.szorc@gmail.com>
Thu, 28 Feb 2019 12:54:48 -0800
changeset 41852 0f49b56d5d74
parent 41649 e8a71ed9c373
child 41901 94faa2e84094
permissions -rw-r--r--
inno: replace add_path.exe with a Pascal script While attempting to build the Inno installer, I was unable to find a copy of add_path.exe from the source site previously listed in the docs. Some quick Googling revealed that achieving this functionality in native Pascal scripts seems to be preferred these days. This commit vendors "Modify Path" (fetched from https://www.legroom.net/software/modpath) and plugs it into our Inno config file per its instructions. The existing Inno installer appears to only modify PATH for the current user (as opposed to at the system level). I've maintained this behavior with Modify Path. Although it would be trivial to change or add checkboxes to control the behavior. I'll leave this as a follow-up. Differential Revision: https://phab.mercurial-scm.org/D6060
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
     1
Create an extension to test bundle2 with multiple changegroups
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
     2
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
     3
  $ cat > bundle2.py <<EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
     4
  > """
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
     5
  > """
29818
d4e026341e16 getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29686
diff changeset
     6
  > from mercurial import changegroup, discovery, exchange
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
     7
  > 
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
     8
  > def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None,
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
     9
  >                               b2caps=None, heads=None, common=None,
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    10
  >                               **kwargs):
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    11
  >     # Create two changegroups given the common changesets and heads for the
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    12
  >     # changegroup part we are being requested. Use the parent of each head
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    13
  >     # in 'heads' as intermediate heads for the first changegroup.
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    14
  >     intermediates = [repo[r].p1().node() for r in heads]
29818
d4e026341e16 getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29686
diff changeset
    15
  >     outgoing = discovery.outgoing(repo, common, intermediates)
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35400
diff changeset
    16
  >     cg = changegroup.makechangegroup(repo, outgoing, b'01',
34116
5ede882c249c changegroup: replace getchangegroup with makechangegroup
Durham Goode <durham@fb.com>
parents: 32327
diff changeset
    17
  >                                      source, bundlecaps=bundlecaps)
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35400
diff changeset
    18
  >     bundler.newpart(b'output', data=b'changegroup1')
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35400
diff changeset
    19
  >     bundler.newpart(b'changegroup', data=cg.getchunks())
29818
d4e026341e16 getchangegroup: take an 'outgoing' object as argument (API)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 29686
diff changeset
    20
  >     outgoing = discovery.outgoing(repo, common + intermediates, heads)
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35400
diff changeset
    21
  >     cg = changegroup.makechangegroup(repo, outgoing, b'01',
34116
5ede882c249c changegroup: replace getchangegroup with makechangegroup
Durham Goode <durham@fb.com>
parents: 32327
diff changeset
    22
  >                                      source, bundlecaps=bundlecaps)
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35400
diff changeset
    23
  >     bundler.newpart(b'output', data=b'changegroup2')
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35400
diff changeset
    24
  >     bundler.newpart(b'changegroup', data=cg.getchunks())
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    25
  > 
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    26
  > def _pull(repo, *args, **kwargs):
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    27
  >   pullop = _orig_pull(repo, *args, **kwargs)
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35400
diff changeset
    28
  >   repo.ui.write(b'pullop.cgresult is %d\n' % pullop.cgresult)
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    29
  >   return pullop
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    30
  > 
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    31
  > _orig_pull = exchange.pull
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    32
  > exchange.pull = _pull
35570
3e3f4c03876b tests: add b'' to string literals where bytes are required
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35400
diff changeset
    33
  > exchange.getbundle2partsmapping[b'changegroup'] = _getbundlechangegrouppart
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    34
  > EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    35
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    36
  $ cat >> $HGRCPATH << EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    37
  > [ui]
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    38
  > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline}
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    39
  > EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    40
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    41
Start with a simple repository with a single commit
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    42
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    43
  $ hg init repo
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    44
  $ cd repo
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    45
  $ cat > .hg/hgrc << EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    46
  > [extensions]
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    47
  > bundle2=$TESTTMP/bundle2.py
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    48
  > EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    49
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    50
  $ echo A > A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    51
  $ hg commit -A -m A -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    52
  $ cd ..
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    53
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    54
Clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    55
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    56
  $ hg clone -q repo clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    57
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    58
Add two linear commits
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    59
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    60
  $ cd repo
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    61
  $ echo B > B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    62
  $ hg commit -A -m B -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    63
  $ echo C > C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    64
  $ hg commit -A -m C -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    65
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    66
  $ cd ../clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    67
  $ cat >> .hg/hgrc <<EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    68
  > [hooks]
41649
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    69
  > pretxnchangegroup = sh -c "printenv.py --line pretxnchangegroup"
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    70
  > changegroup = sh -c "printenv.py --line changegroup"
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    71
  > incoming = sh -c "printenv.py --line incoming"
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    72
  > EOF
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    73
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    74
Pull the new commits in the clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    75
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    76
  $ hg pull
35400
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
    77
  pulling from $TESTTMP/repo
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    78
  searching for changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    79
  remote: changegroup1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    80
  adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    81
  adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    82
  adding file changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    83
  added 1 changesets with 1 changes to 1 files
41649
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    84
  pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    85
  HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    86
  HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    87
  HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    88
  HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    89
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    90
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    91
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    92
  
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    93
  remote: changegroup2
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    94
  adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    95
  adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    96
  adding file changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
    97
  added 1 changesets with 1 changes to 1 files
41649
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    98
  pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
    99
  HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   100
  HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   101
  HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   102
  HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   103
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   104
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   105
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   106
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   107
  
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34116
diff changeset
   108
  new changesets 27547f69f254:f838bfaca5c7
41649
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   109
  changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   110
  HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   111
  HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   112
  HG_NODE_LAST=27547f69f25460a52fff66ad004e58da7ad3fb56
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   113
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   114
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   115
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   116
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   117
  incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   118
  HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   119
  HG_NODE=27547f69f25460a52fff66ad004e58da7ad3fb56
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   120
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   121
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   122
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   123
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   124
  changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   125
  HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   126
  HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   127
  HG_NODE_LAST=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   128
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   129
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   130
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   131
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   132
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   133
  incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   134
  HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   135
  HG_NODE=f838bfaca5c7226600ebcfd84f3c3c13a28d3757
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   136
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   137
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   138
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   139
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   140
  
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   141
  pullop.cgresult is 1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   142
  (run 'hg update' to get a working copy)
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   143
  $ hg update
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   144
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   145
  $ hg log -G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   146
  @  2:f838bfaca5c7 public test  C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   147
  |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   148
  o  1:27547f69f254 public test  B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   149
  |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   150
  o  0:4a2df7238c3b public test  A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   151
  
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   152
Add more changesets with multiple heads to the original repository
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   153
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   154
  $ cd ../repo
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   155
  $ echo D > D
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   156
  $ hg commit -A -m D -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   157
  $ hg up -r 1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   158
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   159
  $ echo E > E
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   160
  $ hg commit -A -m E -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   161
  $ echo F > F
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   162
  $ hg commit -A -m F -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   163
  $ hg up -r 1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   164
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   165
  $ echo G > G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   166
  $ hg commit -A -m G -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   167
  $ hg up -r 3
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   168
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   169
  $ echo H > H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   170
  $ hg commit -A -m H -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   171
  $ hg log -G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   172
  @  7:5cd59d311f65 draft test  H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   173
  |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   174
  | o  6:1d14c3ce6ac0 draft test  G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   175
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   176
  | | o  5:7f219660301f draft test  F
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   177
  | | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   178
  | | o  4:8a5212ebc852 draft test  E
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   179
  | |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   180
  o |  3:b3325c91a4d9 draft test  D
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   181
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   182
  o |  2:f838bfaca5c7 draft test  C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   183
  |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   184
  o  1:27547f69f254 draft test  B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   185
  |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   186
  o  0:4a2df7238c3b draft test  A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   187
  
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   188
New heads are reported during transfer and properly accounted for in
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   189
pullop.cgresult
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   190
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   191
  $ cd ../clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   192
  $ hg pull
35400
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   193
  pulling from $TESTTMP/repo
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   194
  searching for changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   195
  remote: changegroup1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   196
  adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   197
  adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   198
  adding file changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   199
  added 2 changesets with 2 changes to 2 files (+1 heads)
41649
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   200
  pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   201
  HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   202
  HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   203
  HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   204
  HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   205
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   206
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   207
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   208
  
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   209
  remote: changegroup2
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   210
  adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   211
  adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   212
  adding file changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   213
  added 3 changesets with 3 changes to 3 files (+1 heads)
41649
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   214
  pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   215
  HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   216
  HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   217
  HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   218
  HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   219
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   220
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   221
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   222
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   223
  
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34116
diff changeset
   224
  new changesets b3325c91a4d9:5cd59d311f65
41649
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   225
  changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   226
  HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   227
  HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   228
  HG_NODE_LAST=8a5212ebc8527f9fb821601504794e3eb11a1ed3
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   229
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   230
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   231
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   232
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   233
  incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   234
  HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   235
  HG_NODE=b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   236
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   237
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   238
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   239
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   240
  incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   241
  HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   242
  HG_NODE=8a5212ebc8527f9fb821601504794e3eb11a1ed3
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   243
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   244
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   245
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   246
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   247
  changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   248
  HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   249
  HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   250
  HG_NODE_LAST=5cd59d311f6508b8e0ed28a266756c859419c9f1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   251
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   252
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   253
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   254
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   255
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   256
  incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   257
  HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   258
  HG_NODE=7f219660301fe4c8a116f714df5e769695cc2b46
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   259
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   260
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   261
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   262
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   263
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   264
  incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   265
  HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   266
  HG_NODE=1d14c3ce6ac0582d2809220d33e8cd7a696e0156
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   267
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   268
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   269
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   270
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   271
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   272
  incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   273
  HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   274
  HG_NODE=5cd59d311f6508b8e0ed28a266756c859419c9f1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   275
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   276
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   277
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   278
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   279
  
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   280
  pullop.cgresult is 3
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   281
  (run 'hg heads' to see heads, 'hg merge' to merge)
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   282
  $ hg log -G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   283
  o  7:5cd59d311f65 public test  H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   284
  |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   285
  | o  6:1d14c3ce6ac0 public test  G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   286
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   287
  | | o  5:7f219660301f public test  F
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   288
  | | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   289
  | | o  4:8a5212ebc852 public test  E
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   290
  | |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   291
  o |  3:b3325c91a4d9 public test  D
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   292
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   293
  @ |  2:f838bfaca5c7 public test  C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   294
  |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   295
  o  1:27547f69f254 public test  B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   296
  |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   297
  o  0:4a2df7238c3b public test  A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   298
  
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   299
Removing a head from the original repository by merging it
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   300
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   301
  $ cd ../repo
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   302
  $ hg merge -r 6 -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   303
  $ hg commit -m Merge
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   304
  $ echo I > I
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   305
  $ hg commit -A -m H -q
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   306
  $ hg log -G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   307
  @  9:9d18e5bd9ab0 draft test  H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   308
  |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   309
  o    8:71bd7b46de72 draft test  Merge
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   310
  |\
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   311
  | o  7:5cd59d311f65 draft test  H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   312
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   313
  o |  6:1d14c3ce6ac0 draft test  G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   314
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   315
  | | o  5:7f219660301f draft test  F
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   316
  | | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   317
  +---o  4:8a5212ebc852 draft test  E
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   318
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   319
  | o  3:b3325c91a4d9 draft test  D
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   320
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   321
  | o  2:f838bfaca5c7 draft test  C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   322
  |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   323
  o  1:27547f69f254 draft test  B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   324
  |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   325
  o  0:4a2df7238c3b draft test  A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   326
  
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   327
Removed heads are reported during transfer and properly accounted for in
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   328
pullop.cgresult
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   329
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   330
  $ cd ../clone
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   331
  $ hg pull
35400
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34661
diff changeset
   332
  pulling from $TESTTMP/repo
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   333
  searching for changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   334
  remote: changegroup1
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   335
  adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   336
  adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   337
  adding file changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   338
  added 1 changesets with 0 changes to 0 files (-1 heads)
41649
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   339
  pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   340
  HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   341
  HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   342
  HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   343
  HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   344
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   345
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   346
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   347
  
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   348
  remote: changegroup2
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   349
  adding changesets
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   350
  adding manifests
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   351
  adding file changes
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   352
  added 1 changesets with 1 changes to 1 files
41649
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   353
  pretxnchangegroup hook: HG_HOOKNAME=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   354
  HG_HOOKTYPE=pretxnchangegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   355
  HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   356
  HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   357
  HG_PENDING=$TESTTMP/clone
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   358
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   359
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   360
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   361
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   362
  
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34116
diff changeset
   363
  new changesets 71bd7b46de72:9d18e5bd9ab0
41649
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   364
  changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   365
  HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   366
  HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   367
  HG_NODE_LAST=71bd7b46de72e69a32455bf88d04757d542e6cf4
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   368
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   369
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   370
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   371
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   372
  incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   373
  HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   374
  HG_NODE=71bd7b46de72e69a32455bf88d04757d542e6cf4
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   375
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   376
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   377
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   378
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   379
  changegroup hook: HG_HOOKNAME=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   380
  HG_HOOKTYPE=changegroup
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   381
  HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   382
  HG_NODE_LAST=9d18e5bd9ab09337802595d49f1dad0c98df4d84
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   383
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   384
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   385
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   386
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   387
  
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   388
  incoming hook: HG_HOOKNAME=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   389
  HG_HOOKTYPE=incoming
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   390
  HG_NODE=9d18e5bd9ab09337802595d49f1dad0c98df4d84
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   391
  HG_PHASES_MOVED=1
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   392
  HG_SOURCE=pull
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   393
  HG_TXNID=TXN:$ID$
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   394
  HG_URL=file:$TESTTMP/repo
e8a71ed9c373 test: use `printenv.py --line` in `test-bundle2-multiple-changegroups.t`
Boris Feld <boris.feld@octobus.net>
parents: 35570
diff changeset
   395
  
22961
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   396
  pullop.cgresult is -2
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   397
  (run 'hg update' to get a working copy)
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   398
  $ hg log -G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   399
  o  9:9d18e5bd9ab0 public test  H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   400
  |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   401
  o    8:71bd7b46de72 public test  Merge
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   402
  |\
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   403
  | o  7:5cd59d311f65 public test  H
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   404
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   405
  o |  6:1d14c3ce6ac0 public test  G
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   406
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   407
  | | o  5:7f219660301f public test  F
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   408
  | | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   409
  +---o  4:8a5212ebc852 public test  E
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   410
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   411
  | o  3:b3325c91a4d9 public test  D
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   412
  | |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   413
  | @  2:f838bfaca5c7 public test  C
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   414
  |/
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   415
  o  1:27547f69f254 public test  B
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   416
  |
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   417
  o  0:4a2df7238c3b public test  A
a67ea4959ef5 bundle2: merge return values when bundle contains multiple changegroups
Mike Hommey <mh@glandium.org>
parents:
diff changeset
   418