Attachment #15652 for bug #4229




"--quiet",        "--resume",
"--searchdesc",   "--selective",
"--skipfirst",
"--tree",
"--update",       "--upgradeonly",
"--usepkg",       "--usepkgonly",
"--verbose",      "--version"

"p":"--pretend",   "P":"--prune",
"q":"--quiet",
"s":"--search",    "S":"--searchdesc",
't':"--tree",
"u":"--update",    "U":"--upgradeonly",
"v":"--verbose",   "V":"--version"
}

	
	def display(self,mylist):
		changelogs=[]
		allmyprint=[]
		for x in mylist:
			#print x
			fetch=" "

				oldlp=mywidth-30
				newlp=oldlp-30
				
				mygraph = self.digraph.copy()
				indent=""
				if ("--tree" in myopts):
					indent=" "*mygraph.depth(string.join(x))

				if x[1]!="/":
					if "--columns" in myopts:
						myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
						if (newlp-len(myprint)) > 0:
							myprint=myprint+(" "*(newlp-len(myprint)))
						myprint=myprint+"["+darkblue(xs[1]+xs[2])+"] "

						myprint="["+x[0]+" "+addl+"] "+darkgreen(x[2])+" "+myoldbest+" "+darkgreen("to "+x[1])+" "+iuse
				else:
					if "--columns" in myopts:
						myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
						if (newlp-len(myprint)) > 0:
							myprint=myprint+(" "*(newlp-len(myprint)))
						myprint=myprint+green(" ["+xs[1]+xs[2]+"] ")

							myprint=myprint+(" "*(oldlp-len(myprint)))
						myprint=myprint+myoldbest+"  "+iuse
					else:
						myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(x[2])+" "+myoldbest+" "+iuse
				allmyprint.append(myprint)

			mysplit=portage.pkgsplit(x[2])
			# XXX mysplit _can_ be None.... Why?

							print
			del mysplit

		if ("--tree" in myopts):
			allmyprint.reverse()

		for x in allmyprint:
			print x

 		if "--changelog" in myopts:
 			print
 			for revision,text in changelogs:

Lines 369-375 Link Here

(-)portage.py.org (-1 / +8 lines)
369	for x in self.okeys:	369	for x in self.okeys:
370	if self.dict[x][0]==0:	370	if self.dict[x][0]==0:
371	return x	371	return x
372	return None	372	return None
		373
		374	def depth(self, mykey):
		375	depth=0
		376	while (self.dict[mykey][1]):
		377	depth=depth+1
		378	mykey=self.dict[mykey][1][0]
		379	return depth
373		380
374	def allzeros(self):	381	def allzeros(self):
375	"returns all nodes with zero references, or NULL if no such node exists"	382	"returns all nodes with zero references, or NULL if no such node exists"

Return to bug 4229

Lines 52-57 Link Here

(-)emerge.org (-4 / +18 lines)
52	"--quiet", "--resume",	52	"--quiet", "--resume",
53	"--searchdesc", "--selective",	53	"--searchdesc", "--selective",
54	"--skipfirst",	54	"--skipfirst",
		55	"--tree",
55	"--update", "--upgradeonly",	56	"--update", "--upgradeonly",
56	"--usepkg", "--usepkgonly",	57	"--usepkg", "--usepkgonly",
57	"--verbose", "--version"	58	"--verbose", "--version"
Lines 73-78 Link Here
73	"p":"--pretend", "P":"--prune",	74	"p":"--pretend", "P":"--prune",
74	"q":"--quiet",	75	"q":"--quiet",
75	"s":"--search", "S":"--searchdesc",	76	"s":"--search", "S":"--searchdesc",
		77	't':"--tree",
76	"u":"--update", "U":"--upgradeonly",	78	"u":"--update", "U":"--upgradeonly",
77	"v":"--verbose", "V":"--version"	79	"v":"--verbose", "V":"--version"
78	}	80	}
Lines 995-1000 Link Here
995		997
996	def display(self,mylist):	998	def display(self,mylist):
997	changelogs=[]	999	changelogs=[]
		1000	allmyprint=[]
998	for x in mylist:	1001	for x in mylist:
999	#print x	1002	#print x
1000	fetch=" "	1003	fetch=" "
Lines 1080-1088 Link Here
1080	oldlp=mywidth-30	1083	oldlp=mywidth-30
1081	newlp=oldlp-30	1084	newlp=oldlp-30
1082		1085
		1086	mygraph = self.digraph.copy()
		1087	indent=""
		1088	if ("--tree" in myopts):
		1089	indent=" "*mygraph.depth(string.join(x))
		1090
1083	if x[1]!="/":	1091	if x[1]!="/":
1084	if "--columns" in myopts:	1092	if "--columns" in myopts:
1085	myprint="["+x[0]+" "+addl+"] "+darkgreen(xs[0])	1093	myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
1086	if (newlp-len(myprint)) > 0:	1094	if (newlp-len(myprint)) > 0:
1087	myprint=myprint+(" "*(newlp-len(myprint)))	1095	myprint=myprint+(" "*(newlp-len(myprint)))
1088	myprint=myprint+"["+darkblue(xs[1]+xs[2])+"] "	1096	myprint=myprint+"["+darkblue(xs[1]+xs[2])+"] "
Lines 1094-1100 Link Here
1094	myprint="["+x[0]+" "+addl+"] "+darkgreen(x[2])+" "+myoldbest+" "+darkgreen("to "+x[1])+" "+iuse	1102	myprint="["+x[0]+" "+addl+"] "+darkgreen(x[2])+" "+myoldbest+" "+darkgreen("to "+x[1])+" "+iuse
1095	else:	1103	else:
1096	if "--columns" in myopts:	1104	if "--columns" in myopts:
1097	myprint="["+x[0]+" "+addl+"] "+darkgreen(xs[0])	1105	myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
1098	if (newlp-len(myprint)) > 0:	1106	if (newlp-len(myprint)) > 0:
1099	myprint=myprint+(" "*(newlp-len(myprint)))	1107	myprint=myprint+(" "*(newlp-len(myprint)))
1100	myprint=myprint+green(" ["+xs[1]+xs[2]+"] ")	1108	myprint=myprint+green(" ["+xs[1]+xs[2]+"] ")
Lines 1102-1109 Link Here
1102	myprint=myprint+(" "*(oldlp-len(myprint)))	1110	myprint=myprint+(" "*(oldlp-len(myprint)))
1103	myprint=myprint+myoldbest+" "+iuse	1111	myprint=myprint+myoldbest+" "+iuse
1104	else:	1112	else:
1105	myprint="["+x[0]+" "+addl+"] "+darkgreen(x[2])+" "+myoldbest+" "+iuse	1113	myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(x[2])+" "+myoldbest+" "+iuse
1106	print myprint	1114	allmyprint.append(myprint)
1107		1115
1108	mysplit=portage.pkgsplit(x[2])	1116	mysplit=portage.pkgsplit(x[2])
1109	# XXX mysplit _can_ be None.... Why?	1117	# XXX mysplit _can_ be None.... Why?
Lines 1126-1131 Link Here
1126	print	1134	print
1127	del mysplit	1135	del mysplit
1128		1136
		1137	if ("--tree" in myopts):
		1138	allmyprint.reverse()
		1139
		1140	for x in allmyprint:
		1141	print x
		1142
1129	if "--changelog" in myopts:	1143	if "--changelog" in myopts:
1130	print	1144	print
1131	for revision,text in changelogs:	1145	for revision,text in changelogs: