X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/372203672369b7370f3829b6f9f7690398abcb23..b0cd3385d3cee9473dff003165bca3a5b226ff1d:/mr?ds=sidebyside diff --git a/mr b/mr index 9efe969..87618a2 100755 --- a/mr +++ b/mr @@ -1208,10 +1208,10 @@ cvs_commit = cvs commit "$@" hg_commit = hg commit -m "$@" && hg push darcs_commit = darcs record -a -m "$@" && darcs push -a -git_commit = git commit -a "$@" -bzr_commit = bzr commit "$@" -hg_commit = hg commit -m "$@" -darcs_commit = darcs record -a -m "$@" +git_record = git commit -a "$@" +bzr_record = bzr commit "$@" +hg_record = hg commit -m "$@" +darcs_record = darcs record -a -m "$@" svn_diff = svn diff "$@" git_diff = git diff "$@" @@ -1243,7 +1243,7 @@ git_register = echo "Registering git url: $url in $MR_CONFIG" mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'" bzr_register = - url=`cat .bzr/branch/parent` + url="`LC_ALL=C bzr info . | egrep -i 'checkout of branch|parent branch' | awk '{print $NF}'`" if [ -z "$url" ]; then error "cannot determine bzr url" fi