From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6739078689004191744 X-Received: by 2002:a19:f24d:: with SMTP id d13mr11223290lfk.127.1569064028815; Sat, 21 Sep 2019 04:07:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7d02:: with SMTP id y2ls1297790ljc.8.gmail; Sat, 21 Sep 2019 04:07:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqxNIi+FYDgRCXJPZwYs37wB4nno7fGWSPETZcrU4lqcK8U1a8qqzVyAOXRM2bn/nnNihrRh X-Received: by 2002:a2e:7211:: with SMTP id n17mr8403712ljc.9.1569064028220; Sat, 21 Sep 2019 04:07:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569064028; cv=none; d=google.com; s=arc-20160816; b=AfQqRMH6mtz3o/vHzTuv0DEwkjl2JfwIEq8WO9xonKUBEHorO4sQZ6SCLFyUGU/Hcm 9yQDqdsJHjgyaXI+U5Sks5uekH1yRLKA1TAqxJPnGMhDXzz4VhgPx+IllfE468yLuIRx umljvy6XWqChirJihkeLrDBlmc4tZREtRpGQeC4rH8/kDn/Yi+OD+hyePF20uIKp34br bJB2WqQXI8dL5tYfj7NjiRCdKRrNEAwLOf8umQtIAcVBw3hOD+6DPMlbR3fbKJNWhVC+ s6jduki26zZ6aPdDIfqXdE8mekwqdqWcunG6EO1l8/olUhOUYRhZoQ08HNmnGsFtj2gt Crpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:cc:to:subject:from; bh=1ejRVRkSYCaADO6wepblR1bJ5fupQeGBO5meCmEkY+0=; b=wwk3pYcLL2XZXd3UUE/Z2IxVb7+xcdq50079yY1X7LiY0ce4vJhumeHGFx07uURrSx 4P86HtZ6bqN+Pb+JoHrNAwX8yORT5gM9gmPJI7r0mGx7ioDYqs0n7L2u0RyadqyDpmrn 38gnZjuKRwKPzuf3RekfJkLqcDW0SkRCLgloKcid69nvCeehdwEvH9uUenCN4tXvXpDR htt+0wa3JAOQ2UfWKpRNlhtAxlENFXACfjBEN7nex12UMfD42ogwt8a0NV0XhTbwNKvo +KDwFIW7hTbcwSRAF4L+I76GK1hwSx62ilse74BdutTQZKiGeMtQqzxtykS6IFNVv37S hwEw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id h6si323632lfc.3.2019.09.21.04.07.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Sep 2019 04:07:08 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x8LB77w9020353 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Sep 2019 13:07:07 +0200 Received: from [167.87.8.146] ([167.87.8.146]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x8LB76Rp020539; Sat, 21 Sep 2019 13:07:06 +0200 From: Jan Kiszka Subject: [PATCH v2] Create from local branch before applying patches with git To: isar-users Cc: Belisko Marek , Henning Schild Message-ID: <05b54135-7bbb-3093-274d-33b0bc3b82d8@siemens.com> Date: Sat, 21 Sep 2019 13:07:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: YbwzVLp7KQd6 From: Jan Kiszka If refspec is pointing to an upstream branch name, the checkout for a second run will not reset a repo back to the upstream commit. That is because we applied the repo patches to a local branch that carries the name of the upstream one. Fix that by switching to local branch prior to applying any patches. Reported-by: Belisko Marek Signed-off-by: Jan Kiszka --- Changes in v2: - rebased over next - add hg support - use local branch also with git kas/repos.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/kas/repos.py b/kas/repos.py index 4f74f4b..113a67f 100644 --- a/kas/repos.py +++ b/kas/repos.py @@ -247,9 +247,14 @@ class RepoImpl(Repo): """ Applies patches to a repository asynchronously. """ - if self.operations_disabled: + if self.operations_disabled or not self._patches: return 0 + (retc, _) = yield from run_cmd_async(self.prepare_patches_cmd(), + cwd=self.path) + if retc: + return retc + my_patches = [] for patch in self._patches: @@ -359,6 +364,9 @@ class GitRepo(RepoImpl): return ['git', 'checkout', '-q', '{refspec}'.format(refspec=self.refspec)] + def prepare_patches_cmd(self): + return ['git', 'checkout', '-q', '-B', 'local-kas-patches'] + def apply_patches_file_cmd(self, path): return ['git', 'apply', path] @@ -395,6 +403,9 @@ class MercurialRepo(RepoImpl): def checkout_cmd(self): return ['hg', 'checkout', '{refspec}'.format(refspec=self.refspec)] + def prepare_patches_cmd(self): + return ['hg', 'branch', '-f', 'local-kas-patches'] + def apply_patches_file_cmd(self, path): return ['hg', 'import', '--no-commit', path] -- 2.16.4 -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux