Files @ d6d3cb5991e2
Branch filter:

Location: kallithea/scripts/i18n

mads
tests: stabilize Git committer in test_vcs_operations

Git tries to find out name and email in this order:

1. The author can be set e.g. via the `--author` option of `git commit`.
2. If set, the environment variables GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL,
GIT_COMMITTER_NAME and GIT_COMMITTER_EMAIL are taken.
3. If set, various (global) config files are considered.
4. Unless disabled by the user.useconfigonly config, the names and emails are
inferred from various system sources such as various fields from /etc/passwd,
/etc/mailname and the environment variable EMAIL.

The author can be provided on the command line (1), but that is not possible
for the committer.

It is not an option to modify Git’s configuration files, so the result of (3)
depends on the system the tests run on, which should be avoided. A follow-up
patch will try to instruct Git to not read the system Git configuration files.

(4) is also system-dependent. On some systems, (4) is disabled in the Git
configuration. If enabled, Git will try to infer the committer name from the
gecko field in /etc/passwd, but will fail if it is empty. The previous code
passed the environment variable EMAIL to provide the corresponding email
address.

By passing the names and emails via (2), we can set the author and committer
name and email uniformly and prevent Git from using the system-dependent ways
(3) and (4). This will replace the use of of EMAIL. The environment variables
were introduced in 2005, so there should be no backwards compatibility
problems.

The tests will specify --author explicitly in the cases where the actual name
matters. We just need default values that can be used for committing when we
don't care.

We set it as static defaults to:
Author: test_regular <test_regular@example.com>
Commit: test_admin <test_admin@example.com>

Based on changes and research by Manuel Jacob <me@manueljacob.de>.
#!/usr/bin/env python3

# -*- coding: utf-8 -*-
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program.  If not, see <http://www.gnu.org/licenses/>.

import os
import shutil
import sys

import click
import i18n_utils


"""
Tool for maintenance of .po and .pot files

Normally, the i18n-related files contain for each translatable string a
reference to all the source code locations where this string is found. This
meta data is useful for translators to assess how strings are used, but is not
relevant for normal development nor for running Kallithea. Such meta data, or
derived data like kallithea.pot, will inherently be outdated, and create
unnecessary churn and repository growth, making it harder to spot actual and
important changes.
"""

@click.group()
@click.option('--debug/--no-debug', default=False)
def cli(debug):
    if (debug):
        i18n_utils.do_debug = True
    pass

@cli.command()
@click.argument('po_files', nargs=-1)
@click.option('--merge-pot-file', default=None)
@click.option('--strip/--no-strip', default=False)
def normalize_po_files(po_files, merge_pot_file, strip):
    """Normalize the specified .po and .pot files.

    By default, only actual translations and essential headers will be
    preserved, just as we want it in the main branches with minimal noise.

    If a .pot file is specified, the po files will instead be updated by
    running GNU msgmerge with this .pot file, thus updating source code
    references and preserving comments and outdated translations.
    """
    for po_file in po_files:
        i18n_utils._normalize_po_file(po_file, merge_pot_file=merge_pot_file, strip=strip)

@cli.command()
@click.argument('local')
@click.argument('base')
@click.argument('other')
@click.argument('output')
@click.option('--merge-pot-file', default=None)
@click.option('--strip/--no-strip', default=False)
def normalized_merge(local, base, other, output, merge_pot_file, strip):
    """Merge tool for use with 'hg merge/rebase/graft --tool'

    i18n files are partially manually editored original source of content, and
    partially automatically generated and updated. That create a lot of churn
    and often cause a lot of merge conflicts.

    To avoid that, this merge tool wrapper will normalize .po content before
    running the merge tool.

    By default, only actual translations and essential headers will be
    preserved, just as we want it in the main branches with minimal noise.

    If a .pot file is specified, the po files will instead be updated by
    running GNU msgmerge with this .pot file, thus updating source code
    references and preserving comments and outdated translations.

    Add the following to your user or repository-specific .hgrc file to use it:
        [merge-tools]
        i18n.executable = /path/to/scripts/i18n
        i18n.args = normalized-merge $local $base $other $output

    and then invoke merge/rebase/graft with the additional argument '--tool i18n'.
    """
    from mercurial import context, simplemerge
    from mercurial import ui as uimod

    print('i18n normalized-merge: normalizing and merging %s' % output)

    i18n_utils._normalize_po_file(local, merge_pot_file=merge_pot_file, strip=strip)
    i18n_utils._normalize_po_file(base, merge_pot_file=merge_pot_file, strip=strip)
    i18n_utils._normalize_po_file(other, merge_pot_file=merge_pot_file, strip=strip)
    i18n_utils._normalize_po_file(output, merge_pot_file=merge_pot_file, strip=strip)

    # simplemerge will write markers to 'local' if it fails, keep a copy without markers
    localkeep = local + '.keep'
    shutil.copyfile(local, localkeep)

    ret = simplemerge.simplemerge(uimod.ui.load(),
         context.arbitraryfilectx(local.encode('utf-8')),
         context.arbitraryfilectx(base.encode('utf-8')),
         context.arbitraryfilectx(other.encode('utf-8')),
         label=[b'local', b'other', b'base'],
         mode='merge',
    )
    shutil.copyfile(local, output)  # simplemerge wrote to local - either resolved or with conflict markers
    if ret:
        shutil.copyfile(localkeep, local)
        basekeep = base + '.keep'
        otherkeep = other + '.keep'
        shutil.copyfile(base, basekeep)
        shutil.copyfile(other, otherkeep)
        sys.stderr.write("Error: simple merge failed and %s is left with conflict markers. Resolve the conflicts, then use 'hg resolve -m'.\n" % output)
        sys.stderr.write('Resolve with e.g.: kdiff3 %s %s %s -o %s\n' % (basekeep, localkeep, otherkeep, output))
        sys.exit(ret)

    os.remove(localkeep)

@cli.command()
@click.argument('file1')
@click.argument('file2')
@click.option('--merge-pot-file', default=None)
@click.option('--strip/--no-strip', default=False)
def normalized_diff(file1, file2, merge_pot_file, strip):
    """Compare two files while transparently normalizing them."""
    sys.exit(i18n_utils._normalized_diff(file1, file2, merge_pot_file=merge_pot_file, strip=strip))

if __name__ == '__main__':
    cli()