From 63002818b60bbef82602d6a1b3c8e10763f45d7a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 27 Sep 2012 21:01:08 -0400
Subject: [PATCH 01/16] update my home page

---
 README         | 2 +-
 debian/control | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index bd64ed7..e63ea80 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ mr is a Multiple Repository management tool for git, svn, mercurial, bzr,
 darcs, cvs, fossil and veracity.
 
 Author: Joey Hess
-Homepage: http://kitenet.net/~joey/code/mr/
+Homepage: http://joeyh.name/code/mr/
 
 mr is intended to be very self-contained, since it might be useful to check
 it into ~/bin when keeping your home in version control. It has no
diff --git a/debian/control b/debian/control
index a8f5e46..7189dc4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.9.3
-Homepage: http://kitenet.net/~joey/code/mr/
+Homepage: http://joeyh.name/code/mr/
 Vcs-Git: git://git.kitenet.net/mr
 
 Package: mr
-- 
2.39.5


From d80a044816be0037e3243bf4e4949461d73b1097 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 11 Nov 2012 11:36:50 -0400
Subject: [PATCH 02/16] Added a fetch command. Closes: #480580

---
 debian/changelog |  6 ++++++
 mr               | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 391cbe2..2ae455d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (1.14) UNRELEASED; urgency=low
+
+  * Added a fetch command. Closes: #480580
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 11 Nov 2012 11:33:05 -0400
+
 mr (1.13) unstable; urgency=low
 
   * Pass -q to cvs diff and update. Closes: #673367
diff --git a/mr b/mr
index f615699..bdc9ff6 100755
--- a/mr
+++ b/mr
@@ -16,6 +16,8 @@ B<mr> [options] commit [-m "message"]
 
 B<mr> [options] record [-m "message"]
 
+B<mr> [options] fetch
+
 B<mr> [options] push
 
 B<mr> [options] diff
@@ -91,6 +93,12 @@ remote repository. Only supported for distributed version control systems.
 
 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
@@ -1906,6 +1914,11 @@ fossil_update = fossil pull "$@"
 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 "$@"
 git_status = git status -s "$@" || true
 bzr_status = bzr status --short "$@"
-- 
2.39.5


From 278c3e527a595dc2bb6c40fdea7cf55c6d5f1207 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 Dec 2012 12:11:14 -0400
Subject: [PATCH 03/16] status: Now includes information about unpushed
 changes, for git, git-svn, hg, and bzr. Closes: #693021

---
 debian/changelog | 2 ++
 lib/git-svn      | 2 +-
 mr               | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ae455d..1c93976 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 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
 
diff --git a/lib/git-svn b/lib/git-svn
index 6cb9207..212923a 100644
--- 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 -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 "$@"
diff --git a/mr b/mr
index bdc9ff6..9324b4f 100755
--- a/mr
+++ b/mr
@@ -1920,10 +1920,10 @@ darcs_fetch = darcs fetch
 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 "$@"
-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
-- 
2.39.5


From 83155b297f58515578e0859a0d6bda762195d1fa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 Dec 2012 12:13:57 -0400
Subject: [PATCH 04/16] update

---
 mr | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mr b/mr
index 9324b4f..7cce39f 100755
--- a/mr
+++ b/mr
@@ -75,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
-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)
 
-- 
2.39.5


From 5660edc8ef0fe9bc3eac2c41a45e66a2d61b7892 Mon Sep 17 00:00:00 2001
From: Paul Wise <pabs@debian.org>
Date: Sat, 2 Feb 2013 13:49:28 +0800
Subject: [PATCH 05/16] Ignore some files

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6f91983
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+debian/files
+debian/mr.debhelper.log
+debian/mr.substvars
+debian/mr/
+mr.1
+webcheckout.1
-- 
2.39.5


From 9bb2d93cc4f0a0c55d1d6634a52ddf20db9853f3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 7 Feb 2013 11:50:23 -0400
Subject: [PATCH 06/16] Added lib/vis, an add-on to visualise repo history.
 Closes: #693022 Thanks, Paul Wise

---
 debian/changelog |  2 ++
 lib/vis          | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 lib/vis

diff --git a/debian/changelog b/debian/changelog
index 1c93976..8e1fe43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ 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
+  * Added lib/vis, an add-on to visualise repo history.
+    Closes: #693022 Thanks, Paul Wise
 
  -- Joey Hess <joeyh@debian.org>  Sun, 11 Nov 2012 11:33:05 -0400
 
diff --git a/lib/vis b/lib/vis
new file mode 100644
index 0000000..6dff868
--- /dev/null
+++ b/lib/vis
@@ -0,0 +1,12 @@
+# Adds a "mr vis" command to visualise repository history.
+
+# To make mr use this file, add a line like this inside the [DEFAULT]
+# section of your ~/.mrconfig
+#include = cat /usr/share/mr/vis
+
+cvs_vis = cvs diff | $EDITOR -
+svn_vis = svn status | $EDITOR -
+git_svn_vis = gitk --all
+git_vis = gitk --all
+bzr_vis = bzr visualize
+hg_vis = hg view
-- 
2.39.5


From 7a1df526f3b5a01c26cbd53388beab739ceea096 Mon Sep 17 00:00:00 2001
From: Paul Wise <pabs@debian.org>
Date: Wed, 13 Feb 2013 14:00:24 +0800
Subject: [PATCH 07/16] Bug#695478: [mr] [PATCH] Drop the extra -m from various
 commit/record commands. Closes: #695478

---
 mr | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mr b/mr
index 7cce39f..3ce3c5e 100755
--- a/mr
+++ b/mr
@@ -1939,11 +1939,11 @@ bzr_commit =
 		bzr commit "$@" && bzr push
 	fi
 cvs_commit = cvs commit "$@"
-hg_commit  = hg commit -m "$@" && hg push
-darcs_commit = darcs record -a -m "$@" && darcs push -a
+hg_commit  = hg commit "$@" && hg push
+darcs_commit = darcs record -a "$@" && darcs push -a
 fossil_commit = fossil commit "$@"
 vcsh_commit = vcsh run "$MR_REPO" git commit -a "$@" && vcsh run "$MR_REPO" git push --all
-veracity_commit = vv commit -m "@" && vv push
+veracity_commit = vv commit "@" && vv push
 
 git_record = git commit -a "$@"
 bzr_record =
@@ -1952,11 +1952,11 @@ bzr_record =
 	else
 		bzr commit "$@"
 	fi
-hg_record  = hg commit -m "$@"
-darcs_record = darcs record -a -m "$@"
+hg_record  = hg commit "$@"
+darcs_record = darcs record -a "$@"
 fossil_record = fossil commit "$@"
 vcsh_record = vcsh run "$MR_REPO" git commit -a "$@"
-veracity_record = vv commit -m "@"
+veracity_record = vv commit "@"
 
 svn_push = :
 git_push = git push "$@"
-- 
2.39.5


From ecb63e331751a13a3843811997c55c70e6775f62 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 13 Feb 2013 14:47:06 -0400
Subject: [PATCH 08/16] fix apparent typo in veracity commands

@ should be $@ for parameters
---
 mr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mr b/mr
index 3ce3c5e..7f147cc 100755
--- a/mr
+++ b/mr
@@ -1943,7 +1943,7 @@ hg_commit  = hg commit "$@" && hg push
 darcs_commit = darcs record -a "$@" && darcs push -a
 fossil_commit = fossil commit "$@"
 vcsh_commit = vcsh run "$MR_REPO" git commit -a "$@" && vcsh run "$MR_REPO" git push --all
-veracity_commit = vv commit "@" && vv push
+veracity_commit = vv commit "$@" && vv push
 
 git_record = git commit -a "$@"
 bzr_record =
