# HG changeset patch # User Yuya Nishihara # Date 1521459126 -32400 # Node ID 11d51e5188088e86043029fe62023cdd45d41f5b # Parent ebf139cbd4a182e45245212d3830277ee91e4620 obsutil: make obsfateprinter() less dependent on templater joinfmt() is defined as 'lambda x: scmutil.formatchangeid(repo[x])' in showsuccsandmarkers(). Function arguments are reordered so they look more normal. diff -r ebf139cbd4a1 -r 11d51e518808 mercurial/obsutil.py --- a/mercurial/obsutil.py Sat Mar 17 22:06:31 2018 +0900 +++ b/mercurial/obsutil.py Mon Mar 19 20:32:06 2018 +0900 @@ -832,7 +832,7 @@ return sorted(operations) -def obsfateprinter(successors, markers, ui): +def obsfateprinter(ui, repo, successors, markers, formatctx): """ Build a obsfate string for a single successorset using all obsfate related function defined in obsutil """ @@ -852,7 +852,7 @@ # Successors if successors: - fmtsuccessors = [successors.joinfmt(succ) for succ in successors] + fmtsuccessors = [formatctx(repo[succ]) for succ in successors] line.append(" as %s" % ", ".join(fmtsuccessors)) # Users diff -r ebf139cbd4a1 -r 11d51e518808 mercurial/templatekw.py --- a/mercurial/templatekw.py Sat Mar 17 22:06:31 2018 +0900 +++ b/mercurial/templatekw.py Mon Mar 19 20:32:06 2018 +0900 @@ -498,10 +498,13 @@ succsandmarkers = showsuccsandmarkers(context, mapping) ui = context.resource(mapping, 'ui') + repo = context.resource(mapping, 'repo') values = [] for x in succsandmarkers: - values.append(obsutil.obsfateprinter(x['successors'], x['markers'], ui)) + v = obsutil.obsfateprinter(ui, repo, x['successors'], x['markers'], + scmutil.formatchangeid) + values.append(v) return compatlist(context, mapping, "fate", values)