From b79a06e488ce2c51bb29323573e4b36d1ee07cdf Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 23 Aug 2022 23:37:22 +0200 Subject: [PATCH] plugin mr mercurial: limit export to ancestors of working directory parent --- sat/plugins/plugin_merge_req_mercurial.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sat/plugins/plugin_merge_req_mercurial.py b/sat/plugins/plugin_merge_req_mercurial.py index 72e88142..3b7f193a 100644 --- a/sat/plugins/plugin_merge_req_mercurial.py +++ b/sat/plugins/plugin_merge_req_mercurial.py @@ -86,8 +86,10 @@ class MercurialHandler(object): return d def export(self, repository): - d = MercurialProtocol.run(repository, 'export', '-g', '-r', 'outgoing()', - '--encoding=utf-8') + d = MercurialProtocol.run( + repository, 'export', '-g', '-r', 'outgoing() and ancestors(.)', + '--encoding=utf-8' + ) d.addCallback(lambda data: data.decode('utf-8')) return d