@@ -1956,7 +1956,7 @@ hg_record  = hg commit "$@"
 darcs_record = darcs record -a "$@"
 fossil_record = fossil commit "$@"
 vcsh_record = vcsh run "$MR_REPO" git commit -a "$@"
-veracity_record = vv commit "@"
+veracity_record = vv commit "$@"
 
 svn_push = :
 git_push = git push "$@"
-- 
2.39.5


From 890062545ea4e995fce97564688bcdec78a57ddc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 13 Feb 2013 14:48:24 -0400
Subject: [PATCH 09/16] Drop an extra -m from various commit/record commands.
 Closes: #695478 Thanks, Paul Wise

---
 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e1fe43..d21cebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mr (1.14) UNRELEASED; urgency=low
     for git, git-svn, hg, and bzr. Closes: #693021
   * Added lib/vis, an add-on to visualise repo history.
     Closes: #693022 Thanks, Paul Wise
+  * Drop an extra -m from various commit/record commands.
+    Closes: #695478 Thanks, Paul Wise
 
  -- Joey Hess <joeyh@debian.org>  Sun, 11 Nov 2012 11:33:05 -0400
 
-- 
2.39.5


From fa1f7770c9d4033c8f37b796e39dd185399e25b2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 13 Feb 2013 16:25:16 -0400
Subject: [PATCH 10/16] releasing version 1.14

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d21cebc..6f318e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mr (1.14) UNRELEASED; urgency=low
+mr (1.14) unstable; urgency=low
 
   * Added a fetch command. Closes: #480580
   * status: Now includes information about unpushed changes,
@@ -8,7 +8,7 @@ mr (1.14) UNRELEASED; urgency=low
   * Drop an extra -m from various commit/record commands.
     Closes: #695478 Thanks, Paul Wise
 
- -- Joey Hess <joeyh@debian.org>  Sun, 11 Nov 2012 11:33:05 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 13 Feb 2013 14:48:34 -0400
 
 mr (1.13) unstable; urgency=low
 
-- 
2.39.5


From d8d8c206f02cfd47f042af43fec699a70bfe628a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 17 Apr 2013 23:41:06 -0400
Subject: [PATCH 11/16] Added lib/repo, for support for repo (as used in
 Android) Closes: #705652 Thanks, Peter Eisentraut

---
 debian/changelog |  7 +++++++
 lib/repo         | 12 ++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 lib/repo

diff --git a/debian/changelog b/debian/changelog
index 6f318e2..f18375f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (1.15) UNRELEASED; urgency=low
+
+  * Added lib/repo, for support for repo (as used in Android)
+    Closes: #705652 Thanks, Peter Eisentraut
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 17 Apr 2013 23:40:20 -0400
+
 mr (1.14) unstable; urgency=low
 
   * Added a fetch command. Closes: #480580
diff --git a/lib/repo b/lib/repo
new file mode 100644
index 0000000..418276d
--- /dev/null
+++ b/lib/repo
@@ -0,0 +1,12 @@
+# Adds support for repo repositories.
+# http://source.android.com/source/version-control.html
+
+# To make mr use this file, add a line like this inside the [DEFAULT]
+# section of your ~/.mrconfig
+#include = cat /usr/share/mr/repo
+
+repo_test = perl: -d "$ENV{MR_REPO}/.repo"
+repo_diff = repo diff "$@"
+repo_grep = repo grep "$@"
+repo_status = repo status "$@"
+repo_update = repo sync "$@"
-- 
2.39.5


From 2ebc050bbabaff69a2e17f8a350bc7440d4f08ff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 22 Apr 2013 18:01:37 -0400
Subject: [PATCH 12/16] this needs to be included from within [DEFAULT]

---
 lib/git-subtree | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/git-subtree b/lib/git-subtree
index 0681399..3943924 100644
--- a/lib/git-subtree
+++ b/lib/git-subtree
@@ -1,5 +1,9 @@
 # Add support for Avery Pennarun's git-subtree
 #
+# To make mr use this file, add a line like this inside the [DEFAULT]
+# section of your ~/.mrconfig
+#include = cat /usr/share/mr/git-subtree
+#
 # Example:
 #
 # [repo]
