mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
Before commitfc0fd5b23b
(Makefile: help gettext tools to cope with our custom PRItime format, 2017-07-20), we'd consider source files as-is with gettext, but because we need to understand PRItime in the same way that gettext itself understands PRIuMAX, we'd first check if we had a clean checkout, then munge all of the processed files in-place with "sed", generate "po/git.pot", and then finally "reset --hard" to undo our changes. By generating "pot" snippets in ".build/pot/po" for each source file and rewriting certain source files with PRItime macros to temporary files in ".build/pot/po", we can avoid running "make pot" by altering files in place and doing a "reset --hard" afterwards. This speed of "make pot" is slower than before on an initial run, because we run "xgettext" many times (once per source file), but it can be boosted by parallelization. It is *much* faster for incremental runs, and will allow us to implement related targets in subsequent commits. When the "pot" target was originally added incd5513a716
(i18n: Makefile: "pot" target to extract messages marked for translation, 2011-02-22) it behaved like a "normal" target. I.e. we'd skip the re-generation of the po/git.pot if nothing had to be done. Then after po/git.pot was checked in indce37b66fb
(l10n: initial git.pot for 1.7.10 upcoming release, 2012-02-13) the target was broken until1f31963e92
(i18n: treat "make pot" as an explicitly-invoked target, 2014-08-22) when it was made to depend on "FORCE". I.e. the Makefile's dependency resolution inherently can't handle incremental building when the target file may be updated by git (or something else external to "make"). But this case no longer applies, so FORCE is no longer needed. That out of the way, the main logic change here is getting rid of the "reset --hard": We'll generate intermediate ".build/pot/po/%.po" files from "%", which is handy to see at a glance what strings (if any) in a given file are marked for translation: $ make .build/pot/po/pretty.c.po [...] $ cat .build/pot/po/pretty.c.po #: pretty.c:1051 msgid "unable to parse --pretty format" msgstr "" $ For these C source files which contain the PRItime macros, we will create temporary munged "*.c" files in a tree in ".build/pot/po" corresponding to our source tree, and have "xgettext" consider those. The rule needs to be careful to "(cd .build/pot/po && ...)", because otherwise the comments in the po/git.pot file wouldn't refer to the correct source locations (they'd be prefixed with ".build/pot/po"). These temporary munged "*.c” files will be removed immediately after the corresponding po files are generated, because some development tools cannot ignore the duplicate source files in the ".build" directory according to the ".gitignore" file, and that may cause trouble. The output of the generated po/git.pot file is changed in one minor way: Because we're using msgcat(1) instead of xgettext(1) to concatenate the output we'll now disambiguate where "TRANSLATORS" comments come from, in cases where a message is the same in N files, and either only one has a "TRANSLATORS" comment, or they're different. E.g. for the "Your edited hunk[...]" message we'll now apply this change (comment content elided): +#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] [...] +#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] [...] #: add-patch.c:1253 git-add--interactive.perl:1244 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" There are six such changes, and they all make the context more understandable, as msgcat(1) is better at handling these edge cases than xgettext(1)'s previously used "--join-existing" flag. But filenames in the above disambiguation lines of extracted-comments have an extra ".po" extension compared to the filenames at the file locations. While we could rename the intermediate ".build/pot/po/%.po" files without the ".po" extension to use more intuitive filenames in the disambiguation lines of extracted-comments, but that will confuse developer tools with lots of invalid C or other source files in ".build/pot/po" directory. The addition of "--omit-header" option for xgettext makes the "pot" snippets in ".build/pot/po/*.po" smaller. But as we'll see in a subsequent commit this header behavior has been hiding an encoding-related bug from us, so let's carry it forward instead of re-generating it with xgettext(1). The "po/git.pot" file should have a header entry, because a proper header entry will increase the speed of creating a new po file using msginit and set a proper "POT-Creation-Date:" field in the header entry of a "po/XX.po" file. We use xgettext to generate a separate header file at ".build/pot/git.header" from "/dev/null", and use this header to assemble "po/git.pot". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
249 lines
3.5 KiB
Plaintext
249 lines
3.5 KiB
Plaintext
/fuzz-commit-graph
|
|
/fuzz_corpora
|
|
/fuzz-pack-headers
|
|
/fuzz-pack-idx
|
|
/GIT-BUILD-OPTIONS
|
|
/GIT-CFLAGS
|
|
/GIT-LDFLAGS
|
|
/GIT-PREFIX
|
|
/GIT-PERL-DEFINES
|
|
/GIT-PERL-HEADER
|
|
/GIT-PYTHON-VARS
|
|
/GIT-SCRIPT-DEFINES
|
|
/GIT-USER-AGENT
|
|
/GIT-VERSION-FILE
|
|
/bin-wrappers/
|
|
/git
|
|
/git-add
|
|
/git-add--interactive
|
|
/git-am
|
|
/git-annotate
|
|
/git-apply
|
|
/git-archimport
|
|
/git-archive
|
|
/git-bisect
|
|
/git-bisect--helper
|
|
/git-blame
|
|
/git-branch
|
|
/git-bugreport
|
|
/git-bundle
|
|
/git-cat-file
|
|
/git-check-attr
|
|
/git-check-ignore
|
|
/git-check-mailmap
|
|
/git-check-ref-format
|
|
/git-checkout
|
|
/git-checkout--worker
|
|
/git-checkout-index
|
|
/git-cherry
|
|
/git-cherry-pick
|
|
/git-clean
|
|
/git-clone
|
|
/git-column
|
|
/git-commit
|
|
/git-commit-graph
|
|
/git-commit-tree
|
|
/git-config
|
|
/git-count-objects
|
|
/git-credential
|
|
/git-credential-cache
|
|
/git-credential-cache--daemon
|
|
/git-credential-store
|
|
/git-cvsexportcommit
|
|
/git-cvsimport
|
|
/git-cvsserver
|
|
/git-daemon
|
|
/git-diff
|
|
/git-diff-files
|
|
/git-diff-index
|
|
/git-diff-tree
|
|
/git-difftool
|
|
/git-difftool--helper
|
|
/git-describe
|
|
/git-env--helper
|
|
/git-fast-export
|
|
/git-fast-import
|
|
/git-fetch
|
|
/git-fetch-pack
|
|
/git-filter-branch
|
|
/git-fmt-merge-msg
|
|
/git-for-each-ref
|
|
/git-for-each-repo
|
|
/git-format-patch
|
|
/git-fsck
|
|
/git-fsck-objects
|
|
/git-fsmonitor--daemon
|
|
/git-gc
|
|
/git-get-tar-commit-id
|
|
/git-grep
|
|
/git-hash-object
|
|
/git-help
|
|
/git-hook
|
|
/git-http-backend
|
|
/git-http-fetch
|
|
/git-http-push
|
|
/git-imap-send
|
|
/git-index-pack
|
|
/git-init
|
|
/git-init-db
|
|
/git-interpret-trailers
|
|
/git-instaweb
|
|
/git-log
|
|
/git-ls-files
|
|
/git-ls-remote
|
|
/git-ls-tree
|
|
/git-mailinfo
|
|
/git-mailsplit
|
|
/git-maintenance
|
|
/git-merge
|
|
/git-merge-base
|
|
/git-merge-index
|
|
/git-merge-file
|
|
/git-merge-tree
|
|
/git-merge-octopus
|
|
/git-merge-one-file
|
|
/git-merge-ours
|
|
/git-merge-recursive
|
|
/git-merge-resolve
|
|
/git-merge-subtree
|
|
/git-mergetool
|
|
/git-mergetool--lib
|
|
/git-mktag
|
|
/git-mktree
|
|
/git-multi-pack-index
|
|
/git-mv
|
|
/git-name-rev
|
|
/git-notes
|
|
/git-p4
|
|
/git-pack-redundant
|
|
/git-pack-objects
|
|
/git-pack-refs
|
|
/git-patch-id
|
|
/git-prune
|
|
/git-prune-packed
|
|
/git-pull
|
|
/git-push
|
|
/git-quiltimport
|
|
/git-range-diff
|
|
/git-read-tree
|
|
/git-rebase
|
|
/git-receive-pack
|
|
/git-reflog
|
|
/git-remote
|
|
/git-remote-http
|
|
/git-remote-https
|
|
/git-remote-ftp
|
|
/git-remote-ftps
|
|
/git-remote-fd
|
|
/git-remote-ext
|
|
/git-repack
|
|
/git-replace
|
|
/git-request-pull
|
|
/git-rerere
|
|
/git-reset
|
|
/git-restore
|
|
/git-rev-list
|
|
/git-rev-parse
|
|
/git-revert
|
|
/git-rm
|
|
/git-send-email
|
|
/git-send-pack
|
|
/git-sh-i18n
|
|
/git-sh-i18n--envsubst
|
|
/git-sh-setup
|
|
/git-shell
|
|
/git-shortlog
|
|
/git-show
|
|
/git-show-branch
|
|
/git-show-index
|
|
/git-show-ref
|
|
/git-sparse-checkout
|
|
/git-stage
|
|
/git-stash
|
|
/git-status
|
|
/git-stripspace
|
|
/git-submodule
|
|
/git-submodule--helper
|
|
/git-subtree
|
|
/git-svn
|
|
/git-switch
|
|
/git-symbolic-ref
|
|
/git-tag
|
|
/git-unpack-file
|
|
/git-unpack-objects
|
|
/git-update-index
|
|
/git-update-ref
|
|
/git-update-server-info
|
|
/git-upload-archive
|
|
/git-upload-pack
|
|
/git-var
|
|
/git-verify-commit
|
|
/git-verify-pack
|
|
/git-verify-tag
|
|
/git-web--browse
|
|
/git-whatchanged
|
|
/git-worktree
|
|
/git-write-tree
|
|
/git-core-*/?*
|
|
/gitweb/GITWEB-BUILD-OPTIONS
|
|
/gitweb/gitweb.cgi
|
|
/gitweb/static/gitweb.js
|
|
/gitweb/static/gitweb.min.*
|
|
/config-list.h
|
|
/command-list.h
|
|
/hook-list.h
|
|
*.tar.gz
|
|
*.dsc
|
|
*.deb
|
|
/git.spec
|
|
*.exe
|
|
*.[aos]
|
|
*.o.json
|
|
*.py[co]
|
|
.build/
|
|
.depend/
|
|
*.gcda
|
|
*.gcno
|
|
*.gcov
|
|
/coverage-untested-functions
|
|
/cover_db/
|
|
/cover_db_html/
|
|
*+
|
|
/config.mak
|
|
/autom4te.cache
|
|
/config.cache
|
|
/config.log
|
|
/config.status
|
|
/config.mak.autogen
|
|
/config.mak.append
|
|
/configure
|
|
/.vscode/
|
|
/tags
|
|
/TAGS
|
|
/cscope*
|
|
/compile_commands.json
|
|
*.hcc
|
|
*.obj
|
|
*.lib
|
|
*.res
|
|
*.sln
|
|
*.sp
|
|
*.suo
|
|
*.ncb
|
|
*.vcproj
|
|
*.user
|
|
*.idb
|
|
*.pdb
|
|
*.ilk
|
|
*.iobj
|
|
*.ipdb
|
|
*.dll
|
|
.vs/
|
|
Debug/
|
|
Release/
|
|
/UpgradeLog*.htm
|
|
/git.VC.VC.opendb
|
|
/git.VC.db
|
|
*.dSYM
|
|
/contrib/buildsystems/out
|