Mercurial > hg-stable
changeset 18266:09a2b6741695
record: use patch.diffopts to account for user diffopts
This allows user defined diff options (e.g. showfunc) to be accounted for
when using record. A test has been updated accordingly.
| author | Denis Laxalde <denis@laxalde.org> |
|---|---|
| date | Tue, 08 Jan 2013 21:16:39 +0100 |
| parents | 246f290e162a |
| children | 5bb610f87d1d |
| files | hgext/record.py tests/test-record.t |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/record.py Tue Jan 08 16:26:52 2013 -0800 +++ b/hgext/record.py Tue Jan 08 21:16:39 2013 +0100 @@ -520,11 +520,11 @@ '(use "hg commit" instead)')) changes = repo.status(match=match)[:3] - diffopts = mdiff.diffopts( + diffopts = patch.diffopts(ui, opts=dict( git=True, nodates=True, ignorews=opts.get('ignore_all_space'), ignorewsamount=opts.get('ignore_space_change'), - ignoreblanklines=opts.get('ignore_blank_lines')) + ignoreblanklines=opts.get('ignore_blank_lines'))) chunks = patch.diff(repo, changes=changes, opts=diffopts) fp = cStringIO.StringIO() fp.write(''.join(chunks))
--- a/tests/test-record.t Tue Jan 08 16:26:52 2013 -0800 +++ b/tests/test-record.t Tue Jan 08 21:16:39 2013 +0100 @@ -255,18 +255,18 @@ [255] -Modify end of plain file +Modify end of plain file, also test that diffopts are accounted for $ HGUSER="test" $ export HGUSER - $ hg record -d '8 0' -m end plain <<EOF + $ hg record --config diff.showfunc=true -d '8 0' -m end plain <<EOF > y > y > EOF diff --git a/plain b/plain 1 hunks, 1 lines changed examine changes to 'plain'? [Ynesfdaq?] - @@ -8,3 +8,4 @@ + @@ -8,3 +8,4 @@ 7 8 9 10