--- a/branches/13-jobs/cforge/cforge/Package/CFORGE/Scripts/commit.py +++ b/branches/13-jobs/cforge/cforge/Package/CFORGE/Scripts/commit.py @@ -20,26 +20,32 @@ return help -if len(sys.argv) <= 1: - print("Oh, there are no arguments. Perhaps you forgot something?") - sys.exit() -folder = sys.argv[1] -# if folder can't be found, try to interpret it as a repo -# name, relatively to the workspace folder -if not os.path.isdir(folder): - config = ui.GetSettings() - workspace, file = ntpath.split(config['folder']) - folder = os.path.join(workspace, folder) - -print("commiting folder: %s" % folder) - -stat = pysvn.svn_get_stat(folder) -config = ui.Dialog("Commit", Credentials=True, Info=True, InfoText=stat, Message=True) - -if config != None: +def do(folder, username, password, message): scriptpath = os.path.abspath(os.path.dirname(sys.argv[0])) scriptname = os.path.join(scriptpath, "action.svn.commit.py") - scriptargs = "%s %s %s %s" % (config["user"], config["pass"], folder, config["msg"]) + scriptargs = "%s %s %s %s" % (username, password, folder, message) cds_script.RunCodesysWithScript(scriptname, scriptargs, False) + +# call main +if __name__ == "__main__": + if len(sys.argv) <= 1: + print("Oh, there are no arguments. Perhaps you forgot something?") + sys.exit() + folder = sys.argv[1] + + # if folder can't be found, try to interpret it as a repo + # name, relatively to the workspace folder + if not os.path.isdir(folder): + config = ui.GetSettings() + workspace, file = ntpath.split(config['folder']) + folder = os.path.join(workspace, folder) + + print("commiting folder: %s" % folder) + + stat = pysvn.svn_get_stat(folder) + config = ui.Dialog("Commit", Credentials=True, Info=True, InfoText=stat, Message=True) + + if config != None: + do(folder, config["user"], config["pass"], config["msg"])