From 6650ecfb0a3f0de88fdd2423970c020799dde30b Mon Sep 17 00:00:00 2001 From: mhagger Date: Tue, 18 Jun 2013 09:22:58 +0000 Subject: [PATCH] cvs2git: Emit some more information in OutputPass. During OutputPass of cvs2git, output the correspondence between the SVN revnums used in CreateRevsPass and the commit marks written to the dumpfile. This gives users a hope of determining which CVS file revisions are added in which Git commits (though they still have to convert marks -> SHA1s themselves). git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@5432 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- cvs2svn_lib/git_output_option.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cvs2svn_lib/git_output_option.py b/cvs2svn_lib/git_output_option.py index d7afa4b8..ff056c35 100644 --- a/cvs2svn_lib/git_output_option.py +++ b/cvs2svn_lib/git_output_option.py @@ -269,10 +269,12 @@ class GitOutputOption(DVCSOutputOption): self.f.write('commit refs/heads/master\n') else: self.f.write('commit refs/heads/%s\n' % (lod.name,)) - self.f.write( - 'mark :%d\n' - % (self._create_commit_mark(lod, svn_commit.revnum),) + mark = self._create_commit_mark(lod, svn_commit.revnum) + logger.normal( + 'Writing commit r%d on %s (mark :%d)' + % (svn_commit.revnum, lod, mark,) ) + self.f.write('mark :%d\n' % (mark,)) self.f.write( 'committer %s %d +0000\n' % (author, svn_commit.date,) ) @@ -298,10 +300,12 @@ class GitOutputOption(DVCSOutputOption): self._mirror.start_commit(svn_commit.revnum) # FIXME: is this correct?: self.f.write('commit refs/heads/master\n') - self.f.write( - 'mark :%d\n' - % (self._create_commit_mark(None, svn_commit.revnum),) + mark = self._create_commit_mark(None, svn_commit.revnum) + logger.normal( + 'Writing post-commit r%d on %s (mark :%d)' + % (svn_commit.revnum, lod, mark,) ) + self.f.write('mark :%d\n' % (mark,)) self.f.write( 'committer %s %d +0000\n' % (author, svn_commit.date,) ) -- 2.11.4.GIT