[PATCH 2 of 4] hg: add --binary option for Git mode diffs

Yuya Nishihara yuya at tcha.org
Wed Apr 5 10:48:40 EDT 2017


On Tue, 4 Apr 2017 15:21:21 -0700, Alexander Fomin wrote:
> # HG changeset patch
> # User Alexander Fomin <afomin at fb.com>
> # Date 1491334100 25200
> #      Tue Apr 04 12:28:20 2017 -0700
> # Node ID 27515c7e38db9d93e18b7df13149da7c0d88eeb2
> # Parent  9be2b4ec19e846d2a95fe801ebe76f83fffd1ea9
> hg: add --binary option for Git mode diffs
> 
> This patch adds --binary option to `hg diff` and `hg export` to allow more
> control about when binary diffs are displayed in Git mode (issue5510).
> 
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -160,6 +160,7 @@ logopts = [
>  diffopts = [
>      ('a', 'text', None, _('treat all files as text')),
>      ('g', 'git', None, _('use git extended diff format')),
> +    ('', 'binary', None, _('generate binary diffs in Git mode (default)')),

lowercase git for consistency?


More information about the Mercurial-devel mailing list