Comments
Patch
@@ -417,7 +417,8 @@
@command('email',
[('g', 'git', None, _('use git extended diff format')),
- ('', 'git-format-patch', None, _('use git-format-patch email format')),
+ ('', 'git-format-patch', None, _('use git-format-patch email format '
+ '(implies --git)')),
('', 'plain', None, _('omit hg patch header')),
('o', 'outgoing', None,
_('send changes not found in the target repository')),
@@ -524,6 +525,9 @@
# internal option used by pbranches
patches = opts.get('patches')
+ if (opts.get('git_format_patch')):
+ opts['git'] = True
+
if not (opts.get('test') or mbox):
# really sending
mail.validateconfig(ui)
@@ -723,8 +723,8 @@
test diffstat for single patch for git:
- $ hg email --git-format-patch --git --date '1970-1-1 0:1' -n -f quux -t foo \
- > -c bar -s test -d -y -r 2
+ $ hg email --git-format-patch --date '1970-1-1 0:1' -n -f quux -t foo -c bar \
+ > -s test -d -y -r 2
this patch series consists of 1 patches.
@@ -892,8 +892,8 @@
test diffstat for multiple patches for git:
- $ hg email --git-format-patch --git --date '1970-1-1 0:1' -n -f quux -t foo \
- > -c bar -s test -d -y -r 0:1
+ $ hg email --git-format-patch --date '1970-1-1 0:1' -n -f quux -t foo -c bar \
+ > -s test -d -y -r 0:1
this patch series consists of 2 patches.