Mercurial > evolve
changeset 5790:b1d1903df29e
pdiff: drop unnecessary CLI options
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 17 Feb 2021 15:37:14 +0530 |
| parents | d0389ddf402d |
| children | 2e1747baf550 |
| files | CHANGELOG hgext3rd/evolve/__init__.py |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Mon Feb 22 17:37:53 2021 +0100 +++ b/CHANGELOG Wed Feb 17 15:37:14 2021 +0530 @@ -5,6 +5,7 @@ -------------------- * evolve: improves content-divergence resolution that involve parent changes + * pdiff: drop some irrelevant command flag inherited from `hg diff` 10.2.0.post1 -- 2021-02-01 --------------------------
--- a/hgext3rd/evolve/__init__.py Mon Feb 22 17:37:53 2021 +0100 +++ b/hgext3rd/evolve/__init__.py Wed Feb 17 15:37:14 2021 +0530 @@ -444,7 +444,8 @@ return statuscmd[0](ui, repo, *args, **kwargs) _alias, diffcmd = cmdutil.findcmd(b'diff', commands.table) - pdiffopts = [o for o in diffcmd[1] if o[1] != b'rev'] + inapplicable = {b'rev', b'from', b'to', b'change'} + pdiffopts = [o for o in diffcmd[1] if o[1] not in inapplicable] @eh.command(b'pdiff', pdiffopts, **compat.helpcategorykwargs('CATEGORY_WORKING_DIRECTORY'))