D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[KenyaCollier (Kenya Collier)]

Herald added a subscriber: mercurial-patches.
KenyaCollier added a comment.


  Your ideas are incredible. The way of encouraging the new talent is truly 
good and completely amazing. I have been looking for high school essay writing 
 blogs and it's simply a 
wonderful time to gather the roles positions and timings.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D5490/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: mercurial-patches, KenyaCollier, spectral, yuja, durin42, pulkit, 
mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh abandoned this revision.
navaneeth.suresh added a comment.


  https://phab.mercurial-scm.org/rHG66399f2e92aac38855caab69a4c0acafead90c91 
solves this issue, many thanks @spectral. Closing this.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: spectral, yuja, durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[yuja (Yuya Nishihara)]

yuja added a comment.


  >   @spectral @yuja Can I close this?
  
  Probably yes.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: spectral, yuja, durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[Yuya Nishihara]

>   @spectral @yuja Can I close this?

Probably yes.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh added a subscriber: spectral.
navaneeth.suresh added a comment.


  @spectral @yuja Can I close this?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: spectral, yuja, durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[yuja (Yuya Nishihara)]

yuja added a comment.


  >   > `_performrevert()` would be in the same boat, but it was explicitly 
flagged on
  >   >  at 
https://phab.mercurial-scm.org/rHGf37a69ec3f4717fdb4f00699ca06c225f106696c. 
This implies that the `diff.ignorews` option would be used
  >   >  in practice to exclude whitespace changes while interactive 
commit/revert.
  >   >  So disabling any whitespace options would break someone's workflow.
  >   
  >   I'm confused after this comment. How do you want me to move forward?
  
  Yeah, I'm also confused about the current state. Honestly, I'm out of ideas.
  We could add diff options to commit and revert, but I'm not sure if they
  are widely used enough to being options of these commands.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: yuja, durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[Yuya Nishihara]

>   > `_performrevert()` would be in the same boat, but it was explicitly 
> flagged on
>   >  at 
> https://phab.mercurial-scm.org/rHGf37a69ec3f4717fdb4f00699ca06c225f106696c. 
> This implies that the `diff.ignorews` option would be used
>   >  in practice to exclude whitespace changes while interactive 
> commit/revert.
>   >  So disabling any whitespace options would break someone's workflow.
>   
>   I'm confused after this comment. How do you want me to move forward?

Yeah, I'm also confused about the current state. Honestly, I'm out of ideas.
We could add diff options to commit and revert, but I'm not sure if they
are widely used enough to being options of these commands.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh added a comment.


  > `_performrevert()` would be in the same boat, but it was explicitly flagged 
on
  >  at 
https://phab.mercurial-scm.org/rHGf37a69ec3f4717fdb4f00699ca06c225f106696c. 
This implies that the `diff.ignorews` option would be used
  >  in practice to exclude whitespace changes while interactive commit/revert.
  >  So disabling any whitespace options would break someone's workflow.
  
  I'm confused after this comment. How do you want me to move forward?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: yuja, durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[yuja (Yuya Nishihara)]

yuja added a comment.


  >   > It was intentionally added by 
https://phab.mercurial-scm.org/rHG3f1dccea9510c122cf9ab0e7a5a19ceed3600a7f 
(with no tests.)
  >   
  >   Do you want me to add tests for that?  If yes, please mention the things 
I need to take care of on
  >writing those tests.
  
  I think you can reuse the test you've written for `commit -i`.
  
  >   I've updated the revision and things are working fine. There is still 
`whitespace=True` existing
  >   on calling `patch.difffeatureopts()` in `fastannotate`, 
