This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5788

commit: make `commit -i` respect whitespace CLI args, ignore config
AbandonedPublic

Authored by spectral on Jan 31 2019, 6:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

The record extension supports specifying various flags on the commandline to
change the way that whitespace is handled when partially committing the change.
D5744 broke this functionality, this commit restores it while still resolving
issue6042 and issue5839.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)
Mtests/test-record.t (41 lines)

Diff 13661

mercurial/cmdutil.py

if not force: if not force:
vdirs = [] vdirs = []
match.explicitdir = vdirs.append match.explicitdir = vdirs.append
match.bad = fail match.bad = fail
status = repo.status(match=match) status = repo.status(match=match)
if not force: if not force:
repo.checkcommitpatterns(wctx, vdirs, match, status, fail) repo.checkcommitpatterns(wctx, vdirs, match, status, fail)
diffopts = patch.difffeatureopts(ui, opts=opts) diffopts = patch.difffeatureopts(ui, opts=opts, whitespace='noconfig')
diffopts.nodates = True diffopts.nodates = True
diffopts.git = True diffopts.git = True
diffopts.showfunc = True diffopts.showfunc = True
originaldiff = patch.diff(repo, changes=status, opts=diffopts) originaldiff = patch.diff(repo, changes=status, opts=diffopts)
originalchunks = patch.parsepatch(originaldiff) originalchunks = patch.parsepatch(originaldiff)
# 1. filter patch, since we are intending to apply subset of it # 1. filter patch, since we are intending to apply subset of it
try: try:

tests/test-record.t

$ hg tip -p $ hg tip -p
changeset: -1:000000000000 changeset: -1:000000000000
tag: tip tag: tip
user: user:
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
$ cd $TESTTMP
Test the whitespace diffopts
$ hg init whitespace
$ cd whitespace
$ cat > foo <<EOF
> line1
> line2
> EOF
$ hg ci -qAm 'initial'
$ cat > foo <<EOF
> line1
>
> line2
> line3
> EOF
$ hg record -qAm 'with ignore-blank-lines' --ignore-blank-lines <<EOF
> f
> EOF
diff --git a/foo b/foo
1 hunks, 1 lines changed
examine changes to 'foo'? [Ynesfdaq?] f
(blank line should not have been recorded)
$ hg diff -c .
diff -r 2bebe08ba9bd -r cc97ffa5d61f foo
--- a/foo Thu Jan 01 00:00:00 1970 +0000
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,3 @@
line1
line2
+line3
$ hg diff
diff -r cc97ffa5d61f foo
--- a/foo Thu Jan 01 00:00:00 1970 +0000
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +1,4 @@
line1
+
line2
line3
$ cd $TESTTMP