This is a refactoring to move Git::SVN out of git-svn and into its own .pm file.
This will make it easier to work with and test. This is just the extraction
with minimal work to keep all tests passing.
A couple of utility functions which were used by Git::SVN, git-svn and others
were also
From: Michael G. Schwern schw...@pobox.com
This means it should be able to load without git-svn being loaded.
* Load Git.pm on its own and all the needed command functions.
* It needs to grab at a git-svn lexical $_prefix representing the --prefix
option. Provide opt_prefix() for that. This
From: Michael G. Schwern schw...@pobox.com
Also it can compile on its own now, yay!
---
git-svn.perl | 4
perl/Git/SVN.pm | 9 +++--
t/Git-SVN/00compile.t | 3 ++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index
Keep the temporary directory around when either compare() or
the difftool returns a non-zero exit status.
Tell the user about the location of the temporary files so that
they can recover from the failure.
Signed-off-by: David Aguilar dav...@gmail.com
---
git-difftool.perl | 36
On 2012.7.24 10:54 PM, Jonathan Nieder wrote:
And again, it *does not have to be zero sum*. It doesn't have to be email VS
GUI. You can have your cake and eat it too.
I assume you're talking about web-based interfaces that have gateways
to email, that produce inboxes like this:
24 Jul
On Tuesday 24 July 2012 14:50:49 Jonathan Nieder wrote:
It is unclear how this is different from giving the ceiling by
specifying it as the END in -rSTART:END command line. Is this
feature really needed?
I think the idea is that you put this script (or a symlink to it) on
your $PATH
Junio C Hamano gits...@pobox.com writes:
Jonathan Nieder jrnie...@gmail.com writes:
Before this patch, it says
The --binary option has been a no-op for a long time, and ...
After the patch, it says
The -b option has been a no-op for a long time, and ...
Intentional? That may
Junio C Hamano gits...@pobox.com writes:
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
Michael G Schwern schw...@pobox.com writes:
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
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 messages in git-rebase.sh for translation. While doing this
Jonathan noticed that the comma usage and sentence structure of the
resolvemsg was not quite right, so correct that and its cousins in
git-am.sh and t/t0201-gettext-fallbacks.sh at the same time.
Some tests would start to fail with
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
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 '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.
Jiang Xin wrote:
2012/7/25 Jonathan Nieder jrnie...@gmail.com:
I haven't tested or reviewed this patch in detail, so even though it
looks good, I'd prefer it not to have my Reviewed-by. (See
Documentation/SubmittingPatches: 'Reviewed-by:, unlike the other
extra tags, can only be offered by
On 2012.7.25 12:14 AM, Junio C Hamano wrote:
Nothing, because paths are not URI escaped. :)
You probably meant svn_uri_canonicalize(). And no, it does not double
escape,
so its safe to escape as early as possible.
Are you saying that the function assumes that a local pathname would
Sorry to be so nit-picky, but ...
On 07/25/2012 05:53 AM, 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
2012/7/25 Stefano Lattarini stefano.lattar...@gmail.com:
* Second, if there is a positional parameter ($1, $2,...) in the
message, we could not use eval_gettext either. Because
eval_gettext may be a wapper for gettext, and the positional
parameter would loose it's original context.
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 as
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 messages in git-rebase.sh for translation. While doing this
Jonathan noticed that the comma usage and sentence structure of the
resolvemsg was not quite right, so correct that and its cousins in
git-am.sh and t/t0201-gettext-fallbacks.sh at the same time.
Some tests would start to fail with
Mark strings in merge-recursive for translation.
Some tests would start to fail with GETTEXT_POISON turned on after
this update. Use test_i18ncmp and test_i18ngrep where appropriate
to mark strings that should only be checked in the C locale output
to avoid such issues.
Signed-off-by: Jiang Xin
[Sorry, bad patch series number, resend again. I'm sleepy.]
Marked messages for translation in git-am, git-rebase, and git-merge.
Also fixed suffered tests when turning GETTEXT_POISON switch on.
Jiang Xin (7):
i18n: New keywords for xgettext extraction from sh
i18n: rebase: mark messages for
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 messages in git-rebase.sh for translation. While doing this
Jonathan noticed that the comma usage and sentence structure of the
resolvemsg was not quite right, so correct that and its cousins in
git-am.sh and t/t0201-gettext-fallbacks.sh at the same time.
Some tests would start to fail with
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.
The obsolete LONG_USAGE variable has the following message in it:
A'\''--B'\''--C'\''
And such complex LONG_USAGE message will break 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
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,
Hi Doug,
The method I have been using to achieve this is to create a wrapper script that
does the following:
git clone -n # clone, but don't checkout
cd repo name
git config core.sparseCheckout true# configure sparse-checkout on
#
Hi,
I have the following in .gitignore to ignore *.txt files.
*.txt
But I want to keep the *.txt files in, for example, data/ and all its
subdirectories. I don't know should the the correct way to unignore
these *.txt files. Could anybody show me the command that I should add
to .gitignore?
Patch 4 has the meat of this series.
While running valgrind to check that I didn't leak any memory, a couple
of leaks were spotted. Patches 1-3 address them.
Major change in v2: implement Thomas' idea [1] about using
help.autocorrect to configure this behaviour.
[1]
Copying with structural assignment may not take into account that the
LHS struct has sufficient memory, especially since the cmdname-name
member is nonfixed in size. Be unambiguous about it by realloc()'ing it
to be of sufficient size.
Additionally, free the unused cmdnames, which are no longer
If suggestions are available (based on Levenshtein distance) and if the
terminal isatty(), present a prompt to the user to select one of the
computed suggestions.
In the case where there is a single suggestion, present the prompt
[Y/n], such that (ie. the default), y and Y as input leads git
to
On Fri, Jul 20, 2012 at 11:42 AM, Thiago Farina tfrans...@gmail.com wrote:
Is there any interest in building git with ninja? [1]. I think it
would be very interesting to move forward from make to ninja.
[1] http://martine.github.com/ninja/
While it might be interesting, would it be a
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Aguilar dav...@gmail.com writes:
Keep the temporary directory around when either compare() or
the difftool returns a non-zero exit status.
Tell the user about the location of the temporary files so that
they can recover from the failure.
Signed-off-by: David Aguilar dav...@gmail.com
Looks sensible. Will queue.
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Jiang Xin worldhello@gmail.com writes:
The obsolete LONG_USAGE variable has the following message in it:
A'\''--B'\''--C'\''
And such complex LONG_USAGE message will break xgettext when
extracting l10n messages. But if single quotes are removed from
the message, xgettext works fine
Jiang Xin worldhello@gmail.com writes:
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
Tay Ray Chuan rcta...@gmail.com writes:
Copying with structural assignment may not take into account that the
LHS struct has sufficient memory, especially since the cmdname-name
member is nonfixed in size. Be unambiguous about it by realloc()'ing it
to be of sufficient size.
If the original
Tay Ray Chuan rcta...@gmail.com writes:
When help.autocorrect is set, in an attempt to retain the memory to the
string name in main_cmds, we unfortunately leaked the struct cmdname
that held it. Fix this by creating a copy of the string name.
If you are updating help_unknown_cmd() so that the
Tay Ray Chuan rcta...@gmail.com writes:
If suggestions are available (based on Levenshtein distance) and if the
terminal isatty(), present a prompt to the user to select one of the
computed suggestions.
The way to determine If the terminal is a tty used in this patch
looks overly dangerous,
Currently, it will only do a checkout if the sha1 registered in the containing
repository doesn't match the HEAD of the submodule, regardless of whether the
submodule is dirty. As discussed on the mailing list, the '--force' flag is a
strong indicator that the state of the submodule is suspect,
On Wed, Jul 25, 2012 at 9:49 AM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
Keep the temporary directory around when either compare() or
the difftool returns a non-zero exit status.
Tell the user about the location of the temporary files so that
they can
Stefan Zager sza...@google.com writes:
Currently, it will only do a checkout if the sha1 registered in the containing
repository doesn't match the HEAD of the submodule, regardless of whether the
submodule is dirty. As discussed on the mailing list, the '--force' flag is a
strong indicator
Has anyone else noticed false positives coming from the
orphan check? It is warning me about commits that are
clearly on master. Here is an example, where I checkout
master~2 and then switch back to master. It somehow thinks
that master~2 is orphaned, when master~2 is by definition
in the
On 07/25/2012 05:14 AM, David Aguilar wrote:
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?
Apparently yes:
$
Jonathan Nieder wrote:
[...]
No, I don't think this would be a good direction to go in. This may
not be a good idea either, but if you wanted to add a check here, then
maybe something like this (totally untested):
diff --git a/t/test-lib.sh b/t/test-lib.sh
index acda33d..53a2422 100644
---
Junio C Hamano wrote:
[...]
As I am more worried about longer-term health of the codebase, what
the part you moved outside test_expect_* with this patch happens to
do _right now_ is of secondary importance, at least from my point of
view. The next patch that updates this scirpt may want to
Jonathan Nieder wrote:
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.
You don't see the point of fixing the TAP Parse error? :-D
On 2012.7.25 9:56 AM, Junio C Hamano wrote:
Looks sensible. Will queue.
Thanks.
Thanks!
What's the lag time on it showing up in the repo, and which branch will it
appear in?
Also I just realized I've been basing my work on master. Should I move to
maint?
--
If you want the truth to
Michael G Schwern schw...@pobox.com writes:
What's the lag time on it showing up in the repo, and which branch will it
appear in?
There is nothing special in this topic, so it is likely to start on
'pu', and unlikely to come to 'master' before 1.7.12 ships sometime
next month.
Also I just
On Wed, Jul 25, 2012 at 2:53 PM, Paul Gortmaker
paul.gortma...@windriver.com wrote:
Has anyone else noticed false positives coming from the
orphan check? It is warning me about commits that are
clearly on master. Here is an example, where I checkout
master~2 and then switch back to master.
Torsten Bögershausen skrev 2012-06-24 17.47:
Do we have a motivation for pushing a solution that ignores
the unicode composition ?
I say we do. I tried your patch and it worked fine.
I'll send a V5 version with hopefully a better motivation
-- robin
--
To unsubscribe from this list:
Hi,
Ramsay Jones wrote:
Junio C Hamano wrote:
Observing that all well-written test scripts we have begin with this
boilerplate line:
test_expect_success setup '
I wouldn't mind introducing a new helper function test_setup that
behaves like test_expect_success but is meant to be used
Am 25.07.2012 20:44, schrieb Junio C Hamano:
Stefan Zager sza...@google.com writes:
Currently, it will only do a checkout if the sha1 registered in the
containing
repository doesn't match the HEAD of the submodule, regardless of whether the
submodule is dirty. As discussed on the mailing
Hi,
Michael G. Schwern wrote:
It is no longer necessary to manually add new .pm files to the
Makefile.PL. This makes it easier to add modules.
Thanks! Sorry I missed this.
[...]
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -2,6 +2,10 @@ use strict;
use warnings;
use
Hi,
Michael G. Schwern wrote:
This is a refactoring to move Git::SVN out of git-svn and into its own .pm
file.
This will make it easier to work with and test. This is just the extraction
with minimal work to keep all tests passing.
Patch 3 doesn't seem to have hit the list archive. I am
Michael G. Schwern schw...@pobox.com wrote:
From: Michael G. Schwern schw...@pobox.com
Put them in a new module called Git::SVN::Utils. Yeah, not terribly
original and it will be a dumping ground. But its better than having
them in the main git-svn program. At least they can be documented
Jonathan Nieder wrote:
Michael G. Schwern wrote:
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -2,6 +2,10 @@ use strict;
use warnings;
use ExtUtils::MakeMaker;
use Getopt::Long;
+use File::Find;
+
+# Don't forget to update the perl/Makefile, too.
+# Don't forget to test with
Paul Gortmaker paul.gortma...@windriver.com writes:
Has anyone else noticed false positives coming from the
orphan check?
Thanks. This should fix it.
builtin/checkout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index
On 2012.7.25 2:15 PM, Jonathan Nieder wrote:
Michael G. Schwern wrote:
This is a refactoring to move Git::SVN out of git-svn and into its own .pm
file.
This will make it easier to work with and test. This is just the extraction
with minimal work to keep all tests passing.
Patch 3 doesn't
Jonathan Nieder jrnie...@gmail.com writes:
FWIW I find Junio's test_setup name more self-explanatory. What
mnemonic should I be using to remember the _fixture name?
Previous exposure to things like Rails?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
Jens Lehmann jens.lehm...@web.de writes:
Am 25.07.2012 20:44, schrieb Junio C Hamano:
Stefan Zager sza...@google.com writes:
Currently, it will only do a checkout if the sha1 registered in the
containing
repository doesn't match the HEAD of the submodule, regardless of whether
the
Michael G Schwern schw...@pobox.com writes:
Also I just realized I've been basing my work on master. Should I move to
maint?
I don't think so. It is not fixing any urgent breakage (iow, by
being told about .pm explicitly, it knows about them just fine
without being taught how to find
On 2012.7.25 3:19 PM, Junio C Hamano wrote:
Michael G Schwern schw...@pobox.com writes:
How about the git-svn SVN 1.7 fix in general? All of these patch sets I'm
sending build on one another, is that going to be a problem? It's going to
come in about six parts.
Judging from the rate of
Michael G Schwern schw...@pobox.com wrote:
On 2012.7.25 2:24 PM, Eric Wong wrote:
Didn't we agree to use done_testing()? Perhaps (as you suggested) with
a private copy of Test::More? It's probably easier to start using
done_testing() earlier rather than later.
Yes, we agreed
Junio C Hamano gits...@pobox.com wrote:
Michael G Schwern schw...@pobox.com writes:
So... is that master or maint? Just let me know which one.
I do not care too deeply either way, and in the end I think Eric
should have the final say.
Given that git://git.bogomips.org/git-svn.git/ has
Michael G Schwern schw...@pobox.com wrote:
On 2012.7.24 7:55 PM, Eric Wong wrote:
Except git is also a new specialized tool. Your examples are exactly
why I'm saddened many projects only adopted git, but not the workflow
which _built_ git (and Linux).
Github also has broad spectrum
This is rapidly getting into the weeds. Regardless of the debate below, what
would you like me to do? Switch indentation to tabs and resubmit? AFAIK only
the new tests are affected.
On 2012.7.25 4:08 PM, Eric Wong wrote:
+BEGIN {
+# Override exit at BEGIN time before Git::SVN::Utils is
Michael G Schwern wrote:
This is rapidly getting into the weeds. Regardless of the debate below, what
would you like me to do? Switch indentation to tabs and resubmit? AFAIK only
the new tests are affected.
Yes, please do so at some point before the final submission. (If
there's more
Michael G Schwern schw...@pobox.com wrote:
On 2012.7.25 4:48 PM, Eric Wong wrote:
We need to use something. Right now our choice of mailer is the best
choice for _existing_ contributors.
I believe this entire discussion can be reduced to that right there.
If your process is optimized
72 matches
Mail list logo
