我已经下
[attr]POFILE merge=merge-po-files
locale/*.po POFILE
在.gitattributes ，我想获得的分支合并时相同的本地化文件（例如，才能正常工作locale/en.po ）已在并联机器人的分支被修改。 我目前使用以下合并驱动程序：
#!/bin/bash
# git merge driver for .PO files (gettext localizations)
# Install:
# git config merge.merge-po-files.driver "./bin/merge-po-files %A %O %B"
LOCAL="${1}._LOCAL_"
BASE="${2}._BASE_"
REMOTE="${3}._REMOTE_"
# rename to bit more meaningful filenames to get better conflict results
cp "${1}" "$LOCAL"
cp "${2}" "$BASE"
cp "${3}" "$REMOTE"
# merge files and overwrite local file with the result
msgcat "$LOCAL" "$BASE" "$REMOTE" -o "${1}" || exit 1
# cleanup
rm -f "$LOCAL" "$BASE" "$REMOTE"
# check if merge has conflicts
fgrep -q '#-#-#-#-#' "${1}" && exit 1
# if we get here, merge is successful
exit 0
然而， msgcat是太愚蠢， 这是不是一个真正的三路合并 。 举例来说，如果我有
基本版本
msgid "foo" msgstr "foo"
本地版本
msgid "foo" msgstr "bar"
远程版本
msgid "foo" msgstr "foo"
我会冲突而告终。 然而 ， 真正的三路合并驱动器将输出正确的合并 ：
msgid "foo"
msgstr "bar"
请注意，我不能简单地添加--use-first到msgcat因为远程可能包含更新的翻译。 此外，如果BASE本地和远程都是独一无二的，我还是想有冲突，因为这真的会发生冲突。
我需要做什么改变，使这项工作？ 奖励积分少疯狂冲突标志不是 '＃ - ＃ - ＃ - ＃ - ＃'，如果可能的话。
以一些灵感来自米克的答案，我们增加了一个完全成熟的3路合并到git-whistles红宝石的宝石。
它不依赖的git-merge或改写串用Perl，只有操纵与Gettext的工具PO文件。
下面的代码（MIT许可）：
#!/bin/sh
#
# Three-way merge driver for PO files
#
set -e
# failure handler
on_error() {
local parent_lineno="$1"
local message="$2"
local code="${3:-1}"
if [[ -n "$message" ]] ; then
echo "Error on or near line ${parent_lineno}: ${message}; exiting with status ${code}"
else
echo "Error on or near line ${parent_lineno}; exiting with status ${code}"
fi
exit 255
}
trap 'on_error ${LINENO}' ERR
# given a file, find the path that matches its contents
show_file() {
hash=`git hash-object "${1}"`
git ls-tree -r HEAD | fgrep "$hash" | cut -b54-
}
# wraps msgmerge with default options
function m_msgmerge() {
msgmerge --force-po --quiet --no-fuzzy-matching $@
}
# wraps msgcat with default options
function m_msgcat() {
msgcat --force-po $@
}
# removes the "graveyard strings" from the input
function strip_graveyard() {
sed -e '/^#~/d'
}
# select messages with a conflict marker
# pass -v to inverse selection
function grep_conflicts() {
msggrep $@ --msgstr -F -e '#-#-#' -
}
# select messages from $1 that are also in $2 but whose contents have changed
function extract_changes() {
msgcat -o - $1 $2 \
| grep_conflicts \
| m_msgmerge -o - $1 - \
| strip_graveyard
}
BASE=$1
LOCAL=$2
REMOTE=$3
OUTPUT=$LOCAL
TEMP=`mktemp /tmp/merge-po.XXXX`
echo "Using custom PO merge driver (`show_file ${LOCAL}`; $TEMP)"
# Extract the PO header from the current branch (top of file until first empty line)
sed -e '/^$/q' < $LOCAL > ${TEMP}.header
# clean input files
msguniq --force-po -o ${TEMP}.base --unique ${BASE}
msguniq --force-po -o ${TEMP}.local --unique ${LOCAL}
msguniq --force-po -o ${TEMP}.remote --unique ${REMOTE}
# messages changed on local
extract_changes ${TEMP}.local ${TEMP}.base > ${TEMP}.local-changes
# messages changed on remote
extract_changes ${TEMP}.remote ${TEMP}.base > ${TEMP}.remote-changes
# unchanged messages
m_msgcat -o - ${TEMP}.base ${TEMP}.local ${TEMP}.remote \
| grep_conflicts -v \
> ${TEMP}.unchanged
# messages changed on both local and remote (conflicts)
m_msgcat -o - ${TEMP}.remote-changes ${TEMP}.local-changes \
| grep_conflicts \
> ${TEMP}.conflicts
# messages changed on local, not on remote; and vice-versa
m_msgcat -o ${TEMP}.local-only --unique ${TEMP}.local-changes ${TEMP}.conflicts
m_msgcat -o ${TEMP}.remote-only --unique ${TEMP}.remote-changes ${TEMP}.conflicts
# the big merge
m_msgcat -o ${TEMP}.merge1 ${TEMP}.unchanged ${TEMP}.conflicts ${TEMP}.local-only ${TEMP}.remote-only
# create a template to filter messages actually needed (those on local and remote)
m_msgcat -o - ${TEMP}.local ${TEMP}.remote \
| m_msgmerge -o ${TEMP}.merge2 ${TEMP}.merge1 -
# final merge, adds saved header
m_msgcat -o ${TEMP}.merge3 --use-first ${TEMP}.header ${TEMP}.merge2
# produce output file (overwrites input LOCAL file)
cat ${TEMP}.merge3 > $OUTPUT
# check for conflicts
if grep '#-#' $OUTPUT > /dev/null ; then
echo "Conflict(s) detected"
echo " between ${TEMP}.local and ${TEMP}.remote"
exit 1
fi
rm -f ${TEMP}*
exit 0
下面是似乎可能含有应该由本地或远程版本删除了一些翻译输出正确的合并有点复杂的例子驱动程序。
没有什么应该被错过了那么此驱动程序只是增加了在某些情况下一些额外的混乱。
此版本使用gettext原生冲突的标记，看起来像#-#-#-#-#联合fuzzy的标志，而不是普通的Git冲突标记。
司机是个有点丑要解决的错误（或功能 ） msgcat和msguniq ：
#!/bin/bash
# git merge driver for .PO files
# Copyright (c) Mikko Rantalainen <mikko.rantalainen@peda.net>, 2013
# License: MIT
ORIG_HASH=$(git hash-object "${1}")
WORKFILE=$(git ls-tree -r HEAD | fgrep "$ORIG_HASH" | cut -b54-)
echo "Using custom merge driver for $WORKFILE..."
LOCAL="${1}._LOCAL_"
BASE="${2}._BASE_"
REMOTE="${3}._REMOTE_"
LOCAL_ONELINE="$LOCAL""ONELINE_"
BASE_ONELINE="$BASE""ONELINE_"
REMOTE_ONELINE="$REMOTE""ONELINE_"
OUTPUT="$LOCAL""OUTPUT_"
MERGED="$LOCAL""MERGED_"
MERGED2="$LOCAL""MERGED2_"
TEMPLATE1="$LOCAL""TEMPLATE1_"
TEMPLATE2="$LOCAL""TEMPLATE2_"
FALLBACK_OBSOLETE="$LOCAL""FALLBACK_OBSOLETE_"
# standardize the input files for regexping
# default to UTF-8 in case charset is still the placeholder "CHARSET"
cat "${1}" | perl -npe 's!(^"Content-Type: text/plain; charset=)(CHARSET)(\\n"$)!$1UTF-8$3!' | msgcat --no-wrap --sort-output - > "$LOCAL"
cat "${2}" | perl -npe 's!(^"Content-Type: text/plain; charset=)(CHARSET)(\\n"$)!$1UTF-8$3!' | msgcat --no-wrap --sort-output - > "$BASE"
cat "${3}" | perl -npe 's!(^"Content-Type: text/plain; charset=)(CHARSET)(\\n"$)!$1UTF-8$3!' | msgcat --no-wrap --sort-output - > "$REMOTE"
# convert each definition to single line presentation
# extra fill is required to make sure that git separates each conflict
perl -npe 'BEGIN {$/ = "\n\n"}; s/#\n$/\n/s; s/#/##/sg; s/\n/#n/sg; s/#n$/\n/sg; s/#n$/\n/sg; $_.="#fill#\n" x 4' "$LOCAL" > "$LOCAL_ONELINE"
perl -npe 'BEGIN {$/ = "\n\n"}; s/#\n$/\n/s; s/#/##/sg; s/\n/#n/sg; s/#n$/\n/sg; s/#n$/\n/sg; $_.="#fill#\n" x 4' "$BASE" > "$BASE_ONELINE"
perl -npe 'BEGIN {$/ = "\n\n"}; s/#\n$/\n/s; s/#/##/sg; s/\n/#n/sg; s/#n$/\n/sg; s/#n$/\n/sg; $_.="#fill#\n" x 4' "$REMOTE" > "$REMOTE_ONELINE"
# merge files using normal git merge machinery
git merge-file -p --union -L "Current (working directory)" -L "Base (common ancestor)" -L "Incoming (applied changeset)" "$LOCAL_ONELINE" "$BASE_ONELINE" "$REMOTE_ONELINE" > "$MERGED"
MERGESTATUS=$?
# remove possibly duplicated headers (workaround msguniq bug http://comments.gmane.org/gmane.comp.gnu.gettext.bugs/96)
cat "$MERGED" | perl -npe 'BEGIN {$/ = "\n\n"}; s/^([^\n]+#nmsgid ""#nmsgstr ""#n.*?\n)([^\n]+#nmsgid ""#nmsgstr ""#n.*?\n)+/$1/gs' > "$MERGED2"
# remove lines that have totally empty msgstr
# and convert back to normal PO file representation
cat "$MERGED2" | grep -v '#nmsgstr ""$' | grep -v '^#fill#$' | perl -npe 's/#n/\n/g; s/##/#/g' > "$MERGED"
# run the output through msguniq to merge conflicts gettext style
# msguniq seems to have a bug that causes empty output if zero msgids
# are found after the header. Expected output would be the header...
# Workaround the bug by adding an empty obsolete fallback msgid
# that will be automatically removed by msguniq
cat > "$FALLBACK_OBSOLETE" << 'EOF'
#~ msgid "obsolete fallback"
#~ msgstr ""
EOF
cat "$MERGED" "$FALLBACK_OBSOLETE" | msguniq --no-wrap --sort-output > "$MERGED2"
# create a hacked template from default merge between 3 versions
# we do this to try to preserve original file ordering
msgcat --use-first "$LOCAL" "$REMOTE" "$BASE" > "$TEMPLATE1"
msghack --empty "$TEMPLATE1" > "$TEMPLATE2"
msgmerge --silent --no-wrap --no-fuzzy-matching "$MERGED2" "$TEMPLATE2" > "$OUTPUT"
# show some results to stdout
if grep -q '#-#-#-#-#' "$OUTPUT"
then
FUZZY=$(cat "$OUTPUT" | msgattrib --only-fuzzy --no-obsolete --color | perl -npe 'BEGIN{ undef $/; }; s/^.*?msgid "".*?\n\n//s')
if test -n "$FUZZY"
then
echo "-------------------------------"
echo "Fuzzy translations after merge:"
echo "-------------------------------"
echo "$FUZZY"
echo "-------------------------------"
fi
fi
# git merge driver must overwrite the first parameter with output
mv "$OUTPUT" "${1}"
# cleanup
rm -f "$LOCAL" "$BASE" "$REMOTE" "$LOCAL_ONELINE" "$BASE_ONELINE" "$REMOTE_ONELINE" "$MERGED" "$MERGED2" "$TEMPLATE1" "$TEMPLATE2" "$FALLBACK_OBSOLETE"
# return conflict if merge has conflicts according to msgcat/msguniq
grep -q '#-#-#-#-#' "${1}" && exit 1
# otherwise, return git merge status
exit $MERGESTATUS
# Steps to install this driver:
# (1) Edit ".git/config" in your repository directory
# (2) Add following section:
#
# [merge "merge-po-files"]
# name = merge po-files driver
# driver = ./bin/merge-po-files %A %O %B
# recursive = binary
#
# or
#
# git config merge.merge-po-files.driver "./bin/merge-po-files %A %O %B"
#
# The file ".gitattributes" will point git to use this merge driver.
有关此驱动程序简短说明：
- 它把常规PO文件格式，以单行格式，其中每一行是一个转换条目。
- 然后，它使用普通
git merge-file --union做合并，并在合并后所产生的单行格式转换回常规PO文件格式。
实际的冲突解决这个使用后进行msguniq ， - 然后最后合并与定期生成的模板生成的文件
msgcat结合原始输入要恢复的文件可能丢失的元数据。
警告：此驱动程序将使用msgcat --no-wrap上.PO文件，将迫使UTF-8编码，如果没有指定实际的编码。
如果您想使用此合并的驱动程序，但总是检查结果，改变最终exit $MERGESTATUS看起来像exit 1 。
获得合并来自该驱动程序冲突之后，在解决冲突的最好方法是打开冲突的文件， virtaal并选择Navigation: Incomplete 。
我觉得此UI用于固定冲突一个相当不错的工具。
这里有一个例子驱动程序，它确实在正确的位置冲突标记正确的基于文本的差异。 然而，在发生冲突的情况下， git mergetool肯定会乱的结果，所以这是不是真的好。 如果你想解决冲突的只使用文本编辑器合并，那么这应该是罚款：
#!/bin/bash
# git merge driver for .PO files
# Copyright (c) Mikko Rantalainen <mikko.rantalainen@peda.net>, 2013
# License: MIT
LOCAL="${1}._LOCAL_"
BASE="${2}._BASE_"
REMOTE="${3}._REMOTE_"
MERGED="${1}._MERGED_"
OUTPUT="$LOCAL""OUTPUT_"
LOCAL_ONELINE="$LOCAL""ONELINE_"
BASE_ONELINE="$BASE""ONELINE_"
REMOTE_ONELINE="$REMOTE""ONELINE_"
# standardize the input files for regexping
msgcat --no-wrap --strict --sort-output "${1}" > "$LOCAL"
msgcat --no-wrap --strict --sort-output "${2}" > "$BASE"
msgcat --no-wrap --strict --sort-output "${3}" > "$REMOTE"
# convert each definition to single line presentation
# extra fill is required to make sure that git separates each conflict
perl -npe 'BEGIN {$/ = "#\n"}; s/#\n$/\n/s; s/#/##/sg; s/\n/#n/sg; s/#n$/\n/sg; s/#n$/\n/sg; $_.="#fill#\n" x 4' "$LOCAL" > "$LOCAL_ONELINE"
perl -npe 'BEGIN {$/ = "#\n"}; s/#\n$/\n/s; s/#/##/sg; s/\n/#n/sg; s/#n$/\n/sg; s/#n$/\n/sg; $_.="#fill#\n" x 4' "$BASE" > "$BASE_ONELINE"
perl -npe 'BEGIN {$/ = "#\n"}; s/#\n$/\n/s; s/#/##/sg; s/\n/#n/sg; s/#n$/\n/sg; s/#n$/\n/sg; $_.="#fill#\n" x 4' "$REMOTE" > "$REMOTE_ONELINE"
# merge files using normal git merge machinery
git merge-file -p -L "Current (working directory)" -L "Base (common ancestor)" -L "Incoming (another change)" "$LOCAL_ONELINE" "$BASE_ONELINE" "$REMOTE_ONELINE" > "$MERGED"
MERGESTATUS=$?
# convert back to normal PO file representation
cat "$MERGED" | grep -v '^#fill#$' | perl -npe 's/#n/\n/g; s/##/#/g' > "$OUTPUT"
# git merge driver must overwrite the first parameter with output
mv "$OUTPUT" "${1}"
# cleanup
rm -f "$LOCAL" "$BASE" "$REMOTE" "$LOCAL_ONELINE" "$BASE_ONELINE" "$REMOTE_ONELINE" "$MERGED"
exit $MERGESTATUS
# Steps to install this driver:
# (1) Edit ".git/config" in your repository directory
# (2) Add following section:
#
# [merge "merge-po-files"]
# name = merge po-files driver
# driver = ./bin/merge-po-files %A %O %B
# recursive = binary
#
# or
#
# git config merge.merge-po-files.driver "./bin/merge-po-files %A %O %B"
#
# The file ".gitattributes" will point git to use this merge driver.
有关此驱动程序简短解释：它转换规则PO文件格式，以单行格式，其中每一行是一个转换条目。 然后，它使用普通git merge-file做合并，并在合并后所产生的单行格式转换回常规PO文件格式。 警告：此驱动程序将使用msgcat --sort-output的.po文件，所以如果你想在一些特定的顺序您的PO文件，这可能不是你的工具。
