From f978563668404e7749e8d52545127a26afefad3a Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Tue, 28 Feb 2023 00:18:56 -0800 Subject: [PATCH] dag: sort patch export by generation Signed-off-by: David Aguilar --- cola/widgets/dag.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cola/widgets/dag.py b/cola/widgets/dag.py index 75cf2bf7..004ae7db 100644 --- a/cola/widgets/dag.py +++ b/cola/widgets/dag.py @@ -1678,7 +1678,7 @@ class GraphView(QtWidgets.QGraphicsView, ViewerMixin): context = self.context selected_commits = sort_by_generation([n.commit for n in items]) oids = [c.oid for c in selected_commits] - all_oids = [c.oid for c in self.commits] + all_oids = [c.oid for c in sort_by_generation(self.commits)] cmds.do(cmds.FormatPatch, context, oids, all_oids) def _select_parent(self): @@ -2291,7 +2291,8 @@ class GraphView(QtWidgets.QGraphicsView, ViewerMixin): def sort_by_generation(commits): - if len(commits) < 2: + """Sort commits by their generation. Ensures consistent diffs and patch exports""" + if len(commits) <= 1: return commits commits.sort(key=lambda x: x.generation) return commits -- 2.11.4.GIT