user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] convert: copy description and git config from v1 repo
Date: Fri, 20 Apr 2018 07:21:56 +0000	[thread overview]
Message-ID: <20180420072156.GA32492@dcvr> (raw)

I noticed I lost a $GIT_DIR/description in a conversion, so we
should preserve it.  While we're at it, we ought to copy any
config in the old repo to the new one.

We will need to warn about cloneurl since it's unfortunately
not an automatic process to update.  Oh well..
---
 Maybe a "v1.5" repo format which for lists which will never grow
 too large can be more convenient for cloners and existing v1
 lists...

 script/public-inbox-convert | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index 2742be7..2979a0c 100755
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -11,6 +11,7 @@ use PublicInbox::V2Writable;
 use PublicInbox::Import;
 use PublicInbox::Spawn qw(spawn);
 use Cwd 'abs_path';
+use File::Copy 'cp'; # preserves permissions:
 my $usage = "Usage: public-inbox-convert OLD NEW\n";
 my $jobs;
 my $index = 1;
@@ -50,16 +51,22 @@ $new->{version} = 2;
 $new = PublicInbox::InboxWritable->new($new);
 my $v2w;
 $old->umask_prepare;
+
+sub link_or_copy ($$) {
+	my ($src, $dst) = @_;
+	link($src, $dst) and return;
+	$!{EXDEV} or warn "link $src, $dst failed: $!, trying cp\n";
+	cp($src, $dst) or die "cp $src, $dst failed: $!\n";
+}
+
 $old->with_umask(sub {
-	local $ENV{GIT_CONFIG} = "$old->{mainrepo}/config";
+	my $old_cfg = "$old->{mainrepo}/config";
+	local $ENV{GIT_CONFIG} = $old_cfg;
+	my $new_cfg = "$new->{mainrepo}/all.git/config";
 	$v2w = PublicInbox::V2Writable->new($new, 1);
 	$v2w->init_inbox($jobs);
-	chomp(my $sr = $old->git->qx('config', 'core.sharedRepository'));
-	if ($sr ne '') {
-		PublicInbox::Import::run_die(['git', 'config',
-			"--file=$new->{mainrepo}/all.git/config",
-			'core.sharedRepository', $sr]);
-	}
+	unlink $new_cfg;
+	link_or_copy($old_cfg, $new_cfg);
 	if (my $alt = $new->{altid}) {
 		require PublicInbox::AltId;
 		foreach my $i (0..$#$alt) {
@@ -70,6 +77,14 @@ $old->with_umask(sub {
 			$src->mm_alt->{dbh}->sqlite_backup_to_file($dst);
 		}
 	}
+	my $desc = "$old->{mainrepo}/description";
+	link_or_copy($desc, "$new->{mainrepo}/description") if -e $desc;
+	my $clone = "$old->{mainrepo}/cloneurl";
+	if (-e $clone) {
+		warn <<"";
+$clone may not be valid after migrating to v2, not copying
+
+	}
 });
 my $state = '';
 my ($prev, $from);
-- 
EW

                 reply	other threads:[~2018-04-20  7:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180420072156.GA32492@dcvr \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).