tests/test-patchbomb.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 09 Jun 2007 01:04:28 -0300
changeset 4531 b51a8138292a
parent 4430 94cb7561337d
child 4563 1cf908c00479
permissions -rw-r--r--
Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     1
adding a
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     2
hg email: option --date not recognized
4430
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
     3
hg email [OPTION]... [DEST]...
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
     4
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
     5
send changesets by email
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     6
4430
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
     7
    By default, diffs are sent in the format generated by hg export,
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
     8
    one per message.  The series starts with a "[PATCH 0 of N]"
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
     9
    introduction, which describes the series as a whole.
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    10
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    11
    Each patch email has a Subject line of "[PATCH M of N] ...", using
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    12
    the first line of the changeset description as the subject text.
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    13
    The message contains two or three body parts.  First, the rest of
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    14
    the changeset description.  Next, (optionally) if the diffstat
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    15
    program is installed, the result of running diffstat on the patch.
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    16
    Finally, the patch itself, as generated by "hg export".
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    17
4430
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    18
    With --outgoing, emails will be generated for patches not
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    19
    found in the destination repository (or only those which are
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    20
    ancestors of the specified revisions if any are provided)
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    21
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    22
    With --bundle, changesets are selected as for --outgoing,
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    23
    but a single email containing a binary Mercurial bundle as an
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    24
    attachment will be sent.
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    25
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    26
    Examples:
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    27
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    28
    hg email -r 3000          # send patch 3000 only
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    29
    hg email -r 3000 -r 3001  # send patches 3000 and 3001
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    30
    hg email -r 3000:3005     # send patches 3000 through 3005
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    31
    hg email 3000             # send patch 3000 (deprecated)
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    32
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    33
    hg email -o               # send all patches not in default
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    34
    hg email -o DEST          # send all patches not in DEST
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    35
    hg email -o -r 3000       # send all ancestors of 3000 not in default
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    36
    hg email -o -r 3000 DEST  # send all ancestors of 3000 not in DEST
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    37
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    38
    hg email -b               # send bundle of all patches not in default
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    39
    hg email -b DEST          # send bundle of all patches not in DEST
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    40
    hg email -b -r 3000       # bundle of all ancestors of 3000 not in default
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    41
    hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in DEST
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    42
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    43
    Before using this command, you will need to enable email in your hgrc.
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    44
    See the [email] section in hgrc(5) for details.
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    45
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    46
options:
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    47
4430
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    48
 -a --attach     send patches as inline attachments
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    49
    --bcc        email addresses of blind copy recipients
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    50
 -c --cc         email addresses of copy recipients
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    51
 -d --diffstat   add diffstat output to messages
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    52
 -g --git        use git extended diff format
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    53
 -f --from       email address of sender
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    54
    --plain      omit hg patch header
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    55
 -n --test       print messages that would be sent
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    56
 -m --mbox       write messages to mbox file instead of sending them
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    57
 -o --outgoing   send changes not found in the target repository
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    58
 -b --bundle     send changes not in target as a binary bundle
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    59
 -r --rev        a revision to send
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    60
 -s --subject    subject of first message (intro or single patch)
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    61
 -t --to         email addresses of recipients
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    62
    --force      run even when remote repository is unrelated (with -b)
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    63
    --base       a base changeset to specify instead of a destination (with -b)
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    64
 -e --ssh        specify ssh command to use
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    65
    --remotecmd  specify hg command to run on the remote side
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    66
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    67
use "hg -v help email" to show global options
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    68
adding b
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    69
hg email: option --date not recognized
4430
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    70
hg email [OPTION]... [DEST]...
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    71
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    72
send changesets by email
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    73
4430
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    74
    By default, diffs are sent in the format generated by hg export,
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    75
    one per message.  The series starts with a "[PATCH 0 of N]"
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    76
    introduction, which describes the series as a whole.
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    77
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    78
    Each patch email has a Subject line of "[PATCH M of N] ...", using
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    79
    the first line of the changeset description as the subject text.
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    80
    The message contains two or three body parts.  First, the rest of
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    81
    the changeset description.  Next, (optionally) if the diffstat
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    82
    program is installed, the result of running diffstat on the patch.
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    83
    Finally, the patch itself, as generated by "hg export".
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    84
4430
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    85
    With --outgoing, emails will be generated for patches not
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    86
    found in the destination repository (or only those which are
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    87
    ancestors of the specified revisions if any are provided)
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    88
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    89
    With --bundle, changesets are selected as for --outgoing,
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    90
    but a single email containing a binary Mercurial bundle as an
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    91
    attachment will be sent.
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    92
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    93
    Examples:
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    94
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    95
    hg email -r 3000          # send patch 3000 only
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    96
    hg email -r 3000 -r 3001  # send patches 3000 and 3001
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    97
    hg email -r 3000:3005     # send patches 3000 through 3005
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    98
    hg email 3000             # send patch 3000 (deprecated)
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
    99
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   100
    hg email -o               # send all patches not in default
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   101
    hg email -o DEST          # send all patches not in DEST
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   102
    hg email -o -r 3000       # send all ancestors of 3000 not in default
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   103
    hg email -o -r 3000 DEST  # send all ancestors of 3000 not in DEST
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   104
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   105
    hg email -b               # send bundle of all patches not in default
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   106
    hg email -b DEST          # send bundle of all patches not in DEST
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   107
    hg email -b -r 3000       # bundle of all ancestors of 3000 not in default
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   108
    hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in DEST
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   109
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   110
    Before using this command, you will need to enable email in your hgrc.
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   111
    See the [email] section in hgrc(5) for details.
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   112
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   113
options:
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   114
4430
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   115
 -a --attach     send patches as inline attachments
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   116
    --bcc        email addresses of blind copy recipients
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   117
 -c --cc         email addresses of copy recipients
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   118
 -d --diffstat   add diffstat output to messages
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   119
 -g --git        use git extended diff format
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   120
 -f --from       email address of sender
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   121
    --plain      omit hg patch header
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   122
 -n --test       print messages that would be sent
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   123
 -m --mbox       write messages to mbox file instead of sending them
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   124
 -o --outgoing   send changes not found in the target repository
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   125
 -b --bundle     send changes not in target as a binary bundle
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   126
 -r --rev        a revision to send
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   127
 -s --subject    subject of first message (intro or single patch)
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   128
 -t --to         email addresses of recipients
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   129
    --force      run even when remote repository is unrelated (with -b)
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   130
    --base       a base changeset to specify instead of a destination (with -b)
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   131
 -e --ssh        specify ssh command to use
94cb7561337d Fix test-patchbomb for crew
Brendan Cully <brendan@kublai.com>
parents: 4421
diff changeset
   132
    --remotecmd  specify hg command to run on the remote side
4420
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   133
b0656b33cc02 add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   134
use "hg -v help email" to show global options