`diffutil.diffallopts()`,
  >   `webutil.difffeatureopts()` and ``cmdutil._performrevert()`. Is there 
anything
  >   to be done on that?
  
  Good questionn. Maybe we can't simply fix the issue6042 by turning off the
  whitespace options?
  
  `_performrevert()` would be in the same boat, but it was explicitly flagged on
  at 
https://phab.mercurial-scm.org/rHGf37a69ec3f4717fdb4f00699ca06c225f106696c. 
This implies that the `diff.ignorews` option would be used
  in practice to exclude whitespace changes while interactive commit/revert.
  So disabling any whitespace options would break someone's workflow.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: yuja, durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[Yuya Nishihara]

>   > It was intentionally added by 
> https://phab.mercurial-scm.org/rHG3f1dccea9510c122cf9ab0e7a5a19ceed3600a7f 
> (with no tests.)
>   
>   Do you want me to add tests for that?  If yes, please mention the things I 
> need to take care of on
>writing those tests.

I think you can reuse the test you've written for `commit -i`.

>   I've updated the revision and things are working fine. There is still 
> `whitespace=True` existing
>   on calling `patch.difffeatureopts()` in `fastannotate`, 
> `diffutil.diffallopts()`,
>   `webutil.difffeatureopts()` and ``cmdutil._performrevert()`. Is there 
> anything
>   to be done on that?

Good questionn. Maybe we can't simply fix the issue6042 by turning off the
whitespace options?

`_performrevert()` would be in the same boat, but it was explicitly flagged on
at f37a69ec3f47. This implies that the `diff.ignorews` option would be used
in practice to exclude whitespace changes while interactive commit/revert.
So disabling any whitespace options would break someone's workflow.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[yuja (Yuya Nishihara)]

yuja added a comment.


  > - a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -237,6 +237,7 @@ def 
dorecord(ui, repo, commitfunc, cmdsuggest, backupall, filterfn, *pats, **opts): 
opts = pycompat.byteskwargs(opts) +ignorews = opts.get('ignorews', False)
  
  It isn't nice to mix command options and internal flags. Instead, maybe we can
  first change `record()` to not call `commands.commit()`, and pass in 
`whitespace`
  option to `cmdutil.dorecord()`.
  
def record(ui, repo, *pats, **opts):
opts = pycompat.byteskwargs(opts)
...
with repo.wlock(), repo.lock():
ret = cmdutil.dorecord(ui, repo, commands.commit, ..., 
whitespace=True,
   pats, opts)
...
  
  And I don't think `ignorews` is good name. It doesn't mean whitespace is
  ignored.
  
  >   def qrefresh(origfn, ui, repo, *pats, **opts):
  >   if not opts[r'interactive']:
  > 
  > @@ -89,7 +89,7 @@
  > 
  >   1. backup all changed files cmdutil.dorecord(ui, repo, committomq, None, 
True,
  > - cmdutil.recordfilter, *pats, **opts) +
cmdutil.recordfilter, *pats, ignorews=True, **opts)
  
  Perhaps, this one should be `ignorefs=False` since qrefresh has no diffwsopts.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: yuja, durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[Yuya Nishihara]

> --- a/mercurial/cmdutil.py
> +++ b/mercurial/cmdutil.py
> @@ -237,6 +237,7 @@
>  def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
>  filterfn, *pats, **opts):
>  opts = pycompat.byteskwargs(opts)
> +ignorews = opts.get('ignorews', False)

It isn't nice to mix command options and internal flags. Instead, maybe we can
first change `record()` to not call `commands.commit()`, and pass in 
`whitespace`
option to `cmdutil.dorecord()`.

```
def record(ui, repo, *pats, **opts):
opts = pycompat.byteskwargs(opts)
...
with repo.wlock(), repo.lock():
ret = cmdutil.dorecord(ui, repo, commands.commit, ..., whitespace=True,
   pats, opts)
...
```

And I don't think `ignorews` is good name. It doesn't mean whitespace is
ignored.

>  def qrefresh(origfn, ui, repo, *pats, **opts):
>  if not opts[r'interactive']:
> @@ -89,7 +89,7 @@
>  
>  # backup all changed files
>  cmdutil.dorecord(ui, repo, committomq, None, True,
> -cmdutil.recordfilter, *pats, **opts)
> +cmdutil.recordfilter, *pats, ignorews=True, **opts)

