git-package-pseudomerge.py File Reference

Go to the source code of this file.

Classes
class	git-package-pseudomerge.bcolors

Namespaces
namespace	git-package-pseudomerge
namespace	git
	-package-pseudomerge

Functions
	git-package-pseudomerge.sortBySplitLen (element)

Variables
str	git-package-pseudomerge.__author__ = "Tim Martin"
str	git-package-pseudomerge.__version__ = "$Revision: 1.0 $"
str	git-package-pseudomerge.__doc__ = "Merge individual Athena packages between git branches. Commit the resulting diff as a cherry-pick."
	git-package-pseudomerge.parser
	git-package-pseudomerge.type
	git-package-pseudomerge.str
	git-package-pseudomerge.nargs
	git-package-pseudomerge.required
	git-package-pseudomerge.help
	git-package-pseudomerge.default
	git-package-pseudomerge.action
	git-package-pseudomerge.args = parser.parse_args()
	git-package-pseudomerge.packages
	git-package-pseudomerge.key
	git-package-pseudomerge.stderr
	git-package-pseudomerge.STDOUT
	git-package-pseudomerge.stdout
str	git-package-pseudomerge.userBranch = os.environ['USER'] + "_" + time.strftime('%d_%b') + "_" + args.packages[0].rstrip('/').split('/')[-1] + "_to_" + args.target.split('/')[-1]
str	git-package-pseudomerge.userTempBranch = userBranch + "_TEMP_BRANCH_DO_NOT_MERGE_TO_OFFICIAL_REPOSITORY"
	git-package-pseudomerge.localChanges = check_output(["git", "status", "--porcelain"],text=True)
	git-package-pseudomerge.prompt = input(bcolors.WARNING + 'This will discard all local changes in the repository which are not already committed, please confirm this is OK! (y/n): ' + bcolors.ENDC)
	git-package-pseudomerge.result = check_output(["git", "status", "--porcelain"],text=True)
list	git-package-pseudomerge.toReset = []
str	git-package-pseudomerge.responsibleRule = ""
	git-package-pseudomerge.fileTuple = line.split()
	git-package-pseudomerge.fileSplit = fileTuple[1].split('/')
int	git-package-pseudomerge.level = 0
str	git-package-pseudomerge.resetPath = ''
bool	git-package-pseudomerge.doKeep = False
bool	git-package-pseudomerge.doProgress = False
	git-package-pseudomerge.pathSplit = path.rstrip('/').split('/')
	git-package-pseudomerge.conflicted = check_output(["git", "diff", "--name-only", "--diff-filter=U"],text=True)
str	git-package-pseudomerge.allPackages = ""
str	git-package-pseudomerge.commitMessage = "Update packages:" + allPackages + " from " + args.source + " to " + args.target + " via pseudo-merge"