Use short mode status output for git and bzr.

diff --git a/debian/changelog b/debian/changelog
index 82b249327b1e8753a4083cc0d3ffdc9e84031fd4..7ee67e5befd5ba55c120f0738b8b4b9d5a57bd26 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mr (0.49) UNRELEASED; urgency=low
 
   * Update suggests for git-core to git transition.
+  * Use short mode status output for git and bzr.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 08 Apr 2010 16:06:46 -0400
 

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 786a8d7c498c66b43623833ce9653f8ee03a6440..b90304d42b9898341669f3a2f938351f72d98250 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -53,7 +53,7 @@ git_fake_bare_update =
        [ -z "$args" ] && args="-t origin $branch"
        GIT_DIR="$MR_REPO" git pull $args
 
-git_fake_bare_status = GIT_DIR="$MR_REPO" git status "$@" || true
+git_fake_bare_status = GIT_DIR="$MR_REPO" git status -s "$@" || true
 
 git_fake_bare_commit =
        cd "$(git_get_worktree)"

diff --git a/lib/git-svn b/lib/git-svn
index 7e42b8820e986734ce760f5f79dce5895dd27873..bcdb545e4c7543710dcd72a21dc9dcb78726501c 100644 (file)
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -9,7 +9,7 @@
 # configure that as follows in your ~/.mrconfig:
 #git_svn_update = git svn rebase
 git_svn_update = git svn fetch
-git_svn_status = git status "$@" || true
+git_svn_status = git status -s "$@" || true
 git_svn_commit = git svn dcommit
 git_svn_push = git svn dcommit
 git_svn_record = git commit -a "$@"

diff --git a/mr b/mr
index 4fe0c614246adbeb6ae4af324e16a3ee0e9ca9a2..10cfa154db1c08506676f068929a225377e7b95d 100755 (executable)
--- a/mr
+++ b/mr
@@ -1573,8 +1573,8 @@ hg_update  = hg pull "$@" && hg update "$@"
 darcs_update = darcs pull -a "$@"
 
 svn_status = svn status "$@"
-git_status = git status "$@" || true
-bzr_status = bzr status "$@"
+git_status = git status -s "$@" || true
+bzr_status = bzr status --short "$@"
 cvs_status = cvs status "$@"
 hg_status  = hg status "$@"
 darcs_status = darcs whatsnew -ls "$@" || true