tests/test-patchbomb-bookmark.t
author Gregory Szorc <gregory.szorc@gmail.com>
Sat, 20 Jan 2018 22:55:42 -0800
changeset 35793 4fb2bb61597c
parent 34310 2d0c306a88c2
child 39120 d7007b807fa2
permissions -rw-r--r--
bundle2: increase payload part chunk size to 32kb Bundle2 payload parts are framed chunks. Esentially, we obtain data in equal size chunks of size `preferedchunksize` and emit those to a generator. That generator is fed into a compressor (which can be the no-op compressor, which just re-emits the generator). And the output from the compressor likely goes to a file descriptor or socket. What this means is that small chunk sizes create more Python objects and Python function calls than larger chunk sizes. And as we know, Python object and function call overhead in performance sensitive code matters (at least with CPython). This commit increases the bundle2 part payload chunk size from 4k to 32k. Practically speaking, this means that the chunks we feed into a compressor (implemented in C code) or feed directly into a file handle or socket write() are larger. It's possible the chunks might be larger than what the receiver can handle in one logical operation. But at that point, we're in C code, which is much more efficient at dealing with splitting up the chunk and making multiple function calls than Python is. A downside to larger chunks is that the receiver has to wait for that much data to arrive (either raw or from a decompressor) before it can process the chunk. But 32kb still feels like a small buffer to have to wait for. And in many cases, the client will convert from 8 read(4096) to 1 read(32768). That's happening in Python land. So we cut down on the number of Python objects and function calls, making the client faster as well. I don't think there are any significant concerns to increasing the payload chunk size to 32kb. The impact of this change on performance significant. Using `curl` to obtain a stream clone bundle2 payload from a server on localhost serving the mozilla-unified repository: before: 20.78 user; 7.71 system; 80.5 MB/s after: 13.90 user; 3.51 system; 132 MB/s legacy: 9.72 user; 8.16 system; 132 MB/s bundle2 stream clone generation is still more resource intensive than legacy stream clone (that's likely because of the use of a util.chunkbuffer). But the throughput is the same. We might be in territory we're this is effectively a benchmark of the networking stack or Python's syscall throughput. From the client perspective, `hg clone -U --stream`: before: 33.50 user; 7.95 system; 53.3 MB/s after: 22.82 user; 7.33 system; 72.7 MB/s legacy: 29.96 user; 7.94 system; 58.0 MB/s And for `hg clone --stream` with a working directory update of ~230k files: after: 119.55 user; 26.47 system; 0:57.08 wall legacy: 126.98 user; 26.94 system; 1:05.56 wall So, it appears that bundle2's stream clone is now definitively faster than legacy stream clone! Differential Revision: https://phab.mercurial-scm.org/D1932
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
32639
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     1
Create @ bookmark as main reference
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     2
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     3
  $ hg init repo
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     4
  $ cd repo
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     5
  $ echo "[extensions]" >> $HGRCPATH
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     6
  $ echo "patchbomb=" >> $HGRCPATH
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     7
  $ hg book @
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     8
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     9
Create a dummy revision that must never be exported
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    10
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    11
  $ echo no > no
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    12
  $ hg ci -Amno -d '6 0'
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    13
  adding no
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    14
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    15
Create a feature and use -B
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    16
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    17
  $ hg book booktest
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    18
  $ echo first > a
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    19
  $ hg ci -Amfirst -d '7 0'
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    20
  adding a
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    21
  $ echo second > b
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    22
  $ hg ci -Amsecond -d '8 0'
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    23
  adding b
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    24
  $ hg email --date '1981-1-1 0:1' -n -t foo -s bookmark -B booktest
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    25
  From [test]: test
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    26
  this patch series consists of 2 patches.
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    27
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    28
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    29
  Write the introductory message for the patch series.
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    30
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    31
  Cc: 
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    32
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    33
  displaying [PATCH 0 of 2] bookmark ...
34310
2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents: 32639
diff changeset
    34
  MIME-Version: 1.0
32639
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    35
  Content-Type: text/plain; charset="us-ascii"
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    36
  Content-Transfer-Encoding: 7bit
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    37
  Subject: [PATCH 0 of 2] bookmark
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    38
  Message-Id: <patchbomb.347155260@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    39
  User-Agent: Mercurial-patchbomb/* (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    40
  Date: Thu, 01 Jan 1981 00:01:00 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    41
  From: test
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    42
  To: foo
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    43
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    44
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    45
  displaying [PATCH 1 of 2] first ...
34310
2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents: 32639
diff changeset
    46
  MIME-Version: 1.0
32639
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    47
  Content-Type: text/plain; charset="us-ascii"
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    48
  Content-Transfer-Encoding: 7bit
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    49
  Subject: [PATCH 1 of 2] first
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    50
  X-Mercurial-Node: accde9b8b6dce861c185d0825c1affc09a79cb26
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    51
  X-Mercurial-Series-Index: 1
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    52
  X-Mercurial-Series-Total: 2
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    53
  Message-Id: <accde9b8b6dce861c185.347155261@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    54
  X-Mercurial-Series-Id: <accde9b8b6dce861c185.347155261@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    55
  In-Reply-To: <patchbomb.347155260@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    56
  References: <patchbomb.347155260@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    57
  User-Agent: Mercurial-patchbomb/* (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    58
  Date: Thu, 01 Jan 1981 00:01:01 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    59
  From: test
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    60
  To: foo
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    61
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    62
  # HG changeset patch
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    63
  # User test
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    64
  # Date 7 0
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    65
  #      Thu Jan 01 00:00:07 1970 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    66
  # Node ID accde9b8b6dce861c185d0825c1affc09a79cb26
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    67
  # Parent  043bd3889e5aaf7d88fe3713cf425f782ad2fb71
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    68
  first
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    69
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    70
  diff -r 043bd3889e5a -r accde9b8b6dc a
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    71
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    72
  +++ b/a	Thu Jan 01 00:00:07 1970 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    73
  @@ -0,0 +1,1 @@
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    74
  +first
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    75
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    76
  displaying [PATCH 2 of 2] second ...
34310
2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents: 32639
diff changeset
    77
  MIME-Version: 1.0
32639
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    78
  Content-Type: text/plain; charset="us-ascii"
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    79
  Content-Transfer-Encoding: 7bit
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    80
  Subject: [PATCH 2 of 2] second
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    81
  X-Mercurial-Node: 417defd1559c396ba06a44dce8dc1c2d2d653f3f
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    82
  X-Mercurial-Series-Index: 2
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    83
  X-Mercurial-Series-Total: 2
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    84
  Message-Id: <417defd1559c396ba06a.347155262@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    85
  X-Mercurial-Series-Id: <accde9b8b6dce861c185.347155261@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    86
  In-Reply-To: <patchbomb.347155260@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    87
  References: <patchbomb.347155260@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    88
  User-Agent: Mercurial-patchbomb/* (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    89
  Date: Thu, 01 Jan 1981 00:01:02 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    90
  From: test
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    91
  To: foo
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    92
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    93
  # HG changeset patch
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    94
  # User test
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    95
  # Date 8 0
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    96
  #      Thu Jan 01 00:00:08 1970 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    97
  # Node ID 417defd1559c396ba06a44dce8dc1c2d2d653f3f
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    98
  # Parent  accde9b8b6dce861c185d0825c1affc09a79cb26
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    99
  second
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   100
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   101
  diff -r accde9b8b6dc -r 417defd1559c b
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   102
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   103
  +++ b/b	Thu Jan 01 00:00:08 1970 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   104
  @@ -0,0 +1,1 @@
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   105
  +second
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   106
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   107
Do the same and combine with -o only one must be exported
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   108
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   109
  $ cd ..
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   110
  $ hg clone repo repo2
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   111
  updating to bookmark @
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   112
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   113
  $ cd repo
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   114
  $ hg up @
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   115
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   116
  (activating bookmark @)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   117
  $ hg book outgoing
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   118
  $ echo 1 > x
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   119
  $ hg ci -Am1 -d '8 0'
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   120
  adding x
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   121
  created new head
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   122
  $ hg push ../repo2 -B outgoing
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   123
  pushing to ../repo2
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   124
  searching for changes
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   125
  adding changesets
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   126
  adding manifests
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   127
  adding file changes
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   128
  added 1 changesets with 1 changes to 1 files (+1 heads)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   129
  exporting bookmark outgoing
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   130
  $ echo 2 > y
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   131
  $ hg ci -Am2 -d '9 0'
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   132
  adding y
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   133
  $ hg email --date '1982-1-1 0:1' -n -t foo -s bookmark -B outgoing -o ../repo2
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   134
  comparing with ../repo2
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   135
  From [test]: test
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   136
  this patch series consists of 1 patches.
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   137
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   138
  Cc: 
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   139
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   140
  displaying [PATCH] bookmark ...
34310
2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents: 32639
diff changeset
   141
  MIME-Version: 1.0
32639
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   142
  Content-Type: text/plain; charset="us-ascii"
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   143
  Content-Transfer-Encoding: 7bit
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   144
  Subject: [PATCH] bookmark
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   145
  X-Mercurial-Node: 8dab2639fd35f1e337ad866c372a5c44f1064e3c
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   146
  X-Mercurial-Series-Index: 1
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   147
  X-Mercurial-Series-Total: 1
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   148
  Message-Id: <8dab2639fd35f1e337ad.378691260@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   149
  X-Mercurial-Series-Id: <8dab2639fd35f1e337ad.378691260@*> (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   150
  User-Agent: Mercurial-patchbomb/* (glob)
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   151
  Date: Fri, 01 Jan 1982 00:01:00 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   152
  From: test
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   153
  To: foo
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   154
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   155
  # HG changeset patch
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   156
  # User test
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   157
  # Date 9 0
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   158
  #      Thu Jan 01 00:00:09 1970 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   159
  # Node ID 8dab2639fd35f1e337ad866c372a5c44f1064e3c
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   160
  # Parent  0b24b8316483bf30bfc3e4d4168e922b169dbe66
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   161
  2
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   162
  
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   163
  diff -r 0b24b8316483 -r 8dab2639fd35 y
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   164
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   165
  +++ b/y	Thu Jan 01 00:00:09 1970 +0000
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   166
  @@ -0,0 +1,1 @@
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   167
  +2
c2fe2b00db53 patchbomb: add -B option to select a bookmark
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
   168