Ignore some files

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 60801f6a760144aeae9091602e1fa7a3b861eac5..7cce39f1d55be7704e5461e1b1201e0e3c7af00a 100755 (executable)
--- a/mr
+++ b/mr
@@ -16,6 +16,8 @@ B<mr> [options] commit [-m "message"]
 
 B<mr> [options] record [-m "message"]
 
 
 B<mr> [options] record [-m "message"]
 

+B<mr> [options] fetch
+

 B<mr> [options] push
 
 B<mr> [options] diff
 B<mr> [options] push
 
 B<mr> [options] diff


@@ -73,7 +75,8 @@ If a repository isn't checked out yet, it will first check it out.
 =item status
 
 Displays a status report for each repository, showing what
 =item status
 
 Displays a status report for each repository, showing what

-uncommitted changes are present in the repository.
+uncommitted changes are present in the repository. For distributed version
+control systems, also shows unpushed local branches.

 
 =item commit (or ci)
 
 
 =item commit (or ci)
 


@@ -91,6 +94,12 @@ remote repository. Only supported for distributed version control systems.
 
 The optional -m parameter allows specifying a commit message.
 
 
 The optional -m parameter allows specifying a commit message.
 

+=item fetch
+
+Fetches from each repository's remote repository, but does not
+update the working copy. Only supported for some distributed version
+control systems.
+

 =item push
 
 Pushes committed local changes to the remote repository. A no-op for
 =item push
 
 Pushes committed local changes to the remote repository. A no-op for


@@ -1906,14 +1915,19 @@ fossil_update = fossil pull "$@"
 vcsh_update = vcsh run "$MR_REPO" git pull "$@"
 veracity_update = vv pull "$@" && vv update "$@"
 
 vcsh_update = vcsh run "$MR_REPO" git pull "$@"
 veracity_update = vv pull "$@" && vv update "$@"
 

+git_fetch = git fetch --all --prune --tags
+git_svn_fetch = git svn fetch
+darcs_fetch = darcs fetch
+hg_fetch = hg pull
+

 svn_status = svn status "$@"
 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 "$@"
 darcs_status = darcs whatsnew -ls "$@" || true
 fossil_status = fossil changes "$@"

-vcsh_status = cd $(vcsh run "$MR_REPO" git config --get core.worktree); vcsh run "$MR_REPO" git status -s "$@" || true
+vcsh_status = vcsh run "$MR_REPO" git -c status.relativePaths=false status -s "$@" || true

 veracity_status = vv status "$@"
 
 svn_commit = svn commit "$@"
 veracity_status = vv status "$@"
 
 svn_commit = svn commit "$@"


@@ -1975,6 +1989,13 @@ fossil_log = fossil timeline "$@"
 vcsh_log = vcsh run "$MR_REPO" git log "$@"
 veracity_log = vv log "$@"
 
 vcsh_log = vcsh run "$MR_REPO" git log "$@"
 veracity_log = vv log "$@"
 

+hg_grep = hg grep "$@"
+cvs_grep = ack-grep "$@"
+svn_grep = ack-grep "$@"
+git_svn_grep = git grep "$@"
+git_grep = git grep "$@"
+bzr_grep = ack-grep "$@"
+

 run = "$@"
 
 svn_register =
 run = "$@"
 
 svn_register =