i18n: look translation of both "DEPRECATED" and "(DEPRECATED)" up Since 44cc9f63a2f1, deprecated commands, options and so on are detected by "(DEPRECATED)" instead of "DEPRECATED". "hg.pot" generated from recent source files doesn't contain msgid "DEPRECATED", and looking the translation of "DEPRECATED" up in up-to-date *.po files works incorrectly. But on the other hand, there are still old *.po files, which contain msgid "DEPRECATED" but not "(DEPRECATED)". Looking the translation of "(DEPRECATED)" up in such old *.po files also works incorrectly. This patch resolves this problem by looking translation of both "DEPRECATED" and "(DEPRECATED)" up. This should work correctly, because previous patch makes "deprecated" checker be applied only on translations, of which msgid contains exact "(DEPRECATED)" string. 'p.msgstr' examination in 'deprecatedsetup()' is needed to ignore untranslated entries. This also makes 'deprecatedpe.msgstr' examination in 'deprecated()' meaningless.

     1

#require serve

     2

     3

  $ cat <<EOF >> $HGRCPATH

     4

  > [extensions]

     5

  > schemes=

     6

  > 

     7

  > [schemes]

     8

  > l = http://localhost:$HGPORT/

     9

  > parts = http://{1}:$HGPORT/

    10

  > z = file:\$PWD/

    11

  > EOF

    12

  $ hg init test

    13

  $ cd test

    14

  $ echo a > a

    15

  $ hg ci -Am initial

    16

  adding a

    17

    18

invalid scheme

    19

    20

  $ hg log -R z:z

    21

  abort: no '://' in scheme url 'z:z'

    22

  [255]

    23

    24

http scheme

    25

    26

  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log

    27

  $ cat hg.pid >> $DAEMON_PIDS

    28

  $ hg incoming l://

    29

  comparing with l://

    30

  searching for changes

    31

  no changes found

    32

  [1]

    33

    34

check that {1} syntax works

    35

    36

  $ hg incoming --debug parts://localhost

    37

  using http://localhost:$HGPORT/

    38

  sending capabilities command

    39

  comparing with parts://localhost/

    40

  query 1; heads

    41

  sending batch command

    42

  searching for changes

    43

  all remote heads known locally

    44

  no changes found

    45

  [1]

    46

    47

check that paths are expanded

    48

    49

  $ PWD=`pwd` hg incoming z://

    50

  comparing with z://

    51

  searching for changes

    52

  no changes found

    53

  [1]

    54

    55

errors

    56

    57

  $ cat errors.log

    58

    59

  $ cd ..