Mercurial > hg-stable
comparison tests/test-record.t @ 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 | 3de04c07966a |
children | e4ae397595e8 |
comparison
equal
deleted
inserted
replaced
18265:246f290e162a | 18266:09a2b6741695 |
---|---|
253 $ hg record --config ui.username= -d '8 0' -m end plain | 253 $ hg record --config ui.username= -d '8 0' -m end plain |
254 abort: no username supplied (see "hg help config") | 254 abort: no username supplied (see "hg help config") |
255 [255] | 255 [255] |
256 | 256 |
257 | 257 |
258 Modify end of plain file | 258 Modify end of plain file, also test that diffopts are accounted for |
259 | 259 |
260 $ HGUSER="test" | 260 $ HGUSER="test" |
261 $ export HGUSER | 261 $ export HGUSER |
262 $ hg record -d '8 0' -m end plain <<EOF | 262 $ hg record --config diff.showfunc=true -d '8 0' -m end plain <<EOF |
263 > y | 263 > y |
264 > y | 264 > y |
265 > EOF | 265 > EOF |
266 diff --git a/plain b/plain | 266 diff --git a/plain b/plain |
267 1 hunks, 1 lines changed | 267 1 hunks, 1 lines changed |
268 examine changes to 'plain'? [Ynesfdaq?] | 268 examine changes to 'plain'? [Ynesfdaq?] |
269 @@ -8,3 +8,4 @@ | 269 @@ -8,3 +8,4 @@ 7 |
270 8 | 270 8 |
271 9 | 271 9 |
272 10 | 272 10 |
273 +11 | 273 +11 |
274 record this change to 'plain'? [Ynesfdaq?] | 274 record this change to 'plain'? [Ynesfdaq?] |