tests/test-patchbomb-bookmark.t
author spectral <spectral@google.com>
Thu, 27 Sep 2018 20:16:48 -0700
changeset 39985 731961d972ba
parent 39157 d7007b807fa2
permissions -rw-r--r--
treemanifests: remove _loadalllazy in _diff() The benchmarks below use a similar setup as in ee7ee0c516ca and my other recent commits. Yes, in some cases this runs in literally 5% of the time it previously took. before = a6f8ab53 diff --git: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 1.301 s +- 0.004 s | 1.309 s +- 0.012 s | 100.6% m-u | | x | 1.303 s +- 0.009 s | 1.302 s +- 0.006 s | 99.9% m-u | x | | 1.308 s +- 0.006 s | 1.309 s +- 0.007 s | 100.1% m-u | x | x | 85.7 ms +- 0.6 ms | 86.0 ms +- 0.3 ms | 100.4% l-d-r | | | 197.5 ms +- 0.7 ms | 197.8 ms +- 2.2 ms | 100.2% l-d-r | | x | 199.4 ms +- 0.6 ms | 199.3 ms +- 0.9 ms | 99.9% l-d-r | x | | 86.1 ms +- 0.5 ms | 85.8 ms +- 0.9 ms | 99.7% l-d-r | x | x | 64.4 ms +- 0.4 ms | 64.4 ms +- 0.3 ms | 100.0% diff -c . --git: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 236.7 ms +- 1.1 ms | 236.5 ms +- 1.3 ms | 99.9% m-u | | x | 158.7 ms +- 1.0 ms | 128.0 ms +- 1.0 ms | 80.7% <-- m-u | x | | 239.7 ms +- 1.8 ms | 238.1 ms +- 1.5 ms | 99.3% m-u | x | x | 132.4 ms +- 0.9 ms | 132.3 ms +- 0.6 ms | 99.9% l-d-r | | | 81.8 ms +- 0.4 ms | 81.8 ms +- 0.3 ms | 100.0% l-d-r | | x | 3.894 s +- 0.017 s | 193.6 ms +- 0.4 ms | 5.0% <-- l-d-r | x | | 106.9 ms +- 0.4 ms | 106.6 ms +- 0.3 ms | 99.7% l-d-r | x | x | 182.7 ms +- 0.8 ms | 183.3 ms +- 0.9 ms | 100.3% rebase -r . --keep -d .^^: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 5.615 s +- 0.109 s | 5.562 s +- 0.015 s | 99.1% m-u | | x | 5.701 s +- 0.027 s | 5.715 s +- 0.023 s | 100.2% m-u | x | | 5.572 s +- 0.128 s | 5.613 s +- 0.182 s | 100.7% m-u | x | x | 633.3 ms +- 28.7 ms | 636.2 ms +- 13.8 ms | 100.5% l-d-r | | | 666.4 ms +- 17.0 ms | 658.5 ms +- 9.3 ms | 98.8% l-d-r | | x | 6.520 s +- 0.070 s | 6.505 s +- 0.026 s | 99.8% l-d-r | x | | 279.0 ms +- 13.0 ms | 276.5 ms +- 4.7 ms | 99.1% l-d-r | x | x | 1.636 s +- 0.058 s | 1.657 s +- 0.014 s | 101.3% status --change . --copies: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 218.6 ms +- 1.4 ms | 217.9 ms +- 1.5 ms | 99.7% m-u | | x | 138.5 ms +- 0.4 ms | 108.4 ms +- 0.2 ms | 78.3% <-- m-u | x | | 220.1 ms +- 1.3 ms | 219.7 ms +- 1.5 ms | 99.8% m-u | x | x | 113.2 ms +- 0.4 ms | 112.4 ms +- 0.8 ms | 99.3% l-d-r | | | 80.2 ms +- 0.3 ms | 80.6 ms +- 0.6 ms | 100.5% l-d-r | | x | 3.899 s +- 0.020 s | 194.8 ms +- 4.0 ms | 5.0% <-- l-d-r | x | | 83.4 ms +- 0.8 ms | 83.2 ms +- 0.2 ms | 99.8% l-d-r | x | x | 732.2 ms +- 4.3 ms | 194.9 ms +- 1.0 ms | 26.6% <-- status --copies: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 1.917 s +- 0.005 s | 1.914 s +- 0.004 s | 99.8% m-u | | x | 1.909 s +- 0.012 s | 1.934 s +- 0.004 s | 101.3% m-u | x | | 1.915 s +- 0.005 s | 1.904 s +- 0.004 s | 99.4% m-u | x | x | 94.8 ms +- 0.3 ms | 94.7 ms +- 0.2 ms | 99.9% l-d-r | | | 593.9 ms +- 1.2 ms | 594.6 ms +- 9.4 ms | 100.1% l-d-r | | x | 595.2 ms +- 3.8 ms | 597.2 ms +- 2.6 ms | 100.3% l-d-r | x | | 182.5 ms +- 1.6 ms | 182.1 ms +- 0.6 ms | 99.8% l-d-r | x | x | 149.6 ms +- 0.9 ms | 149.1 ms +- 0.8 ms | 99.7% update $rev^; ~/src/hg/hg{hg}/hg update $rev: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 3.121 s +- 0.007 s | 3.129 s +- 0.012 s | 100.3% m-u | | x | 2.972 s +- 0.011 s | 2.981 s +- 0.012 s | 100.3% m-u | x | | 3.144 s +- 0.014 s | 3.141 s +- 0.011 s | 99.9% m-u | x | x | 312.2 ms +- 2.4 ms | 312.3 ms +- 2.1 ms | 100.0% l-d-r | | | 444.4 ms +- 4.3 ms | 446.9 ms +- 5.3 ms | 100.6% l-d-r | | x | 9.159 s +- 0.069 s | 9.182 s +- 0.040 s | 100.3% l-d-r | x | | 254.6 ms +- 1.6 ms | 255.2 ms +- 1.6 ms | 100.2% l-d-r | x | x | 1.525 s +- 0.007 s | 1.577 s +- 0.007 s | 103.4% <--? Differential Revision: https://phab.mercurial-scm.org/D4845
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
32662
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 ...
34317
2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents: 32662
diff changeset
    34
  MIME-Version: 1.0
