From 49e3e6196c243ba1995ec1000b51ccee768493a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 11 Jul 2010 11:50:02 +0200 Subject: Rewrite VCS detection code in repoman. Move the real code into repoman.utilities. Support any repository depth for distributed SCMs -- i.e. Sunrise through git-svn. Bail out if more than one control version directory is found at the same depth. --- bin/repoman | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'bin') diff --git a/bin/repoman b/bin/repoman index 324ad2ea2..8ded3475d 100755 --- a/bin/repoman +++ b/bin/repoman @@ -476,17 +476,14 @@ if portdir is None: myreporoot = os.path.basename(portdir_overlay) myreporoot += mydir[len(portdir_overlay):] -vcs = None -if os.path.isdir("CVS"): - vcs = "cvs" -if os.path.isdir(".svn"): - vcs = "svn" -elif os.path.isdir(os.path.join(portdir_overlay, ".git")): - vcs = "git" -elif os.path.isdir(os.path.join(portdir_overlay, ".bzr")): - vcs = "bzr" -elif os.path.isdir(os.path.join(portdir_overlay, ".hg")): - vcs = "hg" +vcses = utilities.FindVCS() +if len(vcses) > 1: + print(red('*** Ambiguous workdir -- more than one VCS found at the same depth: %s.' % ', '.join(vcses))) + sys.exit(1) +elif vcses: + vcs = vcses[0] +else: + vcs = None # Note: We don't use ChangeLogs in distributed SCMs. # It will be generated on server side from scm log, -- cgit v1.2.3-1-g7c22