W dniu 02.01.2013 08:24, Junio C Hamano pisze:
Paul Mackerras pau...@samba.org writes:
On Sat, Dec 01, 2012 at 06:16:25PM -0800, Junio C Hamano wrote:
Łukasz Stelmach stl...@poczta.fm writes:
Enable hiding of tags displayed in the tree as yellow labels.
If a repository is used together
Hi,
Eric S. Raymond wrote:
Junio C Hamano gits...@pobox.com:
So..., is this a flag-day patch?
After this is merged, users who have been interoperating with CVS
repositories with the older cvsps have to install the updated cvsps
before using a new version of Git that ships with it?
Yes,
Starting with v1.7.12-rc0~4^2 (build: reconfigure automatically if
configure.ac changes, 2012-07-19), configure is automatically run
every time the configure script changes. In particular, that
means configure is automatically rerun whenever the version number
changes (which changes the configure
On Wed, Jan 02, 2013 at 12:25:44AM -0800, Jonathan Nieder wrote:
Starting with v1.7.12-rc0~4^2 (build: reconfigure automatically if
configure.ac changes, 2012-07-19), configure is automatically run
every time the configure script changes. In particular, that
means configure is automatically
Jonathan Nieder wrote:
Starting with v1.7.12-rc0~4^2 (build: reconfigure automatically if
configure.ac changes, 2012-07-19), configure is automatically run
every time the configure script changes. In particular, that
means configure is automatically rerun whenever the version number
changes
Jeff King wrote:
It seems I am late to the party. But FWIW, this looks the most sane to
me of the patches posted in this thread.
Thanks. config.status runs ./configure itself, though, so the rule
should actually be
config.status: configure.ac
$(QUIET_GEN)$(MAKE)
On Tue, Jan 1, 2013 at 5:16 PM, Junio C Hamano gits...@pobox.com wrote:
Torsten Bögershausen tbo...@web.de writes:
echo -n is not portable on all systems.
Use printf instead
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
Brandon, this comes from 932581b (Unify appending signoff in
On Tue, Jan 01, 2013 at 11:18:46PM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
[1] This symlink is doubly wrong, because any use of symbolic links
in the test scripts needs to depend on the SYMLINKS prereq, and this
does not.
Yeah, I think we have discussed
Jeff King wrote:
On Tue, Jan 01, 2013 at 11:18:46PM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
[1] This symlink is doubly wrong, because any use of symbolic links
in the test scripts needs to depend on the SYMLINKS prereq, and
this does not.
Yeah, I think we have
On Tue, Jan 01, 2013 at 10:40:08PM +0100, Torsten Bögershausen wrote:
Add the perl script check-non-portable-shell.pl to detect non-portable
shell syntax
Cool. Thanks for adding more test-lint. But...
diff --git a/t/Makefile b/t/Makefile
index 88e289f..7b0c4dc 100644
--- a/t/Makefile
+++
Jonathan Nieder jrnie...@gmail.com:
Speaking with my Debian packager hat on: the updated cvsps is not
available in Debian. git cvsimport is, and it has users that report
bugs from time to time. With this change, I would either have to take
on responsibility for maintenance of the cvsps
On Tue, Jan 1, 2013 at 8:52 PM, Junio C Hamano gits...@pobox.com wrote:
Adam Spiers g...@adamspiers.org writes:
diff --git a/Documentation/technical/api-directory-listing.txt
b/Documentation/technical/api-directory-listing.txt
index 0356d25..944fc39 100644
---
On 01/02/2013 09:48 AM, Jonathan Nieder wrote:
Jeff King wrote:
It seems I am late to the party. But FWIW, this looks the most sane to
me of the patches posted in this thread.
Thanks. config.status runs ./configure itself, though, so the rule
should actually be
config.status:
On Wed, Jan 2, 2013 at 2:59 AM, Jeff King p...@peff.net wrote:
On Tue, Jan 01, 2013 at 11:18:46PM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
[1] This symlink is doubly wrong, because any use of symbolic links
in the test scripts needs to depend on the SYMLINKS prereq,
Jonathan Nieder jrnie...@gmail.com:
The former is already loudly advertised in the package description and
manpage, at least lets you get work done, and works fine for simple
repositories with linear history.
Two of the three claims in this paragraph are false. The manual page
does not tell
Jeff King p...@peff.net writes:
So taking all of that, a more idiomatic perl script would look something
like:
my $exit_code;
sub err {
my $msg = shift;
print $ARGV:$.: error: $msg: $_\n;
$exit_code = 1;
}
while () {
chomp;
if (/^\s*sed\s+-i/) {
Jeff King p...@peff.net writes:
Whether we end up doing something with contrib and tests or not, the
patch below gives a minimal fix in the meantime.
Replacing the symbolic link with write_script that uses exported
variables looks like a familiar pattern. I like it.
Oh, wait. That pattern
Eric S. Raymond wrote:
Jonathan Nieder jrnie...@gmail.com:
The former is already loudly advertised in the package description and
manpage, at least lets you get work done, and works fine for simple
repositories with linear history.
Two of the three claims in this paragraph are false.
Give
First of all, I am at the same time a sad, nostalgic, and very happy
that old cvsimport is getting replaced.
On Wed, Jan 2, 2013 at 11:18 AM, Eric S. Raymond e...@thyrsus.com wrote:
Two of the three claims in this paragraph are false. The manual page
does not tell you what is true, which is
Martin Langhoff martin.langh...@gmail.com:
Replacement with something more solid is welcome, but until you are
extremely confident of its handling of legacy setups... I would still
provide the old cvsimport, perhaps in contrib.
I am extremely confident. I built a test suite so I could be.
--
Eric S. Raymond e...@thyrsus.com writes:
Two of the three claims in this paragraph are false. The manual page
does not tell you what is true, which is that old cvsps will fuck up
every branch by putting the root point at the wrong place.
That doesn't look like being a widespread problem, or
On Wed, Jan 2, 2013 at 5:41 PM, Eric S. Raymond e...@thyrsus.com wrote:
Martin Langhoff martin.langh...@gmail.com:
Replacement with something more solid is welcome, but until you are
extremely confident of its handling of legacy setups... I would still
provide the old cvsimport, perhaps in
diff --git a/Makefile b/Makefile
index 26b697d..2f5e2ab 100644
--- a/Makefile
+++ b/Makefile
@@ -2167,8 +2167,14 @@ configure: configure.ac GIT-VERSION-FILE
$(RM) $+
ifdef AUTOCONFIGURED
-config.status: configure
- $(QUIET_GEN)if test -f config.status; then \
+# We avoid
Lukasz Stelmach stl...@poczta.fm writes:
W dniu 02.01.2013 08:24, Junio C Hamano pisze:
Paul Mackerras pau...@samba.org writes:
On Sat, Dec 01, 2012 at 06:16:25PM -0800, Junio C Hamano wrote:
Łukasz Stelmach stl...@poczta.fm writes:
Enable hiding of tags displayed in the tree as yellow
Junio C Hamano gits...@pobox.com writes:
Jason Holden jason.k.holden.sw...@gmail.com writes:
Any reason to leave out the maintainers email addresses?
Nothing particular, other than that I did not find anywhere in the
file that does not break the flow.
I've prepared this on top of the
Eric S. Raymond e...@thyrsus.com writes:
If you try to use new git-cvsimport with old cvsps, old cvsps will complain
of an invalid argument and git-cvsimport will quit.
I see an opening for smoother transition here.
Like it or not, you cannot force distros to ship with cvsps 3.0 when
we ship
prepare-commit-msg hook is run when committing to prepare the log
message. If the exit-status is non-zero, the commit should be aborted.
While the script is run before committing a successful merge, the
exit-status is ignored and a non-zero exit doesn't abort the commit.
Abort the commit if
Eric S. Raymond e...@thyrsus.com writes:
Junio C Hamano gits...@pobox.com:
As your version already knows how to detect the case where cvsps is
too old to operate with it, I imagine it to be straight-forward to
ship the old cvsimport under obscure name, git cvsimport--old or
something, and
On 01/02/2013 05:50 PM, Junio C Hamano wrote:
Stefano Lattarini stefano.lattar...@gmail.com writes:
On 01/02/2013 09:48 AM, Jonathan Nieder wrote:
Jeff King wrote:
It seems I am late to the party. But FWIW, this looks the most sane to
me of the patches posted in this thread.
...
FYI,
Zoltan Klinger zoltan.klin...@gmail.com writes:
+static const char* MSG_REMOVE = Removing %s\n;
+static const char* MSG_WOULD_REMOVE = Would remove %s\n;
+static const char* MSG_WOULD_NOT_REMOVE = Would not remove %s\n;
+static const char* MSG_WOULD_IGNORE_GIT_DIR = Would ignore untracked git
Stefano Lattarini stefano.lattar...@gmail.com writes:
ifdef AUTOCONFIGURED
-config.status: configure
-$(QUIET_GEN)if test -f config.status; then \
+# We avoid depending on 'configure' here, because it gets rebuilt
+# every time GIT-VERSION-FILE is modified, only to update the embedded
Antoine Pelisse apeli...@gmail.com writes:
prepare-commit-msg hook is run when committing to prepare the log
message. If the exit-status is non-zero, the commit should be aborted.
I was scratching my head why you CC'ed Jay, until I dug up 65969d4
(merge: honor prepare-commit-msg hook,
On 01/02/2013 09:25 PM, Junio C Hamano wrote:
Stefano Lattarini stefano.lattar...@gmail.com writes:
ifdef AUTOCONFIGURED
-config.status: configure
- $(QUIET_GEN)if test -f config.status; then \
+# We avoid depending on 'configure' here, because it gets rebuilt
+# every time
On Wed, Jan 02, 2013 at 08:34:42AM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
Whether we end up doing something with contrib and tests or not, the
patch below gives a minimal fix in the meantime.
Replacing the symbolic link with write_script that uses exported
prepare-commit-msg hook is run when committing to prepare the log
message. If the exit-status is non-zero, the commit should be aborted.
I was scratching my head why you CC'ed Jay, until I dug up 65969d4
(merge: honor prepare-commit-msg hook, 2011-02-14).
I did as suggested in
Junio C Hamano gits...@pobox.com writes:
Zoltan Klinger zoltan.klin...@gmail.com writes:
+static const char* MSG_REMOVE = Removing %s\n;
+static const char* MSG_WOULD_REMOVE = Would remove %s\n;
+static const char* MSG_WOULD_NOT_REMOVE = Would not remove %s\n;
I also noticed that this
On Wed, Jan 2, 2013 at 11:41 AM, Eric S. Raymond e...@thyrsus.com wrote:
Martin Langhoff martin.langh...@gmail.com:
Replacement with something more solid is welcome, but until you are
extremely confident of its handling of legacy setups... I would still
provide the old cvsimport, perhaps in
Antoine Pelisse apeli...@gmail.com writes:
prepare-commit-msg hook is run when committing to prepare the log
message. If the exit-status is non-zero, the commit should be aborted.
I was scratching my head why you CC'ed Jay, until I dug up 65969d4
(merge: honor prepare-commit-msg hook,
On Wed, Jan 2, 2013 at 10:35 AM, Junio C Hamano gits...@pobox.com wrote:
Dan McGee d...@archlinux.org writes:
This works great now, thanks! I ran it through our package build
scripts and all tests now pass as expected.
If you have a chance, could you try tip of the 'next' branch without
Martin Langhoff martin.langh...@gmail.com:
I dealt with enough CVS repos to see that the branch point could be
ambiguous, and that some cases were incurably ugly and ambiguous.
You are quite right, but you have misintepreted the subject of my
confidence. I am under no illusion that the new
Accept -v as a synonym to --reroll-count, so that users can say
git format-patch -v4 master, instead of having to fully spell it
out as git format-patch --reroll-count=4 master.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
* As I do not think of a reason why users would want to tell the
tbo...@web.de wrote on Wed, 02 Jan 2013 00:20 +0100:
sed -i is not portable on all systems.
Use sed with different input and output files.
Utilize a tmp file whenever needed
Added missing at 2 places
Signed-off-by: Torsten Bögershausen tbo...@web.de
One more teensy fix is needed in this
Pete Wyckoff p...@padd.com writes:
tbo...@web.de wrote on Wed, 02 Jan 2013 00:20 +0100:
sed -i is not portable on all systems.
Use sed with different input and output files.
Utilize a tmp file whenever needed
Added missing at 2 places
Signed-off-by: Torsten Bögershausen tbo...@web.de
On 02.01.13 10:46, Jeff King wrote: On Tue, Jan 01, 2013 at 10:40:08PM +0100,
Torsten Bögershausen wrote:
Add the perl script check-non-portable-shell.pl to detect non-portable
shell syntax
Cool. Thanks for adding more test-lint. But...
diff --git a/t/Makefile b/t/Makefile
index
Add the perl script check-non-portable-shell.pl to detect non-portable
shell syntax
echo -n is an example of a shell command working on Linux,
but not on Mac OS X.
These shell commands are checked and reported as error:
- echo -n (printf should be used)
- sed -i (Use a temp file)
- arrays in
On Thu, Jan 03, 2013 at 12:14:32AM +0100, Torsten Bögershausen wrote:
This is wrong if $(PERL_PATH) contains spaces, no? Doing $(PERL_PATH)
is also wrong, because the expansion happens in 'make', and a
$(PERL_PATH) with double-quotes would fool the shell. Since we export
$PERL_PATH, I
On Wed, Jan 2, 2013 at 5:28 PM, Eric S. Raymond e...@thyrsus.com wrote:
Martin Langhoff martin.langh...@gmail.com:
I dealt with enough CVS repos to see that the branch point could be
ambiguous, and that some cases were incurably ugly and ambiguous.
You are quite right, but you have
On 03.01.13 00:22, Jeff King wrote:
On Thu, Jan 03, 2013 at 12:14:32AM +0100, Torsten Bögershausen wrote:
This is wrong if $(PERL_PATH) contains spaces, no? Doing $(PERL_PATH)
is also wrong, because the expansion happens in 'make', and a
$(PERL_PATH) with double-quotes would fool the shell.
Jeff King p...@peff.net writes:
On Tue, Jan 01, 2013 at 10:40:08PM +0100, Torsten Bögershausen wrote:
Add the perl script check-non-portable-shell.pl to detect non-portable
shell syntax
Cool. Thanks for adding more test-lint. But...
diff --git a/t/Makefile b/t/Makefile
index
Junio C Hamano gits...@pobox.com writes:
I would actually not add this to TEST_LINT by default, especially
when duplicates and executable that are much simpler and less
likely to hit false positives are not on by default.
At least, a change to add this to TEST_LINT by default must wait to
Torsten Bögershausen tbo...@web.de writes:
At least on my system the following combination works:
git diff
diff --git a/t/Makefile b/t/Makefile
index f8f8c54..391a5ca 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -8,7 +8,7 @@
#GIT_TEST_OPTS = --verbose --debug
SHELL_PATH ?= $(SHELL)
On 03.01.13 01:16, Junio C Hamano wrote:
Torsten Bögershausen tbo...@web.de writes:
At least on my system the following combination works:
git diff
diff --git a/t/Makefile b/t/Makefile
index f8f8c54..391a5ca 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -8,7 +8,7 @@
#GIT_TEST_OPTS =
Junio C Hamano gits...@pobox.com writes:
[query about NetBSD-6]
The 2.7 bit certainly looks fishy, as users should be able to
choose between 2.6 and 2.7 (and possibly 3.0), IIUC.
+ PYTHON_PATH = /usr/pkg/bin/python2.7
+ PERL_PATH = /usr/pkg/bin/perl
(I am one of the people who
Junio C Hamano gits...@pobox.com writes:
I would appreciate if somebody with more familiarlity with the
platform can suggest a better alternative than applying the
following patch to our Makefile. Right now I have an equivalent of
this change in config.mak locally when building on the said
Torsten Bögershausen tbo...@web.de writes:
When the dust has settled, we can either enable the check always,
or mention make test-lint-shell-syntax in the Documentation.
In the longer term, I'm pretty much in favor of enabling all the
checks that are cheap by default, as that would help people
Greg Troxel g...@ir.bbn.com writes:
I realize a README.foo file for N different systems could be clutter,
but having these checked in would provide the concise help that people
on any of those platforms need.
Our Makefile documents knobs people on various platforms can tweak
(PYTHON_PATH and
gits...@pobox.com wrote on Wed, 02 Jan 2013 15:06 -0800:
Pete Wyckoff p...@padd.com writes:
tbo...@web.de wrote on Wed, 02 Jan 2013 00:20 +0100:
sed -i is not portable on all systems.
Use sed with different input and output files.
Utilize a tmp file whenever needed
Added missing
On Tue, Jan 1, 2013 at 11:26 AM, Eric S. Raymond e...@thyrsus.com wrote:
diff --git a/git-cvsimport.py b/git-cvsimport.py
new file mode 100755
index 000..6407e8a
--- /dev/null
+++ b/git-cvsimport.py
@@ -0,0 +1,342 @@
+#!/usr/bin/env python
+#
+# Import CVS history into git
+#
+#
I'd like a datastore that maps a pair of commit object names to
another object name, such that:
* When looking at two commits A and B, efficiently query all data
associated with a pair of commits X,Y where X is contained in
the range A..B and not in B..A, and Y is contained in the range
Chris Rorvick ch...@rorvick.com writes:
outdir needs to be quoted in the formatted string, i.e.:
%s | (cd '%s' /dev/null ...
The issue is real, but I am afraid that the above is not sufficient
because outdir can contain single quotes. I think other places that
call out to external
Doesn't Python come with a standard subprocess module that lets you
spawn external programs safely, similar to the way Perl's list form
open(), e.g. open($fh, -|, 'git', @args), works?
You mean something like this:
p1 = subprocess.Popen([backend.command()], stdout=subprocess.PIPE)
61 matches
Mail list logo
