summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorMartin Langhoff <martin@catalyst.net.nz>2007-01-08 01:11:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-08 02:06:49 (GMT)
commit6211988f77ab20cc8705fb8c9ecb72ba166b80da (patch)
treeba4eaa3e07de1a98df5b10089e7903d068bbf026 /git-cvsimport.perl
parent3faa541fa924890b85b240b800312befbf052b9f (diff)
downloadgit-6211988f77ab20cc8705fb8c9ecb72ba166b80da.zip
git-6211988f77ab20cc8705fb8c9ecb72ba166b80da.tar.gz
git-6211988f77ab20cc8705fb8c9ecb72ba166b80da.tar.bz2
cvsimport: skip commits that are too recent
With this patch, cvsimport will skip commits made in the last 10 minutes. The recent-ness test is of 5 minutes + cvsps fuzz window (5 minutes default). When working with a CVS repository that is in use, importing commits that are too recent can lead to partially incorrect trees. This is mainly due to - Commits that are within the cvsps fuzz window may later be found to have affected more files. - When performing incremental imports, clock drift between the systems may lead to skipped commits. This commit helps keep incremental imports of in-use CVS repositories sane. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl14
1 files changed, 14 insertions, 0 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index c5bf2d1..2686775 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -129,6 +129,11 @@ if ($opt_M) {
push (@mergerx, qr/$opt_M/);
}
+# Remember UTC of our starting time
+# we'll want to avoid importing commits
+# that are too recent
+our $starttime = time();
+
select(STDERR); $|=1; select(STDOUT);
@@ -824,6 +829,15 @@ while (<CVS>) {
$state = 11;
next;
}
+ if ( $starttime - 300 - (defined $opt_z ? $opt_z : 300) <= $date) {
+ # skip if the commit is too recent
+ # that the cvsps default fuzz is 300s, we give ourselves another
+ # 300s just in case -- this also prevents skipping commits
+ # due to server clock drift
+ print "skip patchset $patchset: $date too recent\n" if $opt_v;
+ $state = 11;
+ next;
+ }
if (exists $ignorebranch{$branch}) {
print STDERR "Skipping $branch\n";
$state = 11;