Add a push subcommand, which pushes committed changes for DCVS, and does nothing...

diff --git a/debian/changelog b/debian/changelog
index e84cbc8b5beb787473ad7188d926ad203975cbef..512521aafa0a616705906b8034afe8f2c0763b77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.33) UNRELEASED; urgency=low
+
+  * Add a push subcommand, which pushes committed changes for DCVS, and 
+    does nothing for svn/cvs. Closes: #491865
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 22 Jul 2008 15:19:54 -0400
+

 mr (0.32) unstable; urgency=low
 
   * Include the right (v2) version of GPL in the source.
 mr (0.32) unstable; urgency=low
 
   * Include the right (v2) version of GPL in the source.

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index 899c77bb6af478b10348d004d41c70171914cf34..b5af791c34efc570005e0b960c6979ff64436ee9 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -59,6 +59,9 @@ git_fake_bare_commit =
        GIT_DIR="$MR_REPO" git commit -a "$@"
        GIT_DIR="$MR_REPO" git push --all
 
        GIT_DIR="$MR_REPO" git commit -a "$@"
        GIT_DIR="$MR_REPO" git push --all
 

+git_fake_bare_push =
+       GIT_DIR="$MR_REPO" git push --all
+

 git_fake_bare_record = 
        cd "$(git_get_worktree)"
        GIT_DIR="$MR_REPO" git commit -a "$@"
 git_fake_bare_record = 
        cd "$(git_get_worktree)"
        GIT_DIR="$MR_REPO" git commit -a "$@"

diff --git a/lib/git-svn b/lib/git-svn
index 3fe18a25d94d18b1a36895b52defe7c14a1f831c..7e42b8820e986734ce760f5f79dce5895dd27873 100644 (file)
--- a/lib/git-svn
+++ b/lib/git-svn
@@ -11,6 +11,7 @@
 git_svn_update = git svn fetch
 git_svn_status = git status "$@" || true
 git_svn_commit = git svn dcommit
 git_svn_update = git svn fetch
 git_svn_status = git status "$@" || true
 git_svn_commit = git svn dcommit

+git_svn_push = git svn dcommit

 git_svn_record = git commit -a "$@"
 git_svn_diff = git diff "$@"
 git_svn_log = git svn log "$@"
 git_svn_record = git commit -a "$@"
 git_svn_diff = git diff "$@"
 git_svn_log = git svn log "$@"

diff --git a/mr b/mr
index 7eaadddd21e3fd223ed67d5ad0da1fee053e158c..e76887ee60eb5bc9a1a30433d9a87497cd9c4136 100755 (executable)
--- a/mr
+++ b/mr
@@ -81,6 +81,11 @@ remote repository. Only supported for distributed revision control systems.
 
 The optional -m parameter allows specifying a commit message.
 
 
 The optional -m parameter allows specifying a commit message.
 

+=item push
+
+Pushes committed local changes to the remote repository. A no-op for
+centralized revision control systems.
+

 =item diff
 
 Show a diff of uncommitted changes.
 =item diff
 
 Show a diff of uncommitted changes.


@@ -1288,6 +1293,13 @@ bzr_record = bzr commit "$@"
 hg_record  = hg commit -m "$@"
 darcs_record = darcs record -a -m "$@"
 
 hg_record  = hg commit -m "$@"
 darcs_record = darcs record -a -m "$@"
 

+svn_push = :
+git_push = git push "$@"
+bzr_push = bzr push "$@"
+cvs_push = :
+hg_push = hg push "$@"
+darcs_push = darcs push -a
+

 svn_diff = svn diff "$@"
 git_diff = git diff "$@"
 bzr_diff = bzr diff "$@"
 svn_diff = svn diff "$@"
 git_diff = git diff "$@"
 bzr_diff = bzr diff "$@"

diff --git a/mrconfig.complex b/mrconfig.complex
index 8eef5eb54c0c1dfda73627be33402162e36cb485..47cf9791067b354eb989984af08e4af6dafed3b4 100644 (file)
--- a/mrconfig.complex
+++ b/mrconfig.complex
@@ -9,10 +9,10 @@ include = cat /usr/share/mr/* 2>/dev/null || true
 # Teach mr to run a few git and svn specific commands.
 svn_cleanup = svn cleanup "$@"
 git_gc = git gc "$@"
 # Teach mr to run a few git and svn specific commands.
 svn_cleanup = svn cleanup "$@"
 git_gc = git gc "$@"

-git_push = git push "$@"
-svn_push = :

 git_tag = git tag -l
 svn_tag = svn ls "$(LC_ALL=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"
 git_tag = git tag -l
 svn_tag = svn ls "$(LC_ALL=C svn info . | grep -i ^URL: | cut -d ' ' -f 2 | sed -e 's/trunk/tags/')"

+# I prefer to git-svn rebase to fetch
+git_svn_update = git svn rebase

 # This hack is here because git pull stupidly outputs tag info to stderr.
 # Shut it up but let real errors through, for use in cron.
 quietupdate = mr -s -n update 3>&1 1>/dev/null 2>&3 | egrep -v '(storing tag|tag: )' || true
 # This hack is here because git pull stupidly outputs tag info to stderr.
 # Shut it up but let real errors through, for use in cron.
 quietupdate = mr -s -n update 3>&1 1>/dev/null 2>&3 | egrep -v '(storing tag|tag: )' || true