Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 9 Mar 2017 16:20:05 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r435778 - in head/devel/fossil: . files
Message-ID:  <201703091620.v29GK5L4034628@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: gahr
Date: Thu Mar  9 16:20:05 2017
New Revision: 435778
URL: https://svnweb.freebsd.org/changeset/ports/435778

Log:
  devel/fossil: restore --sha1sum argument to fossil commit, bump PORTREVISION
  
  The commit command has gained a new --hash option. For compatibility, keep the
  old --sha1sum option for the time being.
  
  Obtained from:	http://fossil-scm.org/index.html/info/d90e56f4697f12e3
  set after:

Added:
  head/devel/fossil/files/patch-sha1sum   (contents, props changed)
Modified:
  head/devel/fossil/Makefile

Modified: head/devel/fossil/Makefile
==============================================================================
--- head/devel/fossil/Makefile	Thu Mar  9 16:13:25 2017	(r435777)
+++ head/devel/fossil/Makefile	Thu Mar  9 16:20:05 2017	(r435778)
@@ -3,6 +3,7 @@
 PORTNAME=	fossil
 PORTVERSION=	2.0
 DISTVERSIONPREFIX=	src-
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	devel www
 MASTER_SITES=	http://fossil-scm.org/index.html/uv/download/

Added: head/devel/fossil/files/patch-sha1sum
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/fossil/files/patch-sha1sum	Thu Mar  9 16:20:05 2017	(r435778)
@@ -0,0 +1,24 @@
+Index: src/checkin.c
+==================================================================
+--- src/checkin.c.orig	2017-03-03 12:00:30 UTC
++++ src/checkin.c
+@@ -466,7 +466,8 @@ void status_cmd(void){
+ 
+   Blob report = BLOB_INITIALIZER;
+   enum {CHANGES, STATUS} command = *g.argv[1]=='s' ? STATUS : CHANGES;
+-  int useHash = find_option("hash", 0, 0)!=0;
++  /* --sha1sum is an undocumented alias for --hash for backwards compatiblity */
++  int useHash = find_option("hash",0,0)!=0 || find_option("sha1sum",0,0)!=0;
+   int showHdr = command==CHANGES && find_option("header", 0, 0);
+   int verboseFlag = command==CHANGES && find_option("verbose", "v", 0);
+   const char *zIgnoreFlag = find_option("ignore", 0, 1);
+@@ -2070,7 +2071,8 @@ void commit_cmd(void){
+ 
+   memset(&sCiInfo, 0, sizeof(sCiInfo));
+   url_proxy_options();
+-  useHash = find_option("hash", 0, 0)!=0;
++  /* --sha1sum is an undocumented alias for --hash for backwards compatiblity */
++  useHash = find_option("hash",0,0)!=0 || find_option("sha1sum",0,0)!=0;
+   noSign = find_option("nosign",0,0)!=0;
+   forceDelta = find_option("delta",0,0)!=0;
+   forceBaseline = find_option("baseline",0,0)!=0;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703091620.v29GK5L4034628>