status: Now includes information about unpushed changes, for git, git-svn, hg, and...

diff --git a/debian/changelog b/debian/changelog
index 2ae455dd0758753969cb1da37ca7b571697893cb..1c939769a34c7893ebca7d274b2200138e6b4ecb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mr (1.14) UNRELEASED; urgency=low
 
   * Added a fetch command. Closes: #480580
 mr (1.14) UNRELEASED; urgency=low
 
   * Added a fetch command. Closes: #480580

+  * status: Now includes information about unpushed changes,
+    for git, git-svn, hg, and bzr. Closes: #693021

 
  -- Joey Hess <joeyh@debian.org>  Sun, 11 Nov 2012 11:33:05 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 11 Nov 2012 11:33:05 -0400
 

diff --git a/lib/git-svn b/lib/git-svn
index 6cb9207b550ec2cbd95bd625204cf25ddcbd46f2..212923a35cd77f2578030240f15ffc69801c51f7 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
 # configure that as follows in your ~/.mrconfig:
 #git_svn_update = git svn rebase
 git_svn_update = git svn fetch

-git_svn_status = git status -s "$@" || true
+git_svn_status = git status -s "$@" || true; git --no-pager log --branches --not --remotes --simplify-by-decoration --decorate --oneline || true

 git_svn_commit = git svn dcommit
 git_svn_push = git svn dcommit
 git_svn_record = git commit -a "$@"
 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 bdc9ff63f9e9f7819bb2c4ffbebd68d04f2ef0bd..9324b4f7d164f4ef68f5dc0f99fd1963275541db 100755 (executable)
--- a/mr
+++ b/mr
@@ -1920,10 +1920,10 @@ darcs_fetch = darcs fetch
 hg_fetch = hg pull
 
 svn_status = svn status "$@"
 hg_fetch = hg pull
 
 svn_status = svn status "$@"

-git_status = git status -s "$@" || true
-bzr_status = bzr status --short "$@"
+git_status = git status -s "$@" || true; git --no-pager log --branches --not --remotes --simplify-by-decoration --decorate --oneline || true
+bzr_status = bzr status --short "$@"; bzr missing

 cvs_status = cvs status "$@"
 cvs_status = cvs status "$@"

-hg_status  = hg status "$@"
+hg_status  = hg status "$@"; hg summary --quiet | grep -v 'parent: 0:'

 darcs_status = darcs whatsnew -ls "$@" || true
 fossil_status = fossil changes "$@"
 vcsh_status = vcsh run "$MR_REPO" git -c status.relativePaths=false status -s "$@" || true
 darcs_status = darcs whatsnew -ls "$@" || true
 fossil_status = fossil changes "$@"
 vcsh_status = vcsh run "$MR_REPO" git -c status.relativePaths=false status -s "$@" || true