From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6739078689004191744 X-Received: by 2002:a50:af26:: with SMTP id g35mr7526952edd.129.1569064080947; Sat, 21 Sep 2019 04:08:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:3591:: with SMTP id o17ls2091524ejb.5.gmail; Sat, 21 Sep 2019 04:08:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqy0B3xLv2ZQojj9pryijGaI0LSfkOhTOJiQgUh8tVu54peNOiqVXy1dzuHKvqfmigW1x4FI X-Received: by 2002:a17:906:6bca:: with SMTP id t10mr16826514ejs.64.1569064080404; Sat, 21 Sep 2019 04:08:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569064080; cv=none; d=google.com; s=arc-20160816; b=j6sJWbHgKaBQfQtg576TC1DKdepGZojYJmHlE9kunAY5V4iZri9O8xxTKTSH5zfNbs +7d3m81AjaTehvlQ3fJbES4smiwgXFyYoDVwlv/3UiF1iLYTyoQ7GMvhgFtjWzCuVuGH 04PY/gZa2AuLTnODoGqfSd3koWl4TWmXJvXh0bbS1J3Kext29iZ0sREEUWMCZ8ZYZweB Tp+yMOhUochmVHXlI5r+ojIhESoF1ZxlOSPvelPWGzPf5iX+50OtozFTxr61J+kEBbzn 16fww2N/+PsLoZRocTi416YwK7GoHBh8lM19Q0r7NR2Hz7CKvmYwfy/xoNJru3+iaQm3 MEKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:references:to:from:subject; bh=ybItgXblUh83QHnxJwHEk5UyLPg5+a03B8G1tvMxltE=; b=X81jOtMJorepN1OhgLnt6bTEcFA7oFuhk3OclxNi/RE9lNYqZwWCXpN24kt6iW+jAh SoBGsHLfIohuW1Jt/DmliSfU+o4YF0tijTgMKHmqrQ7itkeDHsYgeVKoFlq7yVc2yXmS 1Yq5aTfr0wBL9wiHVPmlpXp/7S7sH5I6ulPiYBRwVR84K+trVYjG8k1MpO4NDgQOkJLm H1I2k6usiQLLPgcsI85O0YtzxTRGAXntNxBvX/tt3QH3rKAfO6xPdYzrBd6EDqOQAwKY EYAlpR/At9JjgeM9gVyKdii6Ului+V+0h+GSiVYo3iTPu7hjPb44vJh7bMse4Io0MZnu AzLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id q8si312398edn.5.2019.09.21.04.08.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Sep 2019 04:08:00 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x8LB7xM5032158 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 21 Sep 2019 13:08:00 +0200 Received: from [167.87.8.146] ([167.87.8.146]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x8LB7xQq026621 for ; Sat, 21 Sep 2019 13:07:59 +0200 Subject: Re: [PATCH v2] Create from local branch before applying patches with git From: Jan Kiszka To: isar-users References: <05b54135-7bbb-3093-274d-33b0bc3b82d8@siemens.com> Message-ID: Date: Sat, 21 Sep 2019 13:07:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <05b54135-7bbb-3093-274d-33b0bc3b82d8@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: /I8Fsb1GuATG Ignore, wrong list, sorry. Jan On 21.09.19 13:07, [ext] Jan Kiszka wrote: > 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] > > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux