]> git.madduck.net Git - code/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / code / myrepos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 09af48c)
Remove dir_test hack and add a way for vcs tests to run perl code, using this for...
authorJoey Hess <joey@kitenet.net>
Fri, 16 Dec 2011 17:27:54 +0000 (13:27 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 16 Dec 2011 18:18:46 +0000 (14:18 -0400)
debian/changelog patch | blob | history
lib/git-fake-bare patch | blob | history
lib/git-svn patch | blob | history
lib/vcsh patch | blob | history
mr patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index 9d971616ab923878b0bc67a6147441e508f9885e..d47762515b3044fd705f972cca846c052cfd8244 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mr (1.09) unstable; urgency=low
+
+  * Remove dir_test hack and add a way for vcs tests to run perl code,
+    using this for the same optimisation. Fixes support for git-svn
+    etc. Closes: #652317
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 16 Dec 2011 13:29:40 -0400
+
 mr (1.08) unstable; urgency=low
 
   * Fix vcs test code. Closes: #651976
 mr (1.08) unstable; urgency=low
 
   * Fix vcs test code. Closes: #651976
diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 7a04fa6f609fb61e7e6fa745bf2b0c4aefccc8aa..5091d95ea4f29894016dd3abf6ff10bd0b19927c 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -42,10 +42,10 @@ lib =
                echo "$worktree"
        }
 
                echo "$worktree"
        }
 
-git_fake_bare_test = 
-       test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
-       test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
-       test `GIT_DIR="$MR_REPO" git config --get core.worktree`
+git_fake_bare_test = perl:
+       -d "$ENV{MR_REPO}/refs/heads" && -d "$ENV{MR_REPO}/refs/tags" &&
+       -d "$ENV{MR_REPO}/objects" && -f "$ENV{MR_REPO}/config" &&
+       `GIT_DIR="$ENV{MR_REPO}" git config --get core.worktree` ne ""
 
 git_fake_bare_update =
        args="$@"
 
 git_fake_bare_update =
        args="$@"
diff --git a/lib/git-svn b/lib/git-svn
index bcdb545e4c7543710dcd72a21dc9dcb78726501c..6cb9207b550ec2cbd95bd625204cf25ddcbd46f2 100644 (file)
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -16,13 +16,13 @@ git_svn_record = git commit -a "$@"
 git_svn_diff = git diff "$@"
 git_svn_log = git svn log "$@"
 
 git_svn_diff = git diff "$@"
 git_svn_log = git svn log "$@"
 
-git_test =
-       test -d "$MR_REPO"/.git &&
-       test -z "$(GIT_CONFIG="$MR_REPO"/.git/config git config --get svn-remote.svn.url)"
+git_test = perl:
+       -d "$ENV{MR_REPO}/.git" &&
+       `GIT_CONFIG="$ENV{MR_REPO}"/.git/config git config --get svn-remote.svn.url` eq ""
 
 
-git_svn_test =
-       test -d "$MR_REPO"/.git &&
-       test -n "$(GIT_CONFIG="$MR_REPO"/.git/config git config --get svn-remote.svn.url)"
+git_svn_test = perl:
+       -d "$ENV{MR_REPO}/.git" &&
+       `GIT_CONFIG="$ENV{MR_REPO}"/.git/config git config --get svn-remote.svn.url` ne ""
 
 git_svn_register =
        url="`LC_ALL=C git config --get svn-remote.svn.url`" || true
 
 git_svn_register =
        url="`LC_ALL=C git config --get svn-remote.svn.url`" || true
diff --git a/lib/vcsh b/lib/vcsh
index fed9de4b8d381a534930176c467027052fc03cea..6681efd7a6ec107bfb3bcd973bfd0cb24e5f7a4d 100644 (file)
--- a/lib/vcsh
+++ b/lib/vcsh
@@ -6,10 +6,10 @@
 #[$HOME/.config/vcsh/repo.d/zsh.git]
 #checkout = vcsh clone git://github.com/RichiH/zshrc.git zsh
 
 #[$HOME/.config/vcsh/repo.d/zsh.git]
 #checkout = vcsh clone git://github.com/RichiH/zshrc.git zsh
 
-vcsh_test =
-       test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
-       test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
-       test "`GIT_CONFIG="$MR_REPO"/config git config --get vcsh.vcsh`" = true
+vcsh_test = perl:
+       -d "$ENV{MR_REPO}/refs/heads" && -d "$ENV{MR_REPO}/refs/tags" &&
+       -d "$ENV{MR_REPO}/objects" && -f "$ENV{MR_REPO}/config" &&
+       `GIT_CONFIG="$ENV{MR_REPO}"/config git config --get vcsh.vcsh` =~ /true/
 
 vcsh_update = vcsh run "$MR_REPO" git pull "$@"
 
 
 vcsh_update = vcsh run "$MR_REPO" git pull "$@"
 
diff --git a/mr b/mr
index 23178a5c2bb03e3528aceae6f366fcdeb8f8eb1c..262fab59519a63a20f4700271ccb455d74fc6acf 100755 (executable)
--- a/mr
+++ b/mr
@@ -467,13 +467,6 @@ can be constructed accumulatively.
 The name of the version control system is itself determined by
 running each defined "VCS_test" action, until one succeeds.
 
 The name of the version control system is itself determined by
 running each defined "VCS_test" action, until one succeeds.
 
-=item VCS_dir_test
-
-This is a more optimised way to test for the version control system.
-Each "VCS_dir_test" action is run once, and can output lines consisting
-of the name of a VCS, and a directory to look for in the top of a repo
-to detect that VCS.
-
 =back
 
 =head1 UNTRUSTED MRCONFIG FILES
 =back
 
 =head1 UNTRUSTED MRCONFIG FILES
@@ -594,17 +587,22 @@ sub runsh {
        $runner->($shellcode);
 }
 
        $runner->($shellcode);
 }
 
-sub runshpipe {
-       runsh @_, sub {
-               my $sh=shift;
-               my $ret=`$sh`;
-               chomp $ret;
-               return $ret;
-       };
+my %perl_cache;
+sub perl {
+       my $id=shift;
+       my $s=shift;
+       if ($s =~ m/^perl:\s+(.*)/s) {
+               return $perl_cache{$1} if exists $perl_cache{$1};
+               my $sub=eval "sub {$1}";
+               if (! defined $sub) {
+                       print STDERR "mr: bad perl code in $id: $@\n";
+               }
+               return $perl_cache{$1} = $sub;
+       }
+       return undef;
 }
 
 my %vcs;
 }
 
 my %vcs;
