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

  $ HGENCODING=utf-8

     2

  $ export HGENCODING

     3

     4

  $ try() {

     5

  >   hg debugrevspec --debug $@

     6

  > }

     7

     8

  $ log() {

     9

  >   hg log --template '{rev}\n' -r "$1"

    10

  > }

    11

    12

  $ hg init repo

    13

  $ cd repo

    14

    15

  $ try 'p1()'

    16

  (func

    17

    ('symbol', 'p1')

    18

    None)

    19

  * set:

    20

  <baseset []>

    21

  $ try 'p2()'

    22

  (func

    23

    ('symbol', 'p2')

    24

    None)

    25

  * set:

    26

  <baseset []>

    27

  $ try 'parents()'

    28

  (func

    29

    ('symbol', 'parents')

    30

    None)

    31

  * set:

    32

  <baseset+ []>

    33

    34

null revision

    35

  $ log 'p1()'

    36

  $ log 'p2()'

    37

  $ log 'parents()'

    38

    39

working dir with a single parent

    40

  $ echo a > a

    41

  $ hg ci -Aqm0

    42

  $ log 'p1()'

    43

  0

    44

  $ log 'tag() and p1()'

    45

  $ log 'p2()'

    46

  $ log 'parents()'

    47

  0

    48

  $ log 'tag() and parents()'

    49

    50

merge in progress

    51

  $ echo b > b

    52

  $ hg ci -Aqm1

    53

  $ hg up -q 0

    54

  $ echo c > c

    55

  $ hg ci -Aqm2

    56

  $ hg merge -q

    57

  $ log 'p1()'

    58

  2

    59

  $ log 'p2()'

    60

  1

    61

  $ log 'tag() and p2()'

    62

  $ log 'parents()'

    63

  1

    64

  2

    65

    66

  $ cd ..