Mercurial > hg

annotate tests/test-mq-qrename @ 9827:4fe9ca519637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 11 Nov 2009 18:31:42 +0100
parents 05a682c8907d
children 0c944b7af564
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3083
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
1 #!/bin/sh
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
2
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
3 echo "[extensions]" >> $HGRCPATH
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
4 echo "mq=" >> $HGRCPATH
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
5
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
6 hg init a
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
7 cd a
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
8
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
9 echo 'base' > base
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
10 hg ci -Ambase -d '1 0'
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
11
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
12 hg qnew -mmqbase mqbase
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
13 hg qrename mqbase renamed
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
14 mkdir .hg/patches/foo
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
15 hg qrename renamed foo
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
16 hg qseries
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
17 ls .hg/patches/foo
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
18 mkdir .hg/patches/bar
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
19 hg qrename foo/renamed bar
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
20 hg qseries
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
21 ls .hg/patches/bar
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
22 hg qrename bar/renamed baz
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
23 hg qseries
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
24 ls .hg/patches/baz
6649
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
25 cd ..
3083
82c9d1aac308 Make qrename handle directory targets; closes #333.
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
26
6649
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
27 echo % test patch being renamed before committed
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
28 hg init b
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
29 cd b
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
30 hg qinit -c
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
31 hg qnew x
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
32 hg qrename y
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
33 hg qcommit -m rename
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
34 cd ..
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
35
05a682c8907d test-mq-qrename: test added patch renaming
Patrick Mezard <pmezard@gmail.com>
parents: 3083
diff changeset
36