Jonathan Nieder jrnie...@gmail.com writes:
In short:
- I didn't see anything questionable in 1/4;
- Calling up ::opt_prefix() from module in 2/4 looked ugly to me
but I suspect it should be easy to fix;
- 3/4 was a straight move and I didn't see anything questionable in
it, but
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
Please consider that the tip of 'master' is more or less feature
complete. Topics that are not in 'next' by the time I tag -rc1
sometime early
Junio C Hamano gits...@pobox.com writes:
t91XX series seem to fail in 'pu' with Can't locate Git/SVN.pm in
@INC for me. I see perl/blib/lib/Git/SVN/ directory and files
under it, but there is no perl/blib/lib/Git/SVN.pm installed. I see
Git/I18N.pm and Git/SVN/Ra.pm (and friends) mentioned
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
t91XX series seem to fail in 'pu' with Can't locate Git/SVN.pm in
@INC for me. I see perl/blib/lib/Git/SVN/ directory and files
under it, but there is no perl/blib/lib/Git/SVN.pm installed. I see
Git/I18N.pm
On Thursday 26 July 2012 09:54:26 Jonathan Nieder wrote:
Since the svn remote helper relies on this, it seems worth working on,
yeah. As for how to spend your time (and whether to beg someone else
to work on it instead :)): I'm not sure what's on your plate or where
you are with respect to
On 2012.7.26 10:18 PM, Junio C Hamano wrote:
Forgot to sign-off, or are you still unsure about this step?
I just never think to do it. It's just a line in the commit message, right?
There's no crypto involved like tag -s. Is it a blocker? I guess I can write
a msg-filter if it's important.
On 2012.7.26 10:18 PM, Junio C Hamano wrote:
If you swap the order of steps 3/4 and 4/4 by creating Git/SVN.pm
that only has these variable definitions (i.e. our $X and use
vars $X) and make git-svn.perl use them from Git::SVN in the first
step, and then do the bulk-moving (equivalent of your
Junio C Hamano venit, vidit, dixit 26.07.2012 22:10:
Jeff King p...@peff.net writes:
That looks like a maintenance annoyance. Can't we just have the
prerequisite-checker lazily perform the test on demand and cache the
result? It should be OK as long as:
1. The prereq is careful about
Scott Chacon scha...@gmail.com writes:
GitHub would like to volunteer to organize and pay for these events
this year. I would like to hold the developer-centric one in Berlin
in early October
Yay, Berlin! I would be glad to join there; I would probably not have
the time and resources to
Michael G Schwern schw...@pobox.com wrote:
On 2012.7.26 10:18 PM, Junio C Hamano wrote:
Again, I agree with you that passing $prefix as one of the arguments
to -new is the right thing to do in the final state after applying
the whole series. I don't know if later steps in your patch series
Junio C Hamano gits...@pobox.com wrote:
The result will be queued tentatively near the tip of 'pu', but as
this is primarily about git-svn, I would prefer a copy that is
vetted by Eric to be fed from him.
OK. I've signed-off on the 7 patches you have in pu. Will look at the
other series in a
On Fri, Jul 27, 2012 at 07:06:08AM +0400, Aleksandr Pryimak wrote:
I also recreated it
aleksandr@beast:/tmp/test$ git init
Initialized empty Git repository in /tmp/test/.git/
aleksandr@beast:/tmp/test$ touch x
aleksandr@beast:/tmp/test$ git add x
aleksandr@beast:/tmp/test$ git commit -m
On Fri, Jul 27, 2012 at 09:29:53AM -0400, Jeff King wrote:
If we put actual files inside x, which git does track, then they would
be part of the stash, and should be properly retained. But they're not:
$ rm x mkdir x echo foo x/file
Now we have some precious contents in the form of
Thanks Jeff for the comment. You are right. I oversimplified the use-case (
forget to fill the directory )
Sent from my iPad
On Jul 27, 2012, at 5:29 PM, Jeff King p...@peff.net wrote:
On Fri, Jul 27, 2012 at 07:06:08AM +0400, Aleksandr Pryimak wrote:
I also recreated it
On Thu, Jul 26, 2012 at 04:11:00PM -0700, Junio C Hamano wrote:
Introduce a mechanism to probe the prerequiste lazily. Changes are:
- test_lazy_prereq () function, which takes the name of the
prerequisite it probes and the script to probe for it, is
added. This only registers the
On Fri, Jul 27, 2012 at 11:45:00AM -0400, Jeff King wrote:
And of course with non-broken probes, -v would also help to see exactly
when the probe is run, using which commands, and what output they
produced. E.g., for SYMLINKS, we should probably drop the stderr
redirection from the probe so
On Thu, Jul 26, 2012 at 11:09 PM, Junio C Hamano gits...@pobox.com wrote:
* mz/rebase-range (2012-07-18) 7 commits
- rebase (without -p): correctly calculate patches to rebase
- rebase -p: don't request --left-right only to ignore left side
- rebase -p: use --cherry-mark for todo file
-
Since the Windows port of Git expects binary pipes, we need to make
sure the helper-end also sets up binary pipes.
Side-step CRLF-issue in test to make it pass.
Signed-off-by: Erik Faye-Lund kusmab...@gmail.com
---
Sorry for the delay, but here's the third iteration of my credential
helper for
Jeff King p...@peff.net writes:
On Fri, Jul 27, 2012 at 11:45:00AM -0400, Jeff King wrote:
And of course with non-broken probes, -v would also help to see exactly
when the probe is run, using which commands, and what output they
produced. E.g., for SYMLINKS, we should probably drop the
get_patch_ids() takes an already initialized rev_info and a
prefix. The prefix is used when initalizing a second rev_info. Since
the initialized rev_info already has a prefix and it seems the prefix
doesn't change, we can used the prefix from the initialized rev_info
to initialize the second
Michael J Gruber g...@drmicha.warpmail.net writes:
5/5 needs a fix in the subject line, sorry. It should be:
t3910: use the UTF8_NFD_TO_NFC test prereq
(5/5 hasn't hit next)
That is because I thought that you would like the lazy-probe and
that you would be capable of rerolling it on your
This patch series gives Git::SVN and Git::SVN::Ra accessors for
path and url and then makes the rest of the code use them, rather
than grab at $obj-{path} and $obj-{url}. This then will give
us the control necessary to canonicalize them as early as
possible (done in the next patch series).
There
From: Michael G. Schwern schw...@pobox.com
Then later it can be canonicalized automatically rather than everywhere
its used.
Later patch will make other things use it.
---
perl/Git/SVN.pm | 87 +
1 file changed, 56 insertions(+), 31
From: Michael G. Schwern schw...@pobox.com
So later it can do automatic canonicalization.
A later patch will make other things use the accessor.
No functional change here.
---
perl/Git/SVN.pm | 44 ++--
1 file changed, 30 insertions(+), 14 deletions(-)
From: Michael G. Schwern schw...@pobox.com
No functional change.
---
git-svn.perl| 12 +++-
perl/Git/SVN.pm | 4 ++--
perl/Git/SVN/Fetcher.pm | 2 +-
perl/Git/SVN/Ra.pm | 6 +++---
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/git-svn.perl
From: Michael G. Schwern schw...@pobox.com
Note: The structure returned from Git::SVN-read_all_remotes() does not appear
to
contain objects, so I'm leaving them alone.
That's everything converted over to the url and path accessors.
No functional change.
---
git-svn.perl | 11
Junio C Hamano gits...@pobox.com wrote:
What was happening was that originally, pu had ms/makefile-pl but
not ms/git-svn-pm. Hence, perl/Git/SVN.pm did not exist. I ran
make and it created perl/perl.mak that does not know about
Git/SVN.pm;
Then ms/git-svn-pm is merged to pu and now we
On 2012.7.27 1:07 PM, Eric Wong wrote:
While Makefile.PL now finds .pm files on its own, it does not
detect new files after it generates perl/perl.mak.
Are you saying this doesn't work?
perl Makefile.PL
make -f perl.mak
touch Git/Foo.pm
perl Makefile.PL
make -f perl.mak
or this?
perl
Michael G Schwern schw...@pobox.com wrote:
On 2012.7.27 1:07 PM, Eric Wong wrote:
While Makefile.PL now finds .pm files on its own, it does not
detect new files after it generates perl/perl.mak.
Are you saying this doesn't work?
perl Makefile.PL
make -f perl.mak
touch Git/Foo.pm
perl
Michael G Schwern schw...@pobox.com writes:
On 2012.7.27 1:07 PM, Eric Wong wrote:
While Makefile.PL now finds .pm files on its own, it does not
detect new files after it generates perl/perl.mak.
Are you saying this doesn't work?
perl Makefile.PL
make -f perl.mak
touch Git/Foo.pm
perl
Stefan Zager sza...@google.com writes:
+ module_list $@ | awk '{print $4}' | xargs -L 1 -P $jobs git
submodule update $orig_args
Capital-P option to xargs is not even in POSIX, no?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
From 3f449e719b924929f1f8ca9b5eff83f17bc64c60 Mon Sep 17 00:00:00 2001
From: Sascha Cunz sas...@babbelbox.org
Date: Fri, 27 Jul 2012 22:54:56 +0200
Subject: [PATCH] Use work tree to determine if it supports symlinks
When creating a new repository, we check some capabilities of the
underlying file
Eric Wong normalper...@yhbt.net writes:
I'll put the following after ms/makefile-pl but before ms/git-svn-pm:
OK, it seems that you haven't pushed out the result yet (which is
fine); how do we want to proceed?
I generally prefer pulling from maintainer trees directly to my
'master' without
Sascha Cunz sascha...@babbelbox.org writes:
From 3f449e719b924929f1f8ca9b5eff83f17bc64c60 Mon Sep 17 00:00:00 2001
From: Sascha Cunz sas...@babbelbox.org
Date: Fri, 27 Jul 2012 22:54:56 +0200
Subject: [PATCH] Use work tree to determine if it supports symlinks
When creating a new repository,
Junio C Hamano gits...@pobox.com wrote:
Eric Wong normalper...@yhbt.net writes:
I'll put the following after ms/makefile-pl but before ms/git-svn-pm:
OK, it seems that you haven't pushed out the result yet (which is
fine); how do we want to proceed?
Oops, got sidetracked into something
Eric Wong normalper...@yhbt.net wrote:
Junio C Hamano gits...@pobox.com wrote:
Eric Wong normalper...@yhbt.net writes:
I'll put the following after ms/makefile-pl but before ms/git-svn-pm:
OK, it seems that you haven't pushed out the result yet (which is
fine); how do we want to
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
While walking the revision list in get_patch_ids and cmd_cherry, we
ignore merges by checking if there is more than one parent. However,
since the revision walk was initialized with revs.ignore_merges = 1,
this would never happen.
Eric Wong normalper...@yhbt.net writes:
OK, all fixed, all I needed was this (squashed in):
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -22,6 +22,8 @@ clean:
$(RM) $(makfile).old
$(RM) PM.stamp
+$(makfile): PM.stamp
+
ifdef NO_PERL_MAKEMAKER
instdir_SQ = $(subst
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
get_patch_ids() takes an already initialized rev_info and a
prefix. The prefix is used when initalizing a second rev_info. Since
the initialized rev_info already has a prefix and it seems the prefix
doesn't change, we can used the
Junio C Hamano gits...@pobox.com wrote:
Eric Wong normalper...@yhbt.net writes:
The redundant dependencies are biting us : I agree there presence in
the top-level Makefile needs to be reviewed.
Do you feel confident enough that we can leave that question hanging
around and still merge
On Friday, July 27, 2012 02:55:49 PM you wrote:
Sascha Cunz sascha...@babbelbox.org writes:
From 3f449e719b924929f1f8ca9b5eff83f17bc64c60 Mon Sep 17 00:00:00 2001
From: Sascha Cunz sas...@babbelbox.org
Date: Fri, 27 Jul 2012 22:54:56 +0200
Subject: [PATCH] Use work tree to determine if it
Eric Wong normalper...@yhbt.net writes:
Eric Wong normalper...@yhbt.net wrote:
So I'll hold off until we can fix the build regressions (working on it
now)
OK, all fixed, all I needed was this (squashed in):
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -22,6 +22,8 @@ clean:
$(RM)
Sascha Cunz sas...@babbelbox.org writes:
Ok, so repository and working directory are simply not meant to be on
different file systems. Thanks for the clarification.
I did not mean and that is a rule we need to enforce and keep
forever. I was just answering your (implied) question why does
Eric Wong normalper...@yhbt.net writes:
Junio C Hamano gits...@pobox.com wrote:
Eric Wong normalper...@yhbt.net writes:
The redundant dependencies are biting us : I agree there presence in
the top-level Makefile needs to be reviewed.
Do you feel confident enough that we can leave that
Junio C Hamano gits...@pobox.com wrote:
Ok, please don't forget to add necessary .gitignore rule for the new
stamp file.
I noticed/remembered that, but I forgot to mention I squashed that in,
too :)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Stefan Zager sza...@google.com writes:
On Fri, Jul 27, 2012 at 2:38 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Zager sza...@google.com writes:
+ module_list $@ | awk '{print $4}' | xargs -L 1 -P
$jobs git submodule update $orig_args
Capital-P option to xargs is not
On Friday, July 27, 2012 03:58:49 PM you wrote:
Sascha Cunz sas...@babbelbox.org writes:
Ok, so repository and working directory are simply not meant to be on
different file systems. Thanks for the clarification.
I did not mean and that is a rule we need to enforce and keep
forever.
I
Michael G. Schwern schw...@pobox.com wrote:
This series of patches extracts the remaining classes from git-svn. They're
all simple extractions and functionally have no change.
I've also pushed this to the extract-remaining series which
also includes everything that's currently in my master.
I
Michael G. Schwern wrote:
This is the last refactoring patch series. After this bugs, start
getting fixed.
I just wanted to say thanks for your thoughtful presentation of this
code. I was worried before, but these have been pleasantly submitted.
If you have a chance at some point to offer
Eric Wong normalper...@yhbt.net writes:
Michael G. Schwern schw...@pobox.com wrote:
This series of patches extracts the remaining classes from git-svn. They're
all simple extractions and functionally have no change.
I've also pushed this to the extract-remaining series which
also includes
Junio C Hamano gits...@pobox.com wrote:
Eric Wong normalper...@yhbt.net writes:
Michael G. Schwern schw...@pobox.com wrote:
This series of patches extracts the remaining classes from git-svn.
They're
all simple extractions and functionally have no change.
I've also pushed this to
Eric Wong normalper...@yhbt.net writes:
Junio C Hamano gits...@pobox.com wrote:
Eric Wong normalper...@yhbt.net writes:
Michael G. Schwern schw...@pobox.com wrote:
This series of patches extracts the remaining classes from git-svn.
They're
all simple extractions and functionally
On Fri, Jul 27, 2012 at 3:30 PM, Junio C Hamano gits...@pobox.com wrote:
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
Also re-initializing rev_info fields to the same values already set in
init_revisions().
Oops, that should have been _avoid_ re-initializing.
I suspect that
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
Do you want a reroll with updated commit messages (the missing avoid
above, the dropped seems like about the prefix in 1/2)?
Nah, I've already queued them with log message tweaks. Thanks for
asking, though.
--
To unsubscribe from
54 matches
Mail list logo
