From owner-svn-src-user@freebsd.org Sun Sep 22 12:33:19 2019
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7B5B21211EC
for <svn-src-user@mailman.nyi.freebsd.org>;
Sun, 22 Sep 2019 12:33:19 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 46bn1C2lm9z3Fxg;
Sun, 22 Sep 2019 12:33:19 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 42F102689D;
Sun, 22 Sep 2019 12:33:19 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8MCXJB8007744;
Sun, 22 Sep 2019 12:33:19 GMT (envelope-from uqs@FreeBSD.org)
Received: (from uqs@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8MCXJ9e007743;
Sun, 22 Sep 2019 12:33:19 GMT (envelope-from uqs@FreeBSD.org)
Message-Id: <201909221233.x8MCXJ9e007743@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: uqs set sender to uqs@FreeBSD.org
using -f
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Sun, 22 Sep 2019 12:33:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r352596 - user/uqs/git_conv
X-SVN-Group: user
X-SVN-Commit-Author: uqs
X-SVN-Commit-Paths: user/uqs/git_conv
X-SVN-Commit-Revision: 352596
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Sep 2019 12:33:19 -0000
Author: uqs
Date: Sun Sep 22 12:33:18 2019
New Revision: 352596
URL: https://svnweb.freebsd.org/changeset/base/352596
Log:
Fix svn2git on large repos by extending the timeout that we wait for fast-import from 30s to 1h.
Also don't use the ports version, as it doesn't have the project branch merge hack. While here
clean up some legacy names.
Modified:
user/uqs/git_conv/git_conv
Modified: user/uqs/git_conv/git_conv
==============================================================================
--- user/uqs/git_conv/git_conv Sun Sep 22 11:40:43 2019 (r352595)
+++ user/uqs/git_conv/git_conv Sun Sep 22 12:33:18 2019 (r352596)
@@ -65,12 +65,11 @@
# And similar for ports and doc.
: ${BASE=/home/git}
: ${RULES_DIR=${BASE}}
-: ${SVN2GIT=/usr/local/bin/svn2git}
+: ${SVN2GIT=${BASE}/svn2git/svn-all-fast-export}
-# xxx_REPO are legacy names, TODO remove them ...
-: ${REPO_base=${SRC_REPO:-/home/svn/base}}
-: ${REPO_doc=${DOC_REPO:-/home/svn/doc}}
-: ${REPO_ports=${PORTS_REPO:-/home/svn/ports}}
+: ${REPO_base=/home/svn/base}
+: ${REPO_doc=/home/svn/doc}
+: ${REPO_ports=/home/svn/ports}
usage()
{
@@ -136,7 +135,7 @@ svn2git()
cd $BASE
echo "Converting $source to $target using svn2git"
- $SVN2GIT --add-metadata-notes --identity-domain FreeBSD.org --rules $rules $source
+ $SVN2GIT --fast-import-timeout 3600 --add-metadata-notes --identity-domain FreeBSD.org --rules $rules $source
if [ $? != 0 ]; then
echo "Error in svn2git conversion of $source" >&2
exit 1