Skip to contentSkip to conversation

cogito: Merge *-id scripts into cg-object-id.

PATCH In review Pavel Roskin 1 participant 1 message Jun 15, 2016 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/8 cogito: Merge *-id scripts into cg-object-id.

Merge *-id scripts into cg-object-id.

It's easier to have one script with one manpage.

Makefile +5 -3
@@ -10,11 +10,11 @@ INSTALL?=install
 
 ### --- END CONFIGURATION SECTION ---
 
 
 
-SCRIPT=	cg-commit-id cg-tree-id cg-parent-id cg-add cg-admin-lsobj cg-admin-uncommit \
+SCRIPT=	cg-object-id cg-add cg-admin-lsobj cg-admin-uncommit \
 	cg-branch-add cg-branch-ls cg-reset cg-clone cg-commit cg-diff \
 	cg-export cg-help cg-init cg-log cg-merge cg-mkpatch cg-patch \
 	cg-fetch cg-restore cg-rm cg-seek cg-status cg-tag cg-tag-ls cg-update \
 	cg cg-admin-ls cg-upload cg-branch-chg cg-admin-cat cg-clean
 
@@ -76,12 +76,14 @@ sedlibdir=$(shell echo $(libdir) | sed '
 install: install-cogito
 
 install-cogito: $(SCRIPT) $(LIB_SCRIPT) $(GEN_SCRIPT)
 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
 	$(INSTALL) $(SCRIPT) $(GEN_SCRIPT) $(DESTDIR)$(bindir)
-	for i in 'cg-cancel:cg-reset' 'commit-id:cg-commit-id' \
-		'tree-id:cg-tree-id' 'parent-id:cg-parent-id' \
+	for i in 'cg-cancel:cg-reset' 'commit-id:cg-object-id' \
+		'tree-id:cg-object-id' 'parent-id:cg-object-id' \
+		'cg-commit-id:cg-object-id' \
+		'cg-tree-id:cg-object-id' 'cg-parent-id:cg-object-id' \
 		'cg-pull:cg-fetch' 'cg-push:cg-upload'; do \
 		old=`echo $$i | cut -d : -f 1`; \
 		new=`echo $$i | cut -d : -f 2`; \
 		rm -f $(DESTDIR)$(bindir)/$$old; \
 		ln -s $$new $(DESTDIR)$(bindir)/$$old; \
cg-commit-id deleted +0 -21
deleted file mode 100755
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-#
-# Get ID of commit associated with given id or HEAD.
-# Copyright (c) Petr Baudis, 2005
-#
-# Takes the appropriate ID, defaults to HEAD.
-
-USAGE="cg-commit-id [COMMIT_ID]"
-
-id="$1"
-normid=$(. ${COGITO_LIB}cg-Xnormid "$id") || exit 1
-type=${normid#* }
-normid=${normid% *}
-[ "$type" ] || type=$(git-cat-file -t "$normid")
-
-if [ "$type" != "commit" ]; then
-	echo "Invalid commit id: $normid" >&2
-	exit 1
-fi
-
-echo $normid
cg-object-id new file +83 -0

83 lines not on this page · raw message

cg-parent-id deleted +0 -13
deleted file mode 100755
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Get ID of parent commit to a given revision or HEAD.
-# Copyright (c) Petr Baudis, 2005
-#
-# Takes ID of the current commit, defaults to HEAD.
-#
-# NOTE: Will return multiple SHA1s if ID is a commit with multiple parents.
-
-USAGE="cg-parent-id [COMMIT_ID]"
-
-normid=$(. ${COGITO_LIB}cg-Xnormid "$1"^)
-echo ${normid%% *}
cg-tree-id deleted +0 -26
deleted file mode 100755
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-#
-# Get ID of tree associated with given commit or HEAD.
-# Copyright (c) Petr Baudis, 2005
-#
-# Takes ID of the appropriate commit, defaults to HEAD.
-
-USAGE="cg-tree-id [COMMIT_ID]"
-
-id="$1"
-normid=$(. ${COGITO_LIB}cg-Xnormid "$id") || exit 1
-type=${normid#* }
-normid=${normid% *}
-[ "$type" ] || type=$(git-cat-file -t "$normid")
-
-if [ "$type" = "commit" ]; then
-	normid=$(git-cat-file commit "$normid" | sed -e 's/tree //;q')
-	type=$(git-cat-file -t "$normid")
-fi
-
-if [ "$type" != "tree" ]; then
-	echo "Invalid tree id: $normid" >&2
-	exit 1
-fi
-
-echo $normid
Signature · 2 lines
Regards,
Pavel Roskin