From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keir Fraser Subject: Re: [PATCH] Try to use git commit id if hg changeset is unavailable Date: Thu, 11 Apr 2013 07:40:21 +0100 Message-ID: References: <20130410233918.66DF61D3@duch.mimuw.edu.pl> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20130410233918.66DF61D3@duch.mimuw.edu.pl> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Marek Marczykowski , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On 11/04/2013 00:32, "Marek Marczykowski" wrote: > As Xen uses git as primary repository, get git commit id for > xen_changeset info. > > Maybe hg code should be removed completely? > > Signed-off-by: Marek Marczykowski I think we could just remove the hg code. Any other opinions? -- Keir > --- > xen/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xen/Makefile b/xen/Makefile > index 0fb3db7..9e4e6f3 100644 > --- a/xen/Makefile > +++ b/xen/Makefile > @@ -126,7 +126,7 @@ include/xen/compile.h: include/xen/compile.h.in .banner > -e 's/@@version@@/$(XEN_VERSION)/g' \ > -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \ > -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \ > - -e 's!@@changeset@@!$(shell ((hg parents --template "{date|date} > {rev}:{node|short}" >/dev/null && hg parents --template "{date|date} > {rev}:{node|short}") || echo "unavailable") 2>/dev/null)!g' \ > + -e 's!@@changeset@@!$(shell ((hg parents --template "{date|date} > {rev}:{node|short}" >/dev/null && hg parents --template "{date|date} > {rev}:{node|short}") || git show -s --pretty="%ad %h" || echo "unavailable") > 2>/dev/null | tr -d '\n')!g' \ > < include/xen/compile.h.in > $@.new > @grep \" .banner >> $@.new > @grep -v \" .banner