32662
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
39157
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
    38
  Message-Id: <patchbomb.347155260@test-hostname>
32662
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 ...
34317
2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents: 32662
diff changeset
    46
  MIME-Version: 1.0
32662
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
39157
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
    53
  Message-Id: <accde9b8b6dce861c185.347155261@test-hostname>
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
    54
  X-Mercurial-Series-Id: <accde9b8b6dce861c185.347155261@test-hostname>
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
    55
  In-Reply-To: <patchbomb.347155260@test-hostname>
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
    56
  References: <patchbomb.347155260@test-hostname>
32662
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 ...
34317
2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents: 32662
diff changeset
    77
  MIME-Version: 1.0
32662
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
39157
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
    84
  Message-Id: <417defd1559c396ba06a.347155262@test-hostname>
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
    85
  X-Mercurial-Series-Id: <accde9b8b6dce861c185.347155261@test-hostname>
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
    86
  In-Reply-To: <patchbomb.347155260@test-hostname>
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
    87
  References: <patchbomb.347155260@test-hostname>
32662
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 ...
34317
2d0c306a88c2 mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents: 32662
diff changeset
   141
  MIME-Version: 1.0
32662
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
39157
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
   148
  Message-Id: <8dab2639fd35f1e337ad.378691260@test-hostname>
d7007b807fa2 tests: un-glob patchbomb test lines that were only globbing a hostname
Augie Fackler <raf@durin42.com>
parents: 34317
diff changeset
   149
  X-Mercurial-Series-Id: <8dab2639fd35f1e337ad.378691260@test-hostname>
32662
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