From patchwork Thu Jan 13 10:50:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 49960 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B20F139484B4 for ; Thu, 13 Jan 2022 10:51:23 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 36EB2393A427 for ; Thu, 13 Jan 2022 10:50:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 36EB2393A427 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 6C42A1F3D2 for ; Thu, 13 Jan 2022 10:50:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1642071024; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FvxsLvg9KAeBxXCbcNgPqN+f2rzUyyN/N1CJQuqYmqg=; b=qK1evFL5Deo9dF98vjkeow2cOQG/6kBAHJBsehZiN7FZ7PkOzKnNM+AGEqhBm4jrY4A9vx +tFuX/drI/T1XZNi2j+R7aaZwMCS+GIkw6Ep5L+jdoviKQLIitn3CFs1m3fPjpcHgZ4UBa upt0SNXLmaT3Azs0kf0sUxAyPxiJXFU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1642071024; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FvxsLvg9KAeBxXCbcNgPqN+f2rzUyyN/N1CJQuqYmqg=; b=vGCDgryF0Yk0zT5Xnq+JO9iw1EyoMi0OcA6p01fhu0vzKquISLJh5SEAVcoCBaOM465Ogx RAIVjbbxgJBAGnBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5CEEC13BF7 for ; Thu, 13 Jan 2022 10:50:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id lhSPFfAD4GGjHQAAMHmgww (envelope-from ) for ; Thu, 13 Jan 2022 10:50:24 +0000 Message-ID: <0f352a92-e426-d0a8-5e08-bace711fdc4a@suse.cz> Date: Thu, 13 Jan 2022 11:50:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH][gcc-changelog] Simplify git-backport.py script. To: gcc-patches@gcc.gnu.org Content-Language: en-US X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Pushed to master. It's very unlikely that somebody is going to backport a revision that is > 14 months old to a release branch. contrib/ChangeLog: * git-backport.py: Simplify the script as pre-auto-ChangeLog era is 14 months old. --- contrib/git-backport.py | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/contrib/git-backport.py b/contrib/git-backport.py index 2b8e4686719..bc2907a14ed 100755 --- a/contrib/git-backport.py +++ b/contrib/git-backport.py @@ -23,43 +23,8 @@ import argparse import subprocess if __name__ == '__main__': - parser = argparse.ArgumentParser(description='Backport a git revision and ' - 'stash all ChangeLog files.') + parser = argparse.ArgumentParser(description='Backport a git revision.') parser.add_argument('revision', help='Revision') args = parser.parse_args() - r = subprocess.run('git cherry-pick -x %s' % args.revision, shell=True) - if r.returncode == 0: - cmd = 'git show --name-only --pretty="" -- "*ChangeLog"' - changelogs = subprocess.check_output(cmd, shell=True, encoding='utf8') - changelogs = changelogs.strip() - if changelogs: - for changelog in changelogs.split('\n'): - subprocess.check_output('git checkout HEAD~ %s' % changelog, - shell=True) - subprocess.check_output('git commit --amend --no-edit', shell=True) - else: - # 1) remove all ChangeLog files from conflicts - out = subprocess.check_output('git diff --name-only --diff-filter=U', - shell=True, - encoding='utf8') - conflicts = out.strip().split('\n') - changelogs = [c for c in conflicts if c.endswith('ChangeLog')] - if changelogs: - cmd = 'git checkout --theirs %s' % ' '.join(changelogs) - subprocess.check_output(cmd, shell=True) - # 2) remove all ChangeLog files from index - cmd = 'git diff --name-only --diff-filter=M HEAD' - out = subprocess.check_output(cmd, shell=True, encoding='utf8') - out = out.strip().split('\n') - modified = [c for c in out if c.endswith('ChangeLog')] - for m in modified: - subprocess.check_output('git reset %s' % m, shell=True) - subprocess.check_output('git checkout %s' % m, shell=True) - - # try to continue - if len(conflicts) == len(changelogs): - cmd = 'git -c core.editor=true cherry-pick --continue' - subprocess.check_output(cmd, shell=True) - else: - print('Please resolve all remaining file conflicts.') + subprocess.run('git cherry-pick -x %s' % args.revision, shell=True)