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

login
register
mail settings
Submitter phabricator
Date Jan. 11, 2019, 4:26 a.m.
Message ID <5f3a3a4a2e51ca098bbef98f41de88ac@localhost.localdomain>
Download mbox | patch
Permalink /patch/37654/
State Not Applicable
Headers show

Comments

phabricator - Jan. 11, 2019, 4:26 a.m.
navaneeth.suresh updated this revision to Diff 13166.

REPOSITORY
  rHG Mercurial

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

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

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

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: durin42, pulkit, mercurial-devel
Yuya Nishihara - Jan. 11, 2019, 12:50 p.m.
> -        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.)
phabricator - Jan. 11, 2019, 12:51 p.m.
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

Patch

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' <<EOF
+  > 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