Marked messages for translation in git-am, git-rebase, and git-merge.
Also fixed affected test cases when turn GETTEXT_POISON switch on.
Jiang Xin (7):
i18n: New keywords for xgettext extraction from sh
i18n: rebase: mark strings for translation
i18n: Rewrite gettext messages start with
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrappers when run
'make pot' to extract messages from shell scripts.
Signed-off-by: Jiang Xin worldhello@gmail.com
Reviewed-by: Stefano Lattarini stefano.lattar...@gmail.com
Gettext message in a shell script should not start with '-', one
workaround is adding '--' between gettext and the message, like:
gettext -- --exec option ...
But due to a bug in the xgettext extraction, xgettext can not
extract the actual message for this case. Rewriting the message
is a
The obsolete LONG_USAGE variable has the following message in it:
A'\''--B'\''--C'\''
And such complex LONG_USAGE message will breaks xgettext when extracting
l10n messages. But if single quotes are removed from the message, xgettext
works fine on 'git-rebase.sh'.
Since there is a modern
Mark additional 3 strings for translation, and reduce one indentation
level for one gettextln clause introduced in commit de88c1c.
Signed-off-by: Jiang Xin worldhello@gmail.com
Reviewed-by: Stefano Lattarini stefano.lattar...@gmail.com
---
git-am.sh | 11 +--
1 file changed, 5
Gettext message should not start with '-' nor '--'. Since the '-d' and
'--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to
remove the block.
Signed-off-by: Jiang Xin worldhello@gmail.com
Reviewed-by: Stefano Lattarini stefano.lattar...@gmail.com
---
git-am.sh | 3 ---
1
Mark strings in merge-recursive for translation.
Some test scripts are affected by this update, and would fail if are
tested with GETTEXT_POISON switch turned on. Use i18n-specific test
functions, such as test_i18ngrep in the related test scripts will fix
these issues.
Signed-off-by: Jiang Xin
Some grammatical nits about the commit message. I hope this doesn't
come across as too picky/annoying ... And you might want to wait for
a native to confirm whether these nits are actually all warranted.
On 07/24/2012 10:00 AM, Jiang Xin wrote:
Run
s/Run/Running/
command 'git rev-parse
On 07/24/2012 08:59 AM, Jiang Xin wrote:
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrappers when run
s/when run/when running/ or s/when we run/.
Sorry for not spotting that in my first review!
'make pot' to extract
On 07/24/2012 08:59 AM, Jiang Xin wrote:
Mark strings in git-rebase.sh for translation.
Some test scripts are affected by this update, and would fail if are
s/if are/if/
tested with GETTEXT_POISON switch turned on. Use i18n-specific test
s/Use/Using/, or s/Use/Use of/
functions, such as
On 07/24/2012 08:59 AM, Jiang Xin wrote:
Mark strings in merge-recursive for translation.
Some test scripts are affected by this update, and would fail if are
tested with GETTEXT_POISON switch turned on. Use i18n-specific test
functions, such as test_i18ngrep in the related test scripts will
worldhello@gmail.com wrote on Tue, 24 Jul 2012 16:00 +0800:
Run command 'git rev-parse --git-dir' under subdir will return realpath
of '.git' directory. Some test scripts compare this realpath against
$TRASH_DIRECTORY, they are not equal if current working directory is
on a symlink.
In
Now that git respects XDG_CONFIG_HOME for some lookups, we
must be sure to cleanse the test environment. Otherwise, the
user's XDG_CONFIG_HOME could influence the test results.
Signed-off-by: Jeff King p...@peff.net
---
[oops, re-sending because I forgot to cc git@vger]
You can test this
If we don't have a core.attributesfile configured, we fall
back to checking XDG config. This is usually
$HOME/.config/attributes. However, if $HOME is unset, then
home_config_paths will return NULL, and we end up calling
fopen(NULL).
Depending on your system, this may or may not cause the
Robin Rosenberg robin.rosenb...@dewire.com writes:
Junio C Hamano skrev 2012-07-22 23.08:
Thomas Rast tr...@student.ethz.ch writes:
What is the status quo? I take it JGit does not have any of ctime, dev,
ino etc., and either leaves the existing value or puts a 0
an argument in favor of
This should override $HOME/.config, but we never actually
tested it.
Signed-off-by: Jeff King p...@peff.net
---
t/t1306-xdg-files.sh | 8
1 file changed, 8 insertions(+)
diff --git a/t/t1306-xdg-files.sh b/t/t1306-xdg-files.sh
index 1569596..4447949 100755
--- a/t/t1306-xdg-files.sh
On Mon, Jul 23, 2012 at 2:44 PM, Florian Achleitner
florian.achleitner.2.6...@gmail.com wrote:
+ sys.exit(ret)
\ No newline at end of file
Nit: add a \n after sys.exit(ret), perhaps?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Thanks (for the 3 patches, all of them look good).
the unset XDG_CONFIG_HOME part was already discussed here:
http://thread.gmane.org/gmane.comp.version-control.git/201609
But Michael did not continue the thread. I think your solution (unset
$XDG_CONFIG_HOME instead of setting it to
There is a bug with git rebase -i --root when a fixup or squash line is
applied to the new root. We attempt to amend the commit onto which they
apply with git reset --soft HEAD^ followed by a normal commit. Unlike a
real commit --amend, this sequence will fail against a root commit as it
has no
On Tue, Jul 24, 2012 at 02:06:43PM +0200, Matthieu Moy wrote:
Thanks (for the 3 patches, all of them look good).
the unset XDG_CONFIG_HOME part was already discussed here:
http://thread.gmane.org/gmane.comp.version-control.git/201609
But Michael did not continue the thread. I think
Commit e3ebc35 (config: fix several access(NULL) calls, 2012-07-12) was
fixing access(NULL) calls when trying to access $HOME/.config/git/config,
but missed the ones when trying to access $HOME/.config/git/ignore. Fix
and test this.
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
This can be
On Sun, Jul 22, 2012 at 11:42 PM, David Aguilar dav...@gmail.com wrote:
Eliminate a global variable and File::Find usage by building upon
basename() and glob() instead.
glob was used in an early revision of the patch that led to bf73fc2
(difftool: print list of valid tools with '--tool-help')
I'm sorry I am so late to see and comment on this...I am just getting
caught up after a few busy weeks due to $dayjob and vacation.
On Mon, Jul 23, 2012 at 2:05 AM, David Aguilar dav...@gmail.com wrote:
diff --git a/git-difftool.perl b/git-difftool.perl
index 2ae344c..a5b371f 100755
---
Running the http tests with valgrind does not work for two
reasons:
1. Apache complains about following the symbolic link from
git-http-backend to valgrind.sh.
2. Apache does not pass through the GIT_VALGRIND variable
to the backend CGI.
This patch fixes both problems.
On Mon, Jul 23, 2012 at 10:10:00PM -0700, Junio C Hamano wrote:
* jc/test-lib-source-build-options-early (2012-06-24) 1 commit
- test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that
records the shell and Perl the
Jeff King p...@peff.net writes:
On Mon, Jul 23, 2012 at 10:10:00PM -0700, Junio C Hamano wrote:
* jc/test-lib-source-build-options-early (2012-06-24) 1 commit
- test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS
Tim Henigan tim.heni...@gmail.com writes:
I'm sorry I am so late to see and comment on this...I am just getting
caught up after a few busy weeks due to $dayjob and vacation.
On Mon, Jul 23, 2012 at 2:05 AM, David Aguilar dav...@gmail.com wrote:
diff --git a/git-difftool.perl
On Mon, Jul 23, 2012 at 2:17 PM, John Bartholomew
jpa.bartholo...@gmail.com wrote:
I find the output of `git branch' to be quite bare, and would like to
see more information; most importantly, what the state of the branch
is in relation to its upstream. For some time I have been using my
own
Thomas Rast tr...@student.ethz.ch writes:
Junio's index-v4 was a speed boost mainly because it cuts down on the
size of the index. Do we want to throw that out?
That's pretty much orthogonal, isn't it?
The index-v4 is merely to show how a stupid prefix compression of
pathnames without
Jiang Xin wrote:
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrappers when run
'make pot' to extract messages from shell scripts.
Yes, thanks for fixing it.
As Stefano mentioned, s/run/running/ would make the above
Hi,
Jiang Xin wrote:
The obsolete LONG_USAGE variable
[...]
It's a shame to lose the information that was in the LONG_USAGE
message, though. Maybe it could be incorporated into the OPTIONS_SPEC
before the opening --, or maybe it could be used to clarify the
description in git-rebase(1).
Hi,
Jiang Xin wrote:
Mark strings in git-rebase.sh for translation.
Thanks.
[...]
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -65,6 +65,7 @@ abort! abort and check out the original branch
skip! skip current patch and continue
. git-sh-setup
+. git-sh-i18n
Hi,
Jiang Xin wrote:
Mark additional 3 strings for translation, and reduce one indentation
level for one gettextln clause introduced in commit de88c1c.
The above description doesn't mention:
[...]
@@ -387,8 +386,8 @@ do
-i|--interactive)
interactive=t ;;
Hi,
Jiang Xin wrote:
Gettext message should not start with '-' nor '--'. Since the '-d' and
'--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to
remove the block.
The above justification is not a sufficient reason to stop giving
helpful advice when someone uses an option
Jonathan Nieder jrnie...@gmail.com writes:
Probably it would make sense to do
resolvemsg=
$(gettext 'When you have resolved this problem, run git rebase
--continue.
If you prefer to skip this patch, run git rebase --skip instead.
To check out the original branch
Jonathan Nieder jrnie...@gmail.com writes:
Jiang Xin wrote:
The obsolete LONG_USAGE variable
[...]
It's a shame to lose the information that was in the LONG_USAGE
message, though. Maybe it could be incorporated into the OPTIONS_SPEC
before the opening --, or maybe it could be used to
Hi,
Ramsay Jones wrote:
Hi Jonathan,
This version of the patch only moves code to determine the test
prerequisite to the outer level, while leaving the 'setup' aspects
of the first test in place.
I guess I don't see the point. The current convention of don't do
anything complicated
At present, running the t3300-*.sh test on cygwin looks like:
$ cd t
$ ./t3300-funny-names.sh
ok 1 - setup
# passed all 1 test(s)
1..1 # SKIP Your filesystem does not allow tabs in filenames
$
Unfortunately, this is not valid TAP output, which prove notes
as follows:
Jonathan Nieder wrote:
Needless to say, I much prefer the patch below. :-D
Thanks for a nice explanation. In general I definitely like getting
rid of these setup tests when possible. Let's see:
[...]
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -15,28 +15,20 @@
Hi,
Ramsay Jones wrote:
The only problematic platforms I test on are NTFS/bash on cygwin and MinGW.
Since commit 2b843732 (Suppress some bash redirection error messages,
26-08-2008), I have not noticed any complaints regarding this problem.
Yeah, that probably took care of squashing the
Chris Webb ch...@arachsys.com writes:
There is a bug with git rebase -i --root when a fixup or squash line is
applied to the new root. We attempt to amend the commit onto which they
apply with git reset --soft HEAD^ followed by a normal commit. Unlike a
real commit --amend, this sequence will
Hi,
In June, Dmitry Ivankov wrote:
null_sha1 is used in fast-import to indicate empty branches and
should never be actually written out as a commit parent. 'merge'
command lacks is_null_sha1 checks and must be fixed.
It looks like using null_sha1 or empty branches in 'from' command
is
Hi,
Junio C Hamano wrote:
Florian Achleitner florian.achleitner.2.6...@gmail.com writes:
To ease testing without depending on a reachable svn server, this
compact python script mimics parts of svnrdumps behaviour.
It requires the remote url to start with sim://.
[...]
To allow using the
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
The only problematic platforms I test on are NTFS/bash on cygwin and MinGW.
Since commit 2b843732 (Suppress some bash redirection error messages,
26-08-2008), I have not noticed any complaints regarding this problem.
What have I missed?
Am 24.07.2012 21:01, schrieb Justin Spahr-Summers:
This occurs on Mac OS X 10.7.4, on git versions 1.7.10.2 (Apple Git-33) and
1.7.11.3.
Steps:
1. Create or clone a repository to an absolute path that contains spaces.
2. Add a submodule to the repository, if it does not already have one.
Jens Lehmann jens.lehm...@web.de writes:
Am 24.07.2012 21:01, schrieb Justin Spahr-Summers:
This occurs on Mac OS X 10.7.4, on git versions 1.7.10.2 (Apple Git-33) and
1.7.11.3.
Steps:
1. Create or clone a repository to an absolute path that contains spaces.
2. Add a submodule to the
On Tuesday, 24. July 2012 at 13:08, Jens Lehmann wrote:
Am 24.07.2012 21:01, schrieb Justin Spahr-Summers:
This occurs on Mac OS X 10.7.4, on git versions 1.7.10.2 (Apple Git-33) and
1.7.11.3.
Steps:
1. Create or clone a repository to an absolute path that contains spaces.
2. Add a
On Tuesday, 24. July 2012 at 13:26, Junio C Hamano wrote:
Jens Lehmann jens.lehm...@web.de (http://web.de) writes:
Am 24.07.2012 21:01, schrieb Justin Spahr-Summers:
This occurs on Mac OS X 10.7.4, on git versions 1.7.10.2 (Apple Git-33)
and 1.7.11.3.
Steps:
1. Create or
Justin Spahr-Summers justin.spahrsumm...@gmail.com writes:
On Tuesday, 24. July 2012 at 13:26, Junio C Hamano wrote:
...
I can see one codepath that would behave incorrectly,...
...
My recommendation at this point (i.e. not a long term) for people
with problems Justin saw is Don't do it
Jonathan Nieder jrnie...@gmail.com writes:
--d|--dotest)
-die $(gettext -d option is no longer supported. Do not
use.)
-;;
Luckily the support was removed 4 years ago and I don't think anyone
is going to run into this, so a different justification could apply.
Jonathan Nieder jrnie...@gmail.com writes:
-b|--binary)
-echo 2 The $1 option has been a no-op for long time, and
-echo 2 it will be removed. Please do not use it anymore.
+echo 2 $(gettext The -b option has been a no-op for long
time, and
+it will
On Tue, Jul 24, 2012 at 11:27 AM, Jonathan Nieder jrnie...@gmail.com wrote:
Hi,
Jiang Xin wrote:
Gettext message should not start with '-' nor '--'. Since the '-d' and
'--dotest' options do not exist in OPTIONS_SPEC variable, it's safe to
remove the block.
The above justification is not a
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
On Tue, Jul 24, 2012 at 11:27 AM, Jonathan Nieder jrnie...@gmail.com wrote:
Hi,
Jiang Xin wrote:
Gettext message should not start with '-' nor '--'. Since the '-d' and
'--dotest' options do not exist in OPTIONS_SPEC variable,
It's post OSCON so I can take another crack at this again.
I'm struggling with how best to present all this to you folks. There's
etiquette for how one presents a git pull request... but there's conflicting
etiquette about how one presents patches to a mailing list. I'm not sure
which bit of
Michael G Schwern schw...@pobox.com writes:
A big one is do not blast 10 emails to a mailing list but I gather that's ok
here if a submission needs 10 commits to be well expressed and its done via
git-send-email? And then if patch #3 needs revision I'm to do it in a rebase
and resend the
Hi,
Michael G Schwern wrote:
I'm trying to bust it up into easier to digest pieces.
I have a crazy idea. You might not like it, but maybe it's worth giving
it a try.
[...]
The Git::SVN extraction is more complicated than the rest, so I'll probably do
that separately and bust it up into a
2012/7/24 Junio C Hamano gits...@pobox.com:
I wonder if running test in a real directory (in other words, fix
your cwd) may be a simpler, more robust and generally a better
solution, e.g. something silly like...
diff --git a/t/test-lib.sh b/t/test-lib.sh
index acda33d..7f6fb0a 100644
---
Jonathan Nieder jrnie...@gmail.com writes:
I guess that means the intended justification is the following?
The git am -d/--dotest option has errored out with a message
since e72c7406 (am: remove support for -d .dotest, 2008-03-04).
The error message about lack of support
On 2012.7.17 10:49 PM, Junio C Hamano wrote:
By allowing people to easily publish a completed work, and making it
easier for them to let others peek at their work, Git hosting
services like GitHub are wonderful. But I am not conviced that
quality code reviews like we do on the mailing list
2012/7/25 Jonathan Nieder jrnie...@gmail.com:
@@ -64,7 +64,7 @@ test_expect_success 'rebase -n overrides config
rebase.stat config' '
test_expect_success 'rebase --onto outputs the invalid ref' '
test_must_fail git rebase --onto invalid-ref HEAD HEAD 2err
- grep invalid-ref err
2012/7/25 Jonathan Nieder jrnie...@gmail.com:
-b|--binary)
- echo 2 The $1 option has been a no-op for long time, and
- echo 2 it will be removed. Please do not use it anymore.
+ echo 2 $(gettext The -b option has been a no-op for long
time, and
+it
Hi again,
Michael G Schwern wrote:
On 2012.7.24 3:02 PM, Jonathan Nieder wrote:
Could you send the first five patches that *are* supposed to have a
functional effect? I know that they will not apply cleanly to git-svn
from git master or on top of each other; that's fine with me. If
the
On 2012.7.24 2:51 PM, Junio C Hamano wrote:
Michael G Schwern schw...@pobox.com writes:
A big one is do not blast 10 emails to a mailing list but I gather that's
ok
here if a submission needs 10 commits to be well expressed and its done via
git-send-email? And then if patch #3 needs
Michael G Schwern wrote:
While I use git heavily I'm not invested in working on it. I work on a lot of
projects. I'd like to be able to do the work, submit it, work through review,
and get out without joining another mailing list and studying their culture.
An alternative approach would be
Hi,
Michael G Schwern wrote:
But since you brought Github up... (I get the impression its kind of a dirty
word around here)
On the contrary, one of the main contributors is employed by github,
github hosts the git website, and all in all, github has done great
work.
Many people on the git
Michael G Schwern wrote:
git log -p schwern/git-svn/extract-classes..schwern/git-svn/fix-canonical
That should give you the information you need...
I guess so. May we have your sign-off on these changes? (A simple
reply of yes is enough, no need to resend patches to do this.)
Here it is
Jonathan Nieder jrnie...@gmail.com writes:
Michael G Schwern wrote:
git log -p schwern/git-svn/extract-classes..schwern/git-svn/fix-canonical
That should give you the information you need...
I guess so. May we have your sign-off on these changes? (A simple
reply of yes is enough, no
On 2012.7.24 4:45 PM, Junio C Hamano wrote:
git log -p schwern/git-svn/extract-classes..schwern/git-svn/fix-canonical
That should give you the information you need...
I guess so. May we have your sign-off on these changes? (A simple
reply of yes is enough, no need to resend patches to do
On Tue, Jul 24, 2012 at 5:43 AM, Tim Henigan tim.heni...@gmail.com wrote:
On Sun, Jul 22, 2012 at 11:42 PM, David Aguilar dav...@gmail.com wrote:
Eliminate a global variable and File::Find usage by building upon
basename() and glob() instead.
glob was used in an early revision of the patch
On Tue, Jul 24, 2012 at 6:52 PM, David Aguilar dav...@gmail.com wrote:
On Tue, Jul 24, 2012 at 5:43 AM, Tim Henigan tim.heni...@gmail.com wrote:
On Sun, Jul 22, 2012 at 11:42 PM, David Aguilar dav...@gmail.com wrote:
Eliminate a global variable and File::Find usage by building upon
basename()
David Aguilar dav...@gmail.com writes:
Does this implementation handle that case? I'm sorry, but I haven't
had time to apply and test myself.
[1]:
http://thread.gmane.org/gmane.comp.version-control.git/193233/focus=193925
[2]: http://thread.gmane.org/gmane.comp.version-control.git/194158
Michael G Schwern schw...@pobox.com wrote:
On 2012.7.17 10:49 PM, Junio C Hamano wrote:
By allowing people to easily publish a completed work, and making it
easier for them to let others peek at their work, Git hosting
services like GitHub are wonderful. But I am not conviced that
Teach difftool to use symlinks when diffing against the worktree.
David Aguilar (5):
difftool: print_tool_help() globals
difftool: Eliminate global variables
difftool: Move option values into a hash
difftool: Call the temp directory git-difftool
difftool: Use symlinks when diffing
Replace a global variable with a closure.
Signed-off-by: David Aguilar dav...@gmail.com
---
Differences from last time:
This keeps the original File::Find implementation and wraps the
global variable in a closure as the first step in the
globals-elimination cleanup.
git-difftool.perl | 8
Organize the script so that it has a single main() function which
calls out to dir_diff() and file_diff() functions. This eliminates
dir-diff-specific variables that do not need to be calculated when
performing a regular file-diff.
Signed-off-by: David Aguilar dav...@gmail.com
---
Same as last
Shorten the my declaration for all of the option-specific variables
by wrapping all of them in a hash. This also gives us a place to
specify default values, should we need them.
Signed-off-by: David Aguilar dav...@gmail.com
---
Same as last time, rebased
git-difftool.perl | 55
The diffall name was left over from when this functionality was part of
the git-diffall script in contrib/. Make the naming consistent.
Signed-off-by: David Aguilar dav...@gmail.com
---
Same as last time, rebased
git-difftool.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff
Teach difftool's --dir-diff mode to use symlinks to represent
files from the working copy, and make it the default behavior
for the non-Windows platforms.
Using symlinks is safer since we avoid needing to copy temporary
files into the worktree.
The original behavior is available as
On Tue, Jul 24, 2012 at 7:40 PM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
Does this implementation handle that case? I'm sorry, but I haven't
had time to apply and test myself.
[1]:
These are incremental updates on top of da/difftool-updates,
which is currently in next.
David Aguilar (3):
difftool: Handle finding mergetools/ in a path with spaces
difftool: Check all return codes from compare()
difftool: Disable --symlinks on cygwin
git-difftool.perl | 41
Use the original File::Find implementation from
bf73fc212a159210398b6d46ed5e9101c650e7db
so that we properly handle mergetools/ being located in a path containing
spaces.
One small difference is that we avoid using a global variable by
passing a reference to the list of tools.
Signed-off-by:
Symlinks are not ubiquitous on Windows so make --no-symlinks the default.
Signed-off-by: David Aguilar dav...@gmail.com
---
I don't have cygwin so I can't verify this one myself.
Is 'cygwin' really the value of $^O there?
git-difftool.perl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
This makes it so you no longer must edit the Makefile.PL every time you
add, rename or delete a Perl module. This is convenient, and I'm about
to extract a bunch of .pm files out of git-svn.
You still have to edit the Makefile. That parallel build system should be
able to be removed at a later
From: Michael G. Schwern schw...@pobox.com
Usually it isn't, but its nice if it can be run with warnings on.
Signed-off-by: Michael G Schwern schw...@pobox.com
---
perl/Makefile.PL | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index
From: Michael G. Schwern schw...@pobox.com
In older Perls, sometimes $@ can become unset between the eval and
checking $@. Its safer to check the eval directly.
Signed-off-by: Michael G Schwern schw...@pobox.com
---
perl/Makefile.PL | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff
From: Michael G. Schwern schw...@pobox.com
It is no longer necessary to manually add new .pm files to the
Makefile.PL. This makes it easier to add modules.
It is still necessary to add them to the Makefile, but that extra work
should be removed at a future date.
Signed-off-by: Michael G
Marked messages for translation in git-am, git-rebase, and git-merge.
Also fixed affected test cases when turn GETTEXT_POISON switch on.
Jiang Xin (7):
i18n: New keywords for xgettext extraction from sh
i18n: rebase: mark strings for translation
i18n: Rewrite gettext messages start with
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrappers when running
'make pot' to extract messages from shell scripts.
Signed-off-by: Jiang Xin worldhello@gmail.com
Reviewed-by: Stefano Lattarini
Mark strings in git-rebase.sh for translation. Jonathan offers a help
for reorgnization of the resolvemsg variable in 'git-rebase.sh', since
there is a likely message in git-am.sh, I update it in this commit for
consistency. And so does to 't/t0201-gettext-fallbacks.sh'.
Some test scripts are
Gettext message in a shell script should not start with '-', one
workaround is adding '--' between gettext and the message, like:
gettext -- --exec option ...
But due to a bug in the xgettext extraction, xgettext can not
extract the actual message for this case. Rewriting the message
is a
The obsolete LONG_USAGE variable has the following message in it:
A'\''--B'\''--C'\''
And such complex LONG_USAGE message will breaks xgettext when extracting
l10n messages. But if single quotes are removed from the message, xgettext
works fine on 'git-rebase.sh'.
Since there is a modern
Mark strings in 'git-am.sh' for translation. In the last chunk, I
changed '$1' to '-b/--binary' for this reason:
* First, if there is a variable in the l10n message, we could not use
gettext. Because the variable will be expanded (evaluated) and will
never match the entry in the po file.
Found this dead code when I examine gettext messages in shell scripts
start with dash ('-' or '--'). An error will be raised for this case,
like:
$ gettext -d option is no longer supported. Do not use.
gettext: missing arguments
Indead, this code has been left as dead for a long time,
Mark strings in merge-recursive for translation.
Some test scripts are affected by this update, and would fail if tested
with GETTEXT_POISON switch turned on. Using i18n-specific test
functions, such as test_i18ngrep, in the related test scripts will fix
these issues.
Signed-off-by: Jiang Xin
(cc-ing Duy because of a mention of his nice GETTEXT_POISON tweak[*])
Hi,
Jiang Xin wrote:
Mark strings in git-rebase.sh for translation. Jonathan offers a help
for reorgnization of the resolvemsg variable in 'git-rebase.sh', since
there is a likely message in git-am.sh, I update it in this
Jiang Xin wrote:
Mark strings in 'git-am.sh' for translation. In the last chunk, I
changed '$1' to '-b/--binary' for this reason:
* First, if there is a variable in the l10n message, we could not use
gettext. Because the variable will be expanded (evaluated) and will
never match the
Jiang Xin wrote:
Found this dead code when I examine gettext messages in shell scripts
start with dash ('-' or '--'). An error will be raised for this case,
like:
$ gettext -d option is no longer supported. Do not use.
gettext: missing arguments
Indead, this code has been left
Michael G Schwern wrote:
No, now it's just canonicalizing as early as possible. Preferably within the
object accessor rather than at the point of use. So in the code below,
$full_url is already escaped/canonicalized.
Let's start with this.
Is svn_path_canonicalize() idempotent? What does
On 2012.7.24 9:53 PM, Jonathan Nieder wrote:
Michael G Schwern wrote:
No, now it's just canonicalizing as early as possible. Preferably within the
object accessor rather than at the point of use. So in the code below,
$full_url is already escaped/canonicalized.
Let's start with this.
On 2012.7.24 7:55 PM, Eric Wong wrote:
After I'm exhausted from volunteering all the coding work, rather than
submitting a URL to a remote repository I find I have to learn new
specialized
tools. It's extra learning and work, an extra step to screw up, and foreign
to me (even as a
1 - 100 of 101 matches
Mail list logo
