From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 124170 invoked by alias); 13 Jan 2020 13:44:55 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 124160 invoked by uid 89); 13 Jan 2020 13:44:54 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-5.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 spammy=enhancements, personal X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.110.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 13 Jan 2020 13:44:53 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6033713D5 for ; Mon, 13 Jan 2020 05:44:51 -0800 (PST) Received: from [192.168.1.19] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 06F623F68E; Mon, 13 Jan 2020 05:44:50 -0800 (PST) Subject: Re: Some local customization enhancements when using git From: "Richard Earnshaw (lists)" To: "gcc-patches@gcc.gnu.org" References: <54834f12-32b1-492f-fb9e-b2c74df23167@arm.com> <95dfd77a-3361-545e-8b86-01078304ae29@arm.com> Message-ID: <9cffe927-2ac8-ad21-db59-2c3d0f5f3a10@arm.com> Date: Mon, 13 Jan 2020 14:02:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <95dfd77a-3361-545e-8b86-01078304ae29@arm.com> Content-Type: multipart/mixed; boundary="------------5882FBD8E5C3A9EA8B60FA29" X-SW-Source: 2020-01/txt/msg00719.txt.bz2 This is a multi-part message in MIME format. --------------5882FBD8E5C3A9EA8B60FA29 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-length: 1632 On 10/01/2020 14:26, Richard Earnshaw (lists) wrote: > On 10/01/2020 13:23, Richard Earnshaw (lists) wrote: >> This patch is intended to help with folks setting up a git work >> environment for use with GCC following the transition to git.  It >> currently does a couple of things. >> >> 1) Add an alias 'svn-rev' to git so that you can look up a legacy >> commit by its svn revision number.  This enables you to type >> git svn-rev 1234 >> and git will show the commit log entry relating to SVN r1234. >> >> 2) Sets up tracking information for the user's private name area in >> the git repo.  It tries to figure out some sensible answers to the >> data it needs, but allows the user to override the values.  It then >> creates the fetch and push entries that are needed for tracking the >> extra refs. This implements one part of the recommendations that I've >> proposed in svnwrite.html for dealing with private branches. >> >> It should be possible to run the script more than once and for it to >> DTRT.  If you change your answers the configuration should be >> correctly updated. >> >> 2020-01-10  Richard Earnshaw  >> >>      * gcc-git-customization: New file. >> > > Updated to add better support for diff-ing .md files. > > R. A couple more tweaks to this file and I've now checked it in. 1) Added the ability to select the prefix for the personal namespace. This will be cached. If you change it, then the push operations will be updated (but any local branches you will have to rename if you want them to continue working afterwards). 2) Removed the + from the added push spec. R. --------------5882FBD8E5C3A9EA8B60FA29 Content-Type: application/x-shellscript; name="gcc-git-customization.sh" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="gcc-git-customization.sh" Content-length: 3136 IyEvYmluL3NoCgojIFNjcmlwdCB0byBhZGQgc29tZSBsb2NhbCBnaXQgY3Vz dG9taXphdGlvbnMgc3VpdGFibGUgZm9yIHdvcmtpbmcKIyB3aXRoIHRoZSBH Q0MgZ2l0IHJlcG9zaXRvcnkKCmFzayAoKSB7CiAgICBxdWVzdGlvbj0kMQog ICAgZGVmYXVsdD0kMgogICAgdmFyPSQzCiAgICBlY2hvIC1uICRxdWVzdGlv biAiWyIkZGVmYXVsdCJdPyAiCiAgICByZWFkIGFuc3dlcgogICAgaWYgWyAi eCRhbnN3ZXIiID0gIngiIF0KICAgIHRoZW4KCWV2YWwgJHZhcj0kZGVmYXVs dAogICAgZWxzZQoJZXZhbCAkdmFyPSRhbnN3ZXIKICAgIGZpCn0KCiMgQWRk IGEgZ2l0IGNvbW1hbmQgdG8gZmluZCB0aGUgZ2l0IGNvbW1pdCBlcXVpdmFs ZW50IHRvIGxlZ2FjeSBTVk4gcmV2aXNpb24gTk5OCmdpdCBjb25maWcgYWxp YXMuc3ZuLXJldiAnIWYoKSB7IHJldj0kMTsgc2hpZnQ7IGdpdCBsb2cgLS1h bGwgLS1ncmVwPSJGcm9tLVNWTjogclxcPyRyZXZcXGIiICIke0B9IjsgfSA7 IGYnCgojIE1ha2UgZGlmZiBvbiBNRCBmaWxlcyB1c2VzICIoZGVmaW5lIiBh cyBhIGZ1bmN0aW9uIG1hcmtlci4KIyBVc2UgdGhpcyBpbiBjb25qdW5jdGlv biB3aXRoIGEgLmdpdGF0dHJpYnV0ZXMgZmlsZSBjb250YWluaW5nCiMgKi5t ZCAgICBkaWZmPW1kCmdpdCBjb25maWcgZGlmZi5tZC54ZnVuY25hbWUgJ15c KGRlZmluZS4qJCcKCnVwc3RyZWFtPWBnaXQgY29uZmlnIC0tZ2V0ICJnY2Mt Y29uZmlnLnVwc3RyZWFtImAKaWYgWyAieCR1cHN0cmVhbSIgPSAieCIgXQp0 aGVuCiAgICB1cHN0cmVhbT0ib3JpZ2luIgpmaQphc2sgIkxvY2FsIG5hbWUg Zm9yIHVwc3RyZWFtIHJlcG9zaXRvcnkiICJvcmlnaW4iIHVwc3RyZWFtCmdp dCBjb25maWcgImdjYy1jb25maWcudXBzdHJlYW0iICIkdXBzdHJlYW0iCgpy ZW1vdGVfaWQ9YGdpdCBjb25maWcgLS1nZXQgImdjYy1jb25maWcudXNlciJg CmlmIFsgIngkcmVtb3RlX2lkIiA9ICJ4IiBdCnRoZW4KICAgICMgU2VlIGlm IHRoZSB1cmwgc3BlY2lmaWVzIHRoZSByZW1vdGUgdXNlciBuYW1lLgogICAg dXJsPWBnaXQgY29uZmlnIC0tZ2V0ICJyZW1vdGUuJHVwc3RyZWFtLnVybCJg CiAgICBpZiBbICJ4JHVybCIgPSAieCIgXQogICAgdGhlbgoJIyBUaGlzIGlz IGEgcHVyZSBndWVzcywgYnV0IGZvciBtYW55IHBlb3BsZSBpdCBtaWdodCBi ZSBPSy4KCXJlbW90ZV9pZD1gd2hvYW1pYAogICAgZWxzZQoJcmVtb3RlX2lk PWBlY2hvICR1cmwgfCBzZWQgLXIgInN8Xi4qc3NoOi8vKC4rKUBnY2MuZ251 Lm9yZy4qJHxcMXwiYAoJaWYgWyB4JHJlbW90ZV9pZCA9IHgkdXJsIF0KCXRo ZW4KCSAgICByZW1vdGVfaWQ9YHdob2FtaWAKCWZpCiAgICBmaQpmaQphc2sg IkFjY291bnQgbmFtZSBvbiBnY2MuZ251Lm9yZyIgJHJlbW90ZV9pZCByZW1v dGVfaWQKZ2l0IGNvbmZpZyAiZ2NjLWNvbmZpZy51c2VyIiAiJHJlbW90ZV9p ZCIKCm9sZF9wZng9YGdpdCBjb25maWcgLS1nZXQgImdjYy1jb25maWcudXNl cnBmeCJgCmlmIFsgIngkb2xkX3BmeCIgPSAieCIgXQp0aGVuCiAgICBvbGRf cGZ4PSJtZSIKZmkKZWNobyAiTG9jYWwgYnJhbmNoIHByZWZpeCBmb3IgcGVy c29uYWwgYnJhbmNoZXMgeW91IHdhbnQgdG8gc2hhcmUiCmVjaG8gIihsb2Nh bCBicmFuY2hlcyBzdGFydGluZyA8cHJlZml4Pi8gY2FuIGJlIHB1c2hlZCBk aXJlY3RseSB0byB5b3VyIgphc2sgInBlcnNvbmFsIGFyZWEgb24gdGhlIGdj YyBzZXJ2ZXIpIiAkb2xkX3BmeCBuZXdfcGZ4CmdpdCBjb25maWcgImdjYy1j b25maWcudXNlcnBmeCIgIiRuZXdfcGZ4IgoKZWNobyAiU2V0dGluZyB1cCB0 cmFja2luZyBmb3IgcGVyc29uYWwgbmFtZXNwYWNlICRyZW1vdGVfaWQgaW4g cmVtb3Rlcy8kdXBzdHJlYW0vJHtuZXdfcGZ4fSIKZ2l0IGNvbmZpZyAtLXJl cGxhY2UtYWxsICJyZW1vdGUuJHt1cHN0cmVhbX0uZmV0Y2giICIrcmVmcy91 c2Vycy8ke3JlbW90ZV9pZH0vaGVhZHMvKjpyZWZzL3JlbW90ZXMvJHt1cHN0 cmVhbX0vJHtuZXdfcGZ4fS8qIiAiOnJlZnMvcmVtb3Rlcy8ke3Vwc3RyZWFt fS8ke29sZF9wZnh9LyIKZ2l0IGNvbmZpZyAtLXJlcGxhY2UtYWxsICJyZW1v dGUuJHt1cHN0cmVhbX0uZmV0Y2giICIrcmVmcy91c2Vycy8ke3JlbW90ZV9p ZH0vdGFncy8qOnJlZnMvdGFncy8ke25ld19wZnh9LyoiICI6cmVmcy90YWdz LyR7b2xkX3BmeH0vIgpnaXQgY29uZmlnIC0tcmVwbGFjZS1hbGwgInJlbW90 ZS4ke3Vwc3RyZWFtfS5wdXNoIiAicmVmcy9oZWFkcy8ke25ld19wZnh9Lyo6 cmVmcy91c2Vycy8ke3JlbW90ZV9pZH0vaGVhZHMvKiIgIl5cKz9yZWZzL2hl YWRzLyR7b2xkX3BmeH0vIgo= --------------5882FBD8E5C3A9EA8B60FA29--