]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge branch 'feature--vcsh-status'
authorRichard Hartmann <richih.mailinglist@gmail.com>
Tue, 23 Jul 2013 23:29:04 +0000 (01:29 +0200)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Tue, 23 Jul 2013 23:29:04 +0000 (01:29 +0200)
1  2 
doc/vcsh.1.ronn
vcsh

diff --combined doc/vcsh.1.ronn
index 3457736ea2ef96ecf2fced9dd3d8d551b1e7e0cd,bcf114d4f5197a5ffab37a959f110874fd3a43dc..9532e654278c1187eb0112b8d50769ed19156eea
@@@ -29,6 -29,8 +29,8 @@@ vcsh(1) - Version Control System for $H
  
  `vcsh` run <repo> <shell command>
  
+ `vcsh` status
  `vcsh` upgrade <repo>
  
  `vcsh` version
@@@ -125,6 -127,9 +127,9 @@@ an interactive user
    This is needed to support mr and other scripts properly and of no concern to
    an interactive user.
  
+ * status:
+   Show statuses of all vcsh repositories.
  * upgrade:
    Upgrade repository to currently recommended settings.
  
@@@ -164,16 -169,16 +169,16 @@@ executed in the context of your shell
  Interesting knobs you can turn:
  
  * <$VCSH_GITIGNORE>:
 -  Can be <exact>, <recursive>, or <none>.
 +  Can be <exact>, <none>, or <recursive>.
  
    <exact> will seed the repo-specific ignore file with all file and directory
    names which `git ls-files` returns.
  
 +  <none> will not write any ignore file.
 +
    <recursive> will descend through all directories recursively additionally to
    the above.
  
 -  <none> will not write any ignore file.
 -
    Defaults to <exact>.
  
  Less interesting knobs you could turn:
diff --combined vcsh
index 0742bec960f0741f5e369be6550c2265fda026e2,b88fd97325ae89cde0b3b1eb332f75d03d5bd77f..98c2babd40daa24604da900bd3203e7cddefd128
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -8,7 -8,7 +8,7 @@@
  # While the following is not legally binding, the author would like to
  # explain the choice of GPLv2+ over GPLv3+.
  # The author prefers GPLv3+ over GPLv2+ but feels it's better to maintain
 -# full compatibility's with git. In case git ever changes its licensing terms,
 +# full compatibility's with Git. In case Git ever changes its licensing terms,
  # which is admittedly extremely unlikely to the point of being impossible,
  # this software will most likely follow suit.
  
@@@ -24,7 -24,7 +24,7 @@@ basename() 
  }
  
  SELF=$(basename $0)
 -VERSION='1.20130614'
 +VERSION='1.20130723'
  
  fatal() {
        echo "$SELF: fatal: $1" >&2
@@@ -106,6 -106,7 +106,7 @@@ help() 
            <newname>     Rename repository
     run <repo> \\
         <command>        Use this repository
+    status               Show statuses of all vcsh repositories
     upgrade <repo>       Upgrade repository to currently recommended settings
     version              Print version information
     which <substring>    Find substring in name of any tracked file
@@@ -233,7 -234,6 +234,7 @@@ pull() 
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git pull
 +              echo
        done
        hook post-pull
  }
@@@ -245,7 -245,6 +246,7 @@@ push() 
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                use
                git push
 +              echo
        done
        hook post-push
  }
@@@ -275,6 -274,16 +276,16 @@@ run() 
        hook post-run
  }
  
+ status() {
+       for VCSH_REPO_NAME in $(list); do
+               echo "$VCSH_REPO_NAME:"
+               export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
+               use
+               git status --short --untracked-files='no'
+               echo
+       done
+ }
  upgrade() {
        hook pre-upgrade
        use
@@@ -336,8 -345,8 +347,8 @@@ write_gitignore() 
                fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53
  }
  
 -if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ]; then
 -      fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'recursive', or 'none'" 1
 +if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then
 +      fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'none', or 'recursive'" 1
  fi
  
  if [ "$1" = 'clone' ]; then
@@@ -375,7 -384,8 +386,8 @@@ elif [ "$1" = 'delete' ]           |
  elif [ "$1" = 'list' ] ||
       [ "$1" = 'list-tracked' ] ||
       [ "$1" = 'pull' ] ||
-      [ "$1" = 'push' ]; then
+      [ "$1" = 'push' ] ||
+      [ "$1" = 'status' ]; then
        export VCSH_COMMAND="$1"
  elif [ -n "$2" ]; then
        export VCSH_COMMAND='run'