-- 
2.39.5


From f98564a75f9466db13c85fa6c1acaa40c10c479a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 22 Apr 2013 18:04:30 -0400
Subject: [PATCH 13/16] Better cvs status. Closes: #694037 Thanks, Paul Wise

---
 debian/changelog | 2 ++
 mr               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f18375f..1ca97b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mr (1.15) UNRELEASED; urgency=low
 
   * Added lib/repo, for support for repo (as used in Android)
     Closes: #705652 Thanks, Peter Eisentraut
+  * Better cvs status.
+    Closes: #694037 Thanks, Paul Wise
 
  -- Joey Hess <joeyh@debian.org>  Wed, 17 Apr 2013 23:40:20 -0400
 
diff --git a/mr b/mr
index 7f147cc..4d77368 100755
--- a/mr
+++ b/mr
@@ -1923,7 +1923,7 @@ hg_fetch = hg pull
 svn_status = svn status "$@"
 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 -q status | grep -E '^(File:.*Status:|\?)' | grep -v 'Status: Up-to-date'
 hg_status  = hg status "$@"; hg summary --quiet | grep -v 'parent: 0:'
 darcs_status = darcs whatsnew -ls "$@" || true
 fossil_status = fossil changes "$@"
-- 
2.39.5


From 5c40613a5cea13dec8fa586f565ab85983ec625f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 4 May 2013 23:58:12 -0400
Subject: [PATCH 14/16] releasing version 1.15

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ca97b9..a4c0b62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mr (1.15) UNRELEASED; urgency=low
+mr (1.15) unstable; urgency=low
 
   * Added lib/repo, for support for repo (as used in Android)
     Closes: #705652 Thanks, Peter Eisentraut
   * Better cvs status.
     Closes: #694037 Thanks, Paul Wise
 
- -- Joey Hess <joeyh@debian.org>  Wed, 17 Apr 2013 23:40:20 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 04 May 2013 23:47:50 -0400
 
 mr (1.14) unstable; urgency=low
 
-- 
2.39.5


From f1064b084b2fbf042a4e9421cf611df5b532d1b2 Mon Sep 17 00:00:00 2001
From: v4hn <me@v4hn.de>
Date: Wed, 19 Jun 2013 01:41:26 +0200
Subject: [PATCH 15/16] Add a simple `make install` rule

This makes it more easy to install the applications
AND the man pages to the system.
---
 Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Makefile b/Makefile
index 8a8a63a..ac20683 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+PREFIX:=/usr/local
+
 build:
 	pod2man -c mr mr > mr.1
 	pod2man -c webcheckout webcheckout > webcheckout.1
@@ -6,3 +8,10 @@ test:
 	(echo "[.]"; echo "checkout=") > mrconfig.tmp
 	./mr --trust-all -c mrconfig.tmp ed | grep -q "horse"
 	rm -f mrconfig.tmp
+
+install: build
+	install -Dm0755 mr ${DESTDIR}${PREFIX}/bin/mr
+	install -Dm0755 webcheckout ${DESTDIR}${PREFIX}/bin/webcheckout
+
+	install -Dm0644 mr.1 ${DESTDIR}${PREFIX}/share/man/man1/mr.1
+	install -Dm0644 webcheckout.1 ${DESTDIR}${PREFIX}/share/man/man1/webcheckout.1
-- 
2.39.5


From 3e0b9d943a1b10b717fc5751c28d228b532307ec Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 Jun 2013 20:16:55 -0400
Subject: [PATCH 16/16] Add make install rule. Thanks, v4hn

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a4c0b62..e86a142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (1.16) UNRELEASED; urgency=low
+
+  * Add make install rule.
+    Thanks, v4hn
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 18 Jun 2013 20:16:25 -0400
+
 mr (1.15) unstable; urgency=low
 
   * Added lib/repo, for support for repo (as used in Android)
-- 
2.39.5