From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 26 Oct 2007 06:36:35 +0000 (-0400)
Subject: Revert "replace `pwd` calls with $PWD"
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/de0874e8884604b08e3a3b9a1bf682cf2b88f1f2?ds=inline

Revert "replace `pwd` calls with $PWD"

This actually makes mr slower by calling pwd on *every* run.

Instead, call pwd just when it's needed, on register opterations that don't
need to be fast, and that happen to call it a max of 1 time anyway.
---

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 545115b..ab9fb12 100644
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -66,7 +66,7 @@ git_fake_bare_register =
 		error "git worktree $worktree does not exist"
 	fi
 	echo "Registering git url: $url in $MR_CONFIG (with worktree $worktree)"
-	mr -c "$MR_CONFIG" config "$PWD" \
+	mr -c "$MR_CONFIG" config "`pwd`" \
 		checkout="git_fake_bare_checkout '$url' '$MR_REPO' '$worktree'"
 
 # vim:sw=8:sts=0:ts=8:noet
diff --git a/mr b/mr
index 13807f8..2187aa0 100755
--- a/mr
+++ b/mr
@@ -1079,7 +1079,6 @@ ls = list
 [DEFAULT]
 order = 10
 lib =
-	PWD="$(pwd)"
 	error() {
 		echo "mr: $@" >&2
 		exit 1
@@ -1165,21 +1164,21 @@ svn_register =
 		error "cannot determine svn url"
 	fi
 	echo "Registering svn url: $url in $MR_CONFIG"
-	mr -c "$MR_CONFIG" config "$PWD" checkout="svn co '$url' '$MR_REPO'"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co '$url' '$MR_REPO'"
 git_register = 
 	url="$(LANG=C git-config --get remote.origin.url)" || true
 	if [ -z "$url" ]; then
 		error "cannot determine git url"
 	fi
 	echo "Registering git url: $url in $MR_CONFIG"
-	mr -c "$MR_CONFIG" config "$PWD" checkout="git clone '$url' '$MR_REPO'"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =
 	url=$(cat .bzr/branch/parent)
 	if [ -z "$url" ]; then
 		error "cannot determine bzr url"
 	fi
 	echo "Registering bzr url: $url in $MR_CONFIG"
-	mr -c "$MR_CONFIG" config "$PWD" checkout="bzr clone '$url' '$MR_REPO'"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="bzr clone '$url' '$MR_REPO'"
 cvs_register =
 	repo=$(cat CVS/Repository)
 	root=$(cat CVS/Root)
@@ -1187,22 +1186,22 @@ cvs_register =
 		error "cannot determine cvs root"
 		fi
 	echo "Registering cvs repository $repo at root $root"
-	mr -c "$MR_CONFIG" config "$PWD" checkout="cvs -d '$root' co -d '$MR_REPO' '$repo'"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="cvs -d '$root' co -d '$MR_REPO' '$repo'"
 hg_register = 
 	url=$(hg showconfig paths.default)
 	echo "Registering mercurial repo url: $url in $MR_CONFIG"
-	mr -c "$MR_CONFIG" config "$PWD" checkout="hg clone '$url' '$MR_REPO'"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="hg clone '$url' '$MR_REPO'"
 darcs_register = 
 	url=$(cat _darcs/prefs/defaultrepo)
 	echo "Registering darcs repository $url in $MR_CONFIG"
-	mr -c "$MR_CONFIG" config "$PWD" checkout="darcs get '$url'p '$MR_REPO'"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url'p '$MR_REPO'"
 git_bare_register = 
 	url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
 	if [ -z "$url" ]; then
 		error "cannot determine git url"
 	fi
 	echo "Registering git url: $url in $MR_CONFIG"
-	mr -c "$MR_CONFIG" config "$PWD" checkout="git clone --bare '$url' '$MR_REPO'"
+	mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare '$url' '$MR_REPO'"
 
 help =
 	if [ ! -e "$MR_PATH" ]; then