Perhaps, this one should be `ignorefs=False` since qrefresh has no diffwsopts.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh added a comment.


  > Sorry for late, but doesn't it break `hg record --ignore-all-space`, etc.?
  
  Yes. Exactly! Thanks for pointing that out.
  
  > It was intentionally added by 
https://phab.mercurial-scm.org/rHG3f1dccea9510c122cf9ab0e7a5a19ceed3600a7f 
(with no tests.)
  
  Do you want me to add tests for that?  If yes, please mention the things I 
need to take care of on
   writing those tests.
  
  I've updated the revision and things are working fine. There is still 
`whitespace=True` existing
  on calling `patch.difffeatureopts()` in `fastannotate`, 
`diffutil.diffallopts()`,
  `webutil.difffeatureopts()` and ``cmdutil._performrevert()`. Is there anything
  to be done on that?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: yuja, durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh updated this revision to Diff 13177.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5490?vs=13166=13177

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

AFFECTED FILES
  hgext/record.py
  mercurial/cmdutil.py
  tests/test-commit-interactive.t

CHANGE DETAILS

diff --git a/tests/test-commit-interactive.t b/tests/test-commit-interactive.t
--- a/tests/test-commit-interactive.t
+++ b/tests/test-commit-interactive.t
@@ -1807,3 +1807,40 @@
   n   0 -1 unset   subdir/f1
   $ hg status -A subdir/f1
   M subdir/f1
+
+making --interactive not ignore whitespaces with the following hgrc:
+[diff]
+ignorews=True
+  $ hg init issue6042
+  $ cd issue6042
+  $ cat >> $HGRCPATH << EOF
+  > [diff]
+  > ignorews = True
+  > [extensions]
+  > record =
+  > EOF
+  $ echo a > a
+  $ hg ci -Am 'add a'
+  adding a
+  $ echo 'a ' > a
+  $ hg diff
+  $ hg commit -i -m 'add ws to a' < y
+  > y
+  > n
+  > EOF
+  diff --git a/a b/a
+  1 hunks, 1 lines changed
+  examine changes to 'a'? [Ynesfdaq?] y
+  
+  @@ -1,1 +1,1 @@
+  -a
+  +a 
+  record this change to 'a'? [Ynesfdaq?] y
+  
+
+let's check whether record extension works fine or not after the fix
+  $ echo 'a  ' > a
+  $ hg record --ignore-all-space
+  no changes to record
+  [1]
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -237,6 +237,7 @@
 def dorecord(ui, repo, commitfunc, cmdsuggest, backupall,
 filterfn, *pats, **opts):
 opts = pycompat.byteskwargs(opts)
+ignorews = opts.get('ignorews', False)
 if not ui.interactive():
 if cmdsuggest:
 msg = _('running non-interactively, use %s instead') % cmdsuggest
@@ -282,7 +283,7 @@
 status = repo.status(match=match)
 if not force:
 repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
-diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
+diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=ignorews)
 diffopts.nodates = True
 diffopts.git = True
 diffopts.showfunc = True
diff --git a/hgext/record.py b/hgext/record.py
--- a/hgext/record.py
+++ b/hgext/record.py
@@ -72,7 +72,7 @@
 opts[r"interactive"] = True
 overrides = {('experimental', 'crecord'): False}
 with ui.configoverride(overrides, 'record'):
-return commands.commit(ui, repo, *pats, **opts)
+return commands.commit(ui, repo, *pats, ignorews=True, **opts)
 
 def qrefresh(origfn, ui, repo, *pats, **opts):
 if not opts[r'interactive']:
@@ -89,7 +89,7 @@
 
 # backup all changed files
 cmdutil.dorecord(ui, repo, committomq, None, True,
-cmdutil.recordfilter, *pats, **opts)
+cmdutil.recordfilter, *pats, ignorews=True, **opts)
 
 # This command registration is replaced during uisetup().
 @command('qrecord',
@@ -120,7 +120,7 @@
 overrides = {('experimental', 'crecord'): False}
 with ui.configoverride(overrides, 'record'):
 cmdutil.dorecord(ui, repo, committomq, cmdsuggest, False,
- cmdutil.recordfilter, *pats, **opts)
+ cmdutil.recordfilter, *pats, ignorews=True, **opts)
 
 def qnew(origfn, ui, repo, patch, *args, **opts):
 if opts[r'interactive']:



To: navaneeth.suresh, #hg-reviewers
Cc: yuja, durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[yuja (Yuya Nishihara)]

yuja added a comment.


  > - diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True) +
diffopts = patch.difffeatureopts(ui, opts=opts)
  
  Sorry for late, but doesn't it break `hg record --ignore-all-space`, etc.?
  It was intentionally added by 
https://phab.mercurial-scm.org/rHG3f1dccea9510c122cf9ab0e7a5a19ceed3600a7f 
(with no tests.)

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: yuja, durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[Yuya Nishihara]

> -diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
> +diffopts = patch.difffeatureopts(ui, opts=opts)

Sorry for late, but doesn't it break `hg record --ignore-all-space`, etc.?
It was intentionally added by 3f1dccea9510 (with no tests.)
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh added a comment.


  @durin42 I've added test for the current revision. Unfortunately, I'm unable 
to write a test for the wrong behaviour.  I'll try writing it again. Any hints 
from your side?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh updated this revision to Diff 13166.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5490?vs=13003=13166

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

AFFECTED FILES
  mercurial/cmdutil.py
  tests/test-commit-interactive.t

CHANGE DETAILS

diff --git a/tests/test-commit-interactive.t b/tests/test-commit-interactive.t
--- a/tests/test-commit-interactive.t
+++ b/tests/test-commit-interactive.t
@@ -1807,3 +1807,30 @@
   n   0 -1 unset   subdir/f1
   $ hg status -A subdir/f1
   M subdir/f1
+
+making --interactive not ignore whitespaces with the following hgrc:
+[diff]
+ignorews=True
+  $ hg init issue6042
+  $ cd issue6042
+  $ echo '[diff]' >> $HGRCPATH
+  $ echo 'ignorews=True' >> $HGRCPATH
+  $ echo a > a
+  $ hg ci -Am 'add a'
+  adding a
+  $ echo 'a ' > a
+  $ hg diff
+  $ hg commit -i -m 'add ws to a' < y
+  > y
+  > n
+  > EOF
+  diff --git a/a b/a
+  1 hunks, 1 lines changed
+  examine changes to 'a'? [Ynesfdaq?] y
+  
+  @@ -1,1 +1,1 @@
+  -a
+  +a 
+  record this change to 'a'? [Ynesfdaq?] y
+  
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -282,7 +282,7 @@
 status = repo.status(match=match)
 if not force:
 repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
-diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
+diffopts = patch.difffeatureopts(ui, opts=opts)
 diffopts.nodates = True
 diffopts.git = True
 diffopts.showfunc = True



To: navaneeth.suresh, #hg-reviewers
Cc: durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh added a comment.


  > Could you add a test?
  > 
  > (Bonus points if you add a test that shows the wrong behavior and then fix 
it in this change.)
  
  Sure. Will do.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[durin42 (Augie Fackler)]

durin42 added a comment.


  Could you add a test?
  
  (Bonus points if you add a test that shows the wrong behavior and then fix it 
in this change.)

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: durin42, pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh added a comment.


  In https://phab.mercurial-scm.org/D5490#81294, @pulkit wrote:
  
  > I am not sure whether this change is correct or not, but please add more 
description to your commit message explaining what this patch is doing, what 
the issue is about and how it fixes that.
  
  
  Done @pulkit

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  I am not sure whether this change is correct or not, but please add more 
description to your commit message explaining what this patch is doing, what 
the issue is about and how it fixes that.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D5490: commit: remove ignore whitespace option on --interactive (issue6042)

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5490

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -282,7 +282,7 @@
 status = repo.status(match=match)
 if not force:
 repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
-diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True)
+diffopts = patch.difffeatureopts(ui, opts=opts)
 diffopts.nodates = True
 diffopts.git = True
 diffopts.showfunc = True



To: navaneeth.suresh, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel