tests/test-convert-datesort
author Ry4an Brase <ry4an-hg@ry4an.org>
Wed, 14 Apr 2010 00:24:47 -0500
branchstable
changeset 10904 26d1d23e5a2b
parent 8692 827d4e807d57
permissions -rwxr-xr-x
Fix --blacklist when --jobs > 1 in run_tests.py. The options parsing logic replaces the options.blacklist initial value, a list of filenames, with a dict of test names to filenames. When runchildren rebuilds the command line to launch child processes the dict is flattened and provided as a malformed argument when a filename is expected. Fix is to remove the blacklist option from child invocations since the filtering is handled in the parent anyway.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6100
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     1
#!/bin/sh
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     2
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     3
cat >> $HGRCPATH <<EOF
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     4
[extensions]
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     5
convert=
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     6
graphlog=
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     7
EOF
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     8
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     9
hg init t
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    10
cd t
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    11
echo a >> a
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    12
hg ci -Am a0 -d '1 0'
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    13
hg branch brancha
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    14
echo a >> a
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    15
hg ci -m a1 -d '2 0'
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    16
echo a >> a
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    17
hg ci -m a2 -d '3 0'
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    18
echo a >> a
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    19
hg ci -m a3 -d '4 0'
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    20
hg up -C 0
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    21
hg branch branchb
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    22
echo b >> b
8690
c5b4f662109f convert: add --sourcesort option for source specific sort
Patrick Mezard <pmezard@gmail.com>
parents: 8523
diff changeset
    23
hg ci -Am b0 -d '6 0'
6100
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    24
hg up -C brancha
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    25
echo a >> a
8690
c5b4f662109f convert: add --sourcesort option for source specific sort
Patrick Mezard <pmezard@gmail.com>
parents: 8523
diff changeset
    26
hg ci -m a4 -d '5 0'
6100
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    27
echo a >> a
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    28
hg ci -m a5 -d '7 0'
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    29
echo a >> a
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    30
hg ci -m a6 -d '8 0'
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    31
hg up -C branchb
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    32
echo b >> b
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    33
hg ci -m b1 -d '9 0'
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    34
cd ..
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    35
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    36
echo % convert with datesort
8690
c5b4f662109f convert: add --sourcesort option for source specific sort
Patrick Mezard <pmezard@gmail.com>
parents: 8523
diff changeset
    37
hg convert --datesort t t-datesort
6100
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    38
echo % graph converted repo
8690
c5b4f662109f convert: add --sourcesort option for source specific sort
Patrick Mezard <pmezard@gmail.com>
parents: 8523
diff changeset
    39
hg -R t-datesort glog --template '{rev} "{desc}"\n'
6100
49c69e1e4aa2 convert: fix --datesort ordering
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    40
8692
827d4e807d57 convert: default revisions order depends on source
Patrick Mezard <pmezard@gmail.com>
parents: 8690
diff changeset
    41
echo '% convert with datesort (default mode)'
827d4e807d57 convert: default revisions order depends on source
Patrick Mezard <pmezard@gmail.com>
parents: 8690
diff changeset
    42
hg convert t t-sourcesort
8690
c5b4f662109f convert: add --sourcesort option for source specific sort
Patrick Mezard <pmezard@gmail.com>
parents: 8523
diff changeset
    43
echo % graph converted repo
c5b4f662109f convert: add --sourcesort option for source specific sort
Patrick Mezard <pmezard@gmail.com>
parents: 8523
diff changeset
    44
hg -R t-sourcesort glog --template '{rev} "{desc}"\n'
c5b4f662109f convert: add --sourcesort option for source specific sort
Patrick Mezard <pmezard@gmail.com>
parents: 8523
diff changeset
    45