##// END OF EJS Templates
obsutil: make obsfateprinter() less dependent on templater...
Yuya Nishihara -
r37344:11d51e51 default
parent child Browse files
Show More
@@ -832,7 +832,7 b' def markersoperations(markers):'
832
832
833 return sorted(operations)
833 return sorted(operations)
834
834
835 def obsfateprinter(successors, markers, ui):
835 def obsfateprinter(ui, repo, successors, markers, formatctx):
836 """ Build a obsfate string for a single successorset using all obsfate
836 """ Build a obsfate string for a single successorset using all obsfate
837 related function defined in obsutil
837 related function defined in obsutil
838 """
838 """
@@ -852,7 +852,7 b' def obsfateprinter(successors, markers, '
852
852
853 # Successors
853 # Successors
854 if successors:
854 if successors:
855 fmtsuccessors = [successors.joinfmt(succ) for succ in successors]
855 fmtsuccessors = [formatctx(repo[succ]) for succ in successors]
856 line.append(" as %s" % ", ".join(fmtsuccessors))
856 line.append(" as %s" % ", ".join(fmtsuccessors))
857
857
858 # Users
858 # Users
@@ -498,10 +498,13 b' def showobsfate(context, mapping):'
498 succsandmarkers = showsuccsandmarkers(context, mapping)
498 succsandmarkers = showsuccsandmarkers(context, mapping)
499
499
500 ui = context.resource(mapping, 'ui')
500 ui = context.resource(mapping, 'ui')
501 repo = context.resource(mapping, 'repo')
501 values = []
502 values = []
502
503
503 for x in succsandmarkers:
504 for x in succsandmarkers:
504 values.append(obsutil.obsfateprinter(x['successors'], x['markers'], ui))
505 v = obsutil.obsfateprinter(ui, repo, x['successors'], x['markers'],
506 scmutil.formatchangeid)
507 values.append(v)
505
508
506 return compatlist(context, mapping, "fate", values)
509 return compatlist(context, mapping, "fate", values)
507
510
General Comments 0
You need to be logged in to leave comments. Login now