]>
git.madduck.net Git - code/myrepos.git/blobdiff - mr
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:
-B<mr> [options] register repository
+B<mr> [options] register [repository]
B<mr> [options] config section [parameter=[value] ...]
B<mr> [options] config section [parameter=[value] ...]
-The next parameter is the directory of an existing repository. The
-repository will be registered in the mrconfig file.
+Register an existing repository in the mrconfig file. By default, the
+epository in the current directory is registered, or you can specify a
+directory to register.
to add or modify, and it is followed by one or more instances of
"parameter=value". Use "parameter=" to remove a parameter.
to add or modify, and it is followed by one or more instances of
"parameter=value". Use "parameter=" to remove a parameter.
-For example, to register a new svn repository in src/foo:
+For example, to add (or edit) a repository in src/foo:
- mr config src/foo checkout="svn co svn://example.com/foo/trunk"
+ mr config src/foo checkout="svn co svn://example.com/foo/trunk foo "
"mr st" is equivilant to "mr status", and "mr up" is equivilant to "mr
update"
"mr st" is equivilant to "mr status", and "mr up" is equivilant to "mr
update"
-Additional parameters can be passed to other commands than "commit", they
-will be passed on unchanged to the underlying revision control system.
-This is mostly useful if the repositories mr will act on all use the same
-revision control system.
+Additional parameters can be passed to most commands, and are passed on
+unchanged to the underlying revision control system. This is mostly useful
+if the repositories mr will act on all use the same revision control
+system.
if (exists $config{$topdir}{$subdir}{deleted}) {
if (! -d $dir) {
if (exists $config{$topdir}{$subdir}{deleted}) {
if (! -d $dir) {
}
else {
my $test="set -e;".$lib.$config{$topdir}{$subdir}{deleted};
}
else {
my $test="set -e;".$lib.$config{$topdir}{$subdir}{deleted};
+ if (! -e $f) {
+ return;
+ }
+
my $absf=abs_path($f);
if ($loaded{$absf}) {
return;
my $absf=abs_path($f);
if ($loaded{$absf}) {
return;
my %changefields=@_;
my @lines;
my %changefields=@_;
my @lines;
if (-e $f) {
open(my $in, "<", $f) || die "mr: open $f: $!\n";
@lines=<$in>;
close $in;
}
if (-e $f) {
open(my $in, "<", $f) || die "mr: open $f: $!\n";
@lines=<$in>;
close $in;
}
+ my $addfields=sub {
+ my @blanks;
+ while ($out[$#out] =~ /^\s*$/) {
+ unshift @blanks, pop @out;
+ }
+ foreach my $field (sort keys %changefields) {
+ if (length $changefields{$field}) {
+ push @out, "$field = $changefields{$field}\n";
+ }
+ }
+ push @out, @blanks;
+ };
+
while (@lines) {
$_=shift(@lines);
while (@lines) {
$_=shift(@lines);
elsif (/^\s*\[([^\]]*)\]\s*$/) {
if (defined $section &&
$section eq $targetsection) {
elsif (/^\s*\[([^\]]*)\]\s*$/) {
if (defined $section &&
$section eq $targetsection) {
- my @blanks;
- while ($out[$#out] =~ /^\s*$/) {
- unshift @blanks, pop @out;
- }
- foreach my $field (sort keys %changefields) {
- if (length $changefields{$field}) {
- push @out, "$field = $changefields{$field}\n";
- }
- }
- push @out, @blanks;
+ if (defined $section &&
+ $section eq $targetsection) {
+ $addfields->();
+ }
+ elsif (%changefields) {
push @out, "\n[$targetsection]\n";
foreach my $field (sort keys %changefields) {
if (length $changefields{$field}) {
push @out, "\n[$targetsection]\n";
foreach my $field (sort keys %changefields) {
if (length $changefields{$field}) {
error "unknown repo type" \
fi
register = \
error "unknown repo type" \
fi
register = \
- if [ -z "$1" ]; then \
- error "repository directory not specified" \
+ if [ -n "$1" ]; then \
+ cd "$1" \
basedir="$(basename $(pwd))" \
if [ -d .svn ]; then \
basedir="$(basename $(pwd))" \
if [ -d .svn ]; then \
+ url=$(LANG=C svn info . | \
grep -i ^URL: | cut -d ' ' -f 2) \
if [ -z "$url" ]; then \
error "cannot determine svn url" \
fi \
grep -i ^URL: | cut -d ' ' -f 2) \
if [ -z "$url" ]; then \
error "cannot determine svn url" \
fi \
- echo "Found svn url: $url" \
+ echo "Registering svn url: $url" \
mr config "$(pwd)" checkout="svn co $url $basedir" \
elif [ -d .git ]; then \
mr config "$(pwd)" checkout="svn co $url $basedir" \
elif [ -d .git ]; then \
- url=$(git-config --get remote.origin.url) \
+ url=$(LANG=C git-config --get remote.origin.url) \
if [ -z "$url" ]; then \
error "cannot determine git url" \
fi \
if [ -z "$url" ]; then \
error "cannot determine git url" \
fi \
- echo "Found git url: $url" \
+ echo "Registering git url: $url" \
mr config "$(pwd)" checkout="git clone $url $basedir" \
mr config "$(pwd)" checkout="git clone $url $basedir" \
+ elif [ -d .bzr ]; then \
+ url=$(cat .bzr/branch/parent) \
+ if [ -z "$url" ]; then \
+ error "cannot determine bzr url" \
+ fi \
+ echo "Registering bzr url: $url" \
+ mr config "$(pwd)" checkout="bzr clone $url $basedir" \
else \
error "unable to register this repo type" \
fi
else \
error "unable to register this repo type" \
fi
projects / code / myrepos.git / blobdiff