def main():
parser = make_parser()
args = parser.parse_args()
# if len(args)!=3:
# parser.error("Incorrect number of arguments.")
# setup the environment
module = args.module_name
release_number = args.release
branch_name = args.branch_name
# import svn client
from dls_environment.svn import svnClient
svn = svnClient()
svn.setLogMessage(module + ": creating bugfix branch " + branch_name)
# setup area
if args.area == "ioc":
assert len(module.split('/')) > 1, "Missing Technical Area under Beamline"
release = os.path.join(gitf.prodModule(module, args.area), release_number)
branch = os.path.join(gitf.branchModule(module, args.area), branch_name)
# Check for existence of release in svn, non-existence of branch in svn and current directory
assert svn.pathcheck(release), 'Repository does not contain "' + release + '"'
assert not svn.pathcheck(branch), 'Repository already contains "' + branch + '"'
assert not os.path.isdir(branch.split("/")[-1]), \
branch.split("/")[-1] + " already exists in this directory. " \
"Please choose another name or move elsewhere."
# Make the module in branch directory if it doesn't exist
if not svn.pathcheck(gitf.branchModule(module, args.area)):
svn.mkdir(gitf.branchModule(module, args.area))
svn.copy(release, branch)
print 'Created bugfix branch from ' + module + ': ' + \
release_number + " in " + branch
svn.checkout(branch, branch_name)
print 'Checked out to ./' + branch_name
def main():
parser = make_parser()
args = parser.parse_args()
# if len(args)!=2:
# parser.error("Incorrect number of arguments.")
# setup the environment
module = args.module_name
branch_name = args.branch_name
svn.setLogMessage(module + ": creating feature branch " + branch_name)
if args.area == "ioc":
assert len(module.split('/')) > 1, "Missing Technical Area under Beamline"
source = gitf.devModule(module, args.area)
branch = os.path.join(svn.branchModule(module, args.area), branch_name)
# Check for existence of release in svn, non-existence of branch in svn and current directory
assert svn.pathcheck(source), 'Repository does not contain "' + source + '"'
assert not svn.pathcheck(branch), 'Repository already contains "' + branch + '"'
assert not os.path.isdir(branch.split("/")[-1]), \
branch.split("/")[-1] + " already exists in this directory. " \
"Please choose another name or move elsewhere."
# make the branches directory
svn.mkdir(gitf.branchModule(module, args.area))
svn.copy(source, branch)
# checkout module
tempdir = os.path.join('/tmp/svn', branch_name)
if os.path.isdir(tempdir):
shutil.rmtree(tempdir)
svn.checkout(branch, tempdir)
entry = svn.info(tempdir)
# Find the revision number from "info" and set the property "dls:synced-from-trunk"
# to this value. This property tells us how far up the trunk we have merged into
# this branch.
print('Setting "dls:synced-from-trunk" property for this branch')
svn.propset('dls:synced-from-trunk', str(entry.revision.number), tempdir,
svn.Revision(svn.opt_revision_kind.working))
mess = module + '/' + branch_name + ': Setting synced-from-trunk property'
svn.checkin(tempdir, mess, True)
shutil.rmtree(tempdir)
print("")
# Is the current directory a working SVN directory?
isWC = svn.workingCopy()
if isWC:
if isWC.url == source:
# if the directory is a WC of the source check for modified files
status_list = svn.status('.', True, True, True, True)
for x in status_list:
if str(x.repos_text_status) == 'modified':
print('The file "' + x.path + '" has been modified in the trunk,')
print('therefore cannot switch this working SVN directory to the '
'new branch')
print("")
print('To create a working directory from the new branch')
print('change directories and run:')
print('svn checkout ' + branch)
return
# if no files have been modified ask to switch the directory to the branch
print('This is an SVN working directory for:')
print('"' + source + '"')
answer = raw_input("Do you want to switch this working directory onto the new branch? (Enter 'Y' or 'N'")
if answer.upper() is "Y":
print('Switching this working directory to the new branch ' +
args.branch_name)
svn.switch('.', branch)
else:
print('NOT switching this working directory to the new branch')
print
print('To create a working directory from this new branch,')
print('change directories and run:')
print('svn checkout ' + branch)
else:
# if it is a WC of somewhere else then just leave it
print('This is an SVN working directory but not for:')
print('"' + source + '"')
print
print('To create a working directory from this new branch,')
print('change directories and run:')
print('svn checkout ' + branch)
else:
# check out the branch to ./module/branch_name
print('Checking out:')
print(branch + '...')
svn.checkout(branch, branch.split("/")[-1])