-my %vcs_dir_test;
 sub vcs_test {
        my ($action, $dir, $topdir, $subdir) = @_;
 
 sub vcs_test {
        my ($action, $dir, $topdir, $subdir) = @_;
 
@@ -613,53 +611,46 @@ sub vcs_test {
        }
 
        my $test="";
        }
 
        my $test="";
-       my $dir_test="";
+       my %perltest;
        foreach my $vcs_test (
                        sort {
                                length $a <=> length $b 
                                          ||
                                       $a cmp $b
                        } grep { /_test$/ } keys %{$config{$topdir}{$subdir}}) {
        foreach my $vcs_test (
                        sort {
                                length $a <=> length $b 
                                          ||
                                       $a cmp $b
                        } grep { /_test$/ } keys %{$config{$topdir}{$subdir}}) {
-               if ($vcs_test =~ /(.*)_dir_test/) {
-                       my $vcs=$1;
-                       if (! defined $vcs_dir_test{$vcs}) {
-                               $dir_test.=$config{$topdir}{$subdir}{$vcs_test}."\n";
-                       }
-                       next;
-               }
                my ($vcs)=$vcs_test =~ /(.*)_test/;
                my ($vcs)=$vcs_test =~ /(.*)_test/;
-               $test="my_$vcs_test() {\n$config{$topdir}{$subdir}{$vcs_test}\n}\n".$test;
-               $test.="if my_$vcs_test; then echo $vcs; fi\n";
-       }
-
-       if (length $dir_test) {
-               runsh "vcs dir test", $topdir, $subdir, $dir_test, [], sub {
-                       my $sh=shift;
-                       foreach my $line (`$sh`) {
-                               chomp $line;
-                               my ($vcs, $dir)=split(" ", $line);
-                               $vcs_dir_test{$vcs}=$dir;
-                       }
+               my $p=perl($vcs_test, $config{$topdir}{$subdir}{$vcs_test});
+               if (defined $p) {
+                       $perltest{$vcs}=$p;
+               }
+               else {
+                       $test="my_$vcs_test() {\n$config{$topdir}{$subdir}{$vcs_test}\n}\n".$test;
+                       $test.="if my_$vcs_test; then echo $vcs; fi\n";
                }
        }
 
                }
        }
 
-       foreach my $vcs (keys %vcs_dir_test) {
-               if (-d "$ENV{MR_REPO}/$vcs_dir_test{$vcs}") {
-                       return $vcs{$dir}=$vcs;
+       my @vcs;
+       foreach my $vcs (keys %perltest) {
+               if ($perltest{$vcs}->()) {
+                       push @vcs, $vcs;
                }
        }
 
                }
        }
 
-       my $vcs=runshpipe "vcs test", $topdir, $subdir, $test, [];
-       if ($vcs=~/\n/s) {
-               $vcs=~s/\n/, /g;
-               print STDERR "mr $action: found multiple possible repository types ($vcs) for ".fulldir($topdir, $subdir)."\n";
+       push @vcs, split(/\n/,
+               runsh("vcs test", $topdir, $subdir, $test, [], sub {
+                       my $sh=shift;
+                       my $ret=`$sh`;
+                       return $ret;
+               })) if length $test;
+       if (@vcs > 1) {
+               print STDERR "mr $action: found multiple possible repository types (@vcs) for ".fulldir($topdir, $subdir)."\n";
                return undef;
        }
                return undef;
        }
-       if (! length $vcs) {
+       if (! @vcs) {
                return $vcs{$dir}=undef;
        }
        else {
                return $vcs{$dir}=undef;
        }
        else {
-               return $vcs{$dir}=$vcs;
+               return $vcs{$dir}=$vcs[0];
        }
 }
        
        }
 }
        
@@ -1867,17 +1858,17 @@ lib =
                fi
        }
 
                fi
        }
 
-svn_dir_test = echo svn .svn
-git_dir_test = echo git .git
-bzr_dir_test = echo bzr .bzr
-cvs_dir_test = echo cvs CVS
-hg_dir_test  = echo hg .hg
-darcs_dir_test = echo darcs _darcs
-fossil_test = test -f "$MR_REPO"/_FOSSIL_
-git_bare_test =
-       test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&
-       test -d "$MR_REPO"/objects && test -f "$MR_REPO"/config &&
-       test "`GIT_CONFIG="$MR_REPO"/config git config --get core.bare`" = true
+svn_test = perl: -d "$ENV{MR_REPO}/.svn"
+git_test = perl: -d "$ENV{MR_REPO}/.git"
+bzr_test = perl: -d "$ENV{MR_REPO}/.bzr"
+cvs_test = perl: -d "$ENV{MR_REPO}/CVS"
+hg_test  = perl: -d "$ENV{MR_REPO}/.hg"
+darcs_test = perl: -d "$ENV{MR_REPO}/_darcs"
+fossil_test = perl: -f "$ENV{MR_REPO}/_FOSSIL_"
+git_bare_test = perl: 
+       -d "$ENV{MR_REPO}/refs/heads" && -d "$ENV{MR_REPO}/refs/tags" &&
+       -d "$ENV{MR_REPO}/objects" && -f "$ENV{MR_REPO}/config" &&
+       `GIT_CONFIG="$ENV{MR_REPO}"/config git config --get core.bare` =~ /true/
 
 svn_update = svn update "$@"
 git_update = git pull "$@"
 
 svn_update = svn update "$@"
 git_update = git pull "$@"
hacking on myrepos

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.