@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,

        ui as uimod,

    )

    print('i18n normalized-merge: merging file %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')),

    )

    if ret:

        basekeep = base + '.keep'

        otherkeep = other + '.keep'

        shutil.copyfile(base, basekeep)

        shutil.copyfile(other, otherkeep)

        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()