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

  $ hg init a

     2

  $ cd a

     3

     4

  $ hg diff inexistent1 inexistent2

     5

  inexistent1: * (glob)

     6

  inexistent2: * (glob)

     7

     8

  $ echo bar > foo

     9

  $ hg add foo

    10

  $ hg ci -m 'add foo'

    11

    12

  $ echo foobar > foo

    13

  $ hg ci -m 'change foo'

    14

    15

  $ hg --quiet diff -r 0 -r 1

    16

  --- a/foo	Thu Jan 01 00:00:00 1970 +0000

    17

  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

    18

  @@ -1,1 +1,1 @@

    19

  -bar

    20

  +foobar

    21

    22

  $ hg diff -r 0 -r 1

    23

  diff -r a99fb63adac3 -r 9b8568d3af2f foo

    24

  --- a/foo	Thu Jan 01 00:00:00 1970 +0000

    25

  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

    26

  @@ -1,1 +1,1 @@

    27

  -bar

    28

  +foobar

    29

    30

  $ hg --verbose diff -r 0 -r 1

    31

  diff -r a99fb63adac3 -r 9b8568d3af2f foo

    32

  --- a/foo	Thu Jan 01 00:00:00 1970 +0000

    33

  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

    34

  @@ -1,1 +1,1 @@

    35

  -bar

    36

  +foobar

    37

    38

  $ hg --debug diff -r 0 -r 1

    39

  diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo

    40

  --- a/foo	Thu Jan 01 00:00:00 1970 +0000

    41

  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000

    42

  @@ -1,1 +1,1 @@

    43

  -bar

    44

  +foobar

    45

    46

  $ cd ..