]> git.madduck.net Git - code/myrepos.git/log

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:

code/myrepos.git
12 years agoRemove trailing slash from MR_REPO.
Adam Spiers [Thu, 10 Nov 2011 22:11:19 +0000 (22:11 +0000)]
Remove trailing slash from MR_REPO.

This avoids double slashes in paths used in:

(a) the built-in shell code in the __DATA__ section, e.g.

  svn_test = test -d "$MR_REPO"/.svn
  git_test = test -d "$MR_REPO"/.git

(b) lib/git-fake-bare, e.g.

  git_fake_bare_test =
          test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&

(c) lib/vcsh, e.g.

  vcsh_test =
          test -d "$MR_REPO"/refs/heads && test -d "$MR_REPO"/refs/tags &&

I have audited all uses and cannot see any which depend on the
trailing slash being there.
(cherry picked from commit 2e350ca416572a37df3393d50c91a02b44d9137b)

12 years agoAdd a comment explaining what selectrepos() returns.
Adam Spiers [Thu, 10 Nov 2011 22:12:08 +0000 (22:12 +0000)]
Add a comment explaining what selectrepos() returns.

In particular this is useful for understanding what paths
it returns, and that they have a trailing slash.
(cherry picked from commit 3d6acc19e4d029657f72bbf7200a48b5438a643a)

12 years agoThe previous fix for chaining to absolute paths broke chaining to relative paths...
Joey Hess [Sun, 4 Dec 2011 20:19:49 +0000 (16:19 -0400)]
The previous fix for chaining to absolute paths broke chaining to relative paths with more than one path segment. (Thanks, Adam Spiers)

12 years agoCorrect printing of line numbers when includes are used. Closes: #650952
Joey Hess [Sun, 4 Dec 2011 16:03:48 +0000 (12:03 -0400)]
Correct printing of line numbers when includes are used. Closes: #650952

Turned out unexapectedly subtle.

12 years agoShow the line when failing to parse a config file. Closes: #650952
Joey Hess [Sun, 4 Dec 2011 15:36:34 +0000 (11:36 -0400)]
Show the line when failing to parse a config file. Closes: #650952

12 years agoImprove error reporting
Richard Hartmann [Sun, 4 Dec 2011 15:05:06 +0000 (16:05 +0100)]
Improve error reporting

Print the offending line if there's a syntax error in a config file.

12 years agoBlock tty control codes in untrusted mr config files.
Joey Hess [Sun, 4 Dec 2011 15:34:29 +0000 (11:34 -0400)]
Block tty control codes in untrusted mr config files.

12 years agoImprove vcsh support
Richard Hartmann [Sat, 3 Dec 2011 01:28:46 +0000 (02:28 +0100)]
Improve vcsh support

* Make status work relative to core.worktree
* Support `mr run`
* Support `mr gc`

12 years agowording
Joey Hess [Tue, 29 Nov 2011 22:27:20 +0000 (18:27 -0400)]
wording

12 years agochangelog
Joey Hess [Tue, 29 Nov 2011 22:22:31 +0000 (18:22 -0400)]
changelog

12 years agoadd example of including libs, and mention all the currently available libs
Joey Hess [Tue, 29 Nov 2011 22:21:00 +0000 (18:21 -0400)]
add example of including libs, and mention all the currently available libs

12 years agoAdd support for vcsh via lib/
Richard Hartmann [Tue, 29 Nov 2011 22:01:46 +0000 (23:01 +0100)]
Add support for vcsh via lib/

13 years agoreleasing version 1.06
Joey Hess [Fri, 4 Nov 2011 21:14:05 +0000 (17:14 -0400)]
releasing version 1.06

13 years agobetter docs
Joey Hess [Thu, 3 Nov 2011 18:39:20 +0000 (14:39 -0400)]
better docs

13 years agoAdd support for skip = lazy, a mode where mr only operates on repositories that are...
Joey Hess [Thu, 3 Nov 2011 17:54:31 +0000 (13:54 -0400)]
Add support for skip = lazy, a mode where mr only operates on repositories that are checked out.

13 years agoSupport chaining to absolute paths.
Joey Hess [Wed, 2 Nov 2011 21:02:10 +0000 (17:02 -0400)]
Support chaining to absolute paths.

13 years agoFix propigation of failure from pre and post hooks and from fixups.
Joey Hess [Thu, 27 Oct 2011 16:19:18 +0000 (12:19 -0400)]
Fix propigation of failure from pre and post hooks and from fixups.

13 years agoimproved checkout docs
Joey Hess [Tue, 27 Sep 2011 22:07:11 +0000 (18:07 -0400)]
improved checkout docs

mentioing bzr bound checkouts

13 years agobzr record --local for checkout
Joey Hess [Tue, 27 Sep 2011 22:02:50 +0000 (18:02 -0400)]
bzr record --local for checkout

13 years agoallow bzr checkout in untrusted mrconfig too
Joey Hess [Tue, 27 Sep 2011 21:49:17 +0000 (17:49 -0400)]
allow bzr checkout in untrusted mrconfig too

13 years agobzr branch support
Joey Hess [Tue, 27 Sep 2011 21:46:26 +0000 (17:46 -0400)]
bzr branch support

* Use bzr branch, not deprecated bzr clone when registering bzr
  repositories. Closes: #643591
* Allow bzr branch|clone|get in untrusted mrconfig files.

13 years agoSupport bzr checkouts, which are updated with "bzr update", and to which bzr automati...
Joey Hess [Tue, 27 Sep 2011 21:38:18 +0000 (17:38 -0400)]
Support bzr checkouts, which are updated with "bzr update", and to which bzr automatically pushes commits. Closes: #643589

13 years agoAllow untrusted mrconfig files to set parameters to true/false
Joey Hess [Tue, 27 Sep 2011 21:28:07 +0000 (17:28 -0400)]
Allow untrusted mrconfig files to set parameters to true/false

* Allow untrusted mrconfig files to set parameters to true/false.
  So skip=true or deleted=true canbe used in an untrusted mrconfig file.
* Also allow order=N in an untrusted mrconfig file.

13 years agoBrought back the "deleted" parameter, which provides an easy way to mark repositories...
Joey Hess [Tue, 27 Sep 2011 21:21:48 +0000 (17:21 -0400)]
Brought back the "deleted" parameter, which provides an easy way to mark repositories that should be removed.

This will be especially useful in untrusted mrconfig files.

13 years agoadd back a long-lost example
Joey Hess [Sun, 25 Sep 2011 22:43:05 +0000 (18:43 -0400)]
add back a long-lost example

13 years agoupdate
Joey Hess [Sun, 25 Sep 2011 22:26:54 +0000 (18:26 -0400)]
update

13 years agoexpand
Joey Hess [Sun, 25 Sep 2011 22:26:08 +0000 (18:26 -0400)]
expand

13 years agochangelog
Joey Hess [Fri, 23 Sep 2011 17:20:39 +0000 (13:20 -0400)]
changelog

13 years agoPatch to correctly handle fake bare repositories with core.bare not set
Julien Rebetez [Thu, 15 Sep 2011 13:12:21 +0000 (15:12 +0200)]
Patch to correctly handle fake bare repositories with core.bare not set

--20cf300513b2820cbe04acfaa084
Content-Type: text/plain; charset=ISO-8859-1

Hello,
First, thanks for writing mr, I love it !

I was trying to setup mr to handle a detached worktree git repository and
found out it was unable to determine the repository type.
It turned out my config only had "core.worktree=../../" set but no
"core.bare" and therefore, 'git_fake_bare_test' was unable to determine
it's a detached worktree dir.

So the attached patch fix this problem by checking for core.worktree instead
of core.bare in the config file.

Best regards,
Julien

Hello,<div>First, thanks for writing mr, I love it !</div><div><br><div>I was trying to setup mr to handle a detached worktree git repository and found out it was unable to determine the repository type. </div><div>It turned out my config only had &quot;core.worktree=../../&quot; set but no &quot;core.bare&quot; and therefore, &#39;git_fake_bare_test&#39; was unable to determine</div>
<div>it&#39;s a detached worktree dir.</div><div><br></div><div>So the attached patch fix this problem by checking for core.worktree instead of core.bare in the config file.</div><div><br></div></div><div>Best regards,</div>
<div>Julien</div>

From b1c62a06c6c3668c52dd90014325d0c831a45ae7 Mon Sep 17 00:00:00 2001
From: Julien Rebetez <julien@fhtagn.net>
Date: Thu, 15 Sep 2011 14:59:47 +0200
Subject: [PATCH] Modify git_fake_bare_test to check core.worktree instead of
 core.bare to determine if a given repository is a detached
 worktree ('fake bar').

This allow mr to correctly handle the case where core.bare is missing
from the config file (implicitely false) and only core.worktree is set.

Signed-off-by: Julien Rebetez <julien@fhtagn.net>
13 years agoAvoid using sed -r in git-fake-bare, for OSX portability.
Joey Hess [Fri, 5 Aug 2011 17:29:42 +0000 (13:29 -0400)]
Avoid using sed -r in git-fake-bare, for OSX portability.

13 years agoforgot to add this before
Joey Hess [Sun, 19 Jun 2011 20:54:21 +0000 (16:54 -0400)]
forgot to add this before

13 years agoreleasing version 1.04
Joey Hess [Sun, 19 Jun 2011 20:24:19 +0000 (16:24 -0400)]
releasing version 1.04

13 years agoAllow mr register to be used with mrconfig file that does not yet exist. Closes:...
Joey Hess [Sat, 11 Jun 2011 16:31:24 +0000 (12:31 -0400)]
Allow mr register to be used with mrconfig file that does not yet exist. Closes: #629217

13 years agoImprove trust errors displayed while bootstrapping. Closes: #628234
Joey Hess [Mon, 30 May 2011 18:55:27 +0000 (14:55 -0400)]
Improve trust errors displayed while bootstrapping. Closes: #628234

13 years agogit-subtree: Display short-format status message
Svend Sorensen [Fri, 6 May 2011 17:45:24 +0000 (10:45 -0700)]
git-subtree: Display short-format status message

Add the -s flag to git status and exit successfully. This makes
git-subtree status behave like git status. mr's git status command is:

git_status = git status -s "$@" || true

13 years agoreleasing version 1.03
Joey Hess [Sun, 1 May 2011 23:10:03 +0000 (19:10 -0400)]
releasing version 1.03

13 years agoremove quietupdate hack
Joey Hess [Tue, 26 Apr 2011 00:04:16 +0000 (20:04 -0400)]
remove quietupdate hack

13 years agobugnum
Joey Hess [Mon, 25 Apr 2011 23:47:45 +0000 (19:47 -0400)]
bugnum

13 years agoNow --quiet supresses all output from commands run, as well as from mr, unless a...
Joey Hess [Mon, 25 Apr 2011 23:47:07 +0000 (19:47 -0400)]
Now --quiet supresses all output from commands run, as well as from mr, unless a command fails.

13 years agoAdded git-subtree library. Thanks, Svend Sorensen
Joey Hess [Mon, 28 Mar 2011 21:05:20 +0000 (17:05 -0400)]
Added git-subtree library. Thanks, Svend Sorensen

13 years agoAdd support for for git-subtree
Svend Sorensen [Mon, 28 Mar 2011 17:52:43 +0000 (10:52 -0700)]
Add support for for git-subtree

This lib allows you to merge separate git repos into a single repo, and
push changes back to the separate repos.

See https://github.com/apenwarr/git-subtree for the git-subtree command.

13 years agoupdate
Joey Hess [Sat, 5 Feb 2011 01:10:34 +0000 (21:10 -0400)]
update

13 years agofix url
Joey Hess [Sat, 5 Feb 2011 01:10:23 +0000 (21:10 -0400)]
fix url

13 years agoAdding homepage and descriptive information to the README
Matthew McCullough [Fri, 4 Feb 2011 21:42:38 +0000 (14:42 -0700)]
Adding homepage and descriptive information to the README

13 years agoreleasing version 1.02
Joey Hess [Sat, 22 Jan 2011 05:19:02 +0000 (01:19 -0400)]
releasing version 1.02

13 years agoFix bug in escaping.
Joey Hess [Sat, 22 Jan 2011 05:05:08 +0000 (01:05 -0400)]
Fix bug in escaping.

13 years agoreleasing version 1.01
Joey Hess [Thu, 20 Jan 2011 20:51:39 +0000 (16:51 -0400)]
releasing version 1.01

13 years agoAdd "mr run", which can run an arbitrary command in each repository.
Joey Hess [Thu, 20 Jan 2011 20:48:24 +0000 (16:48 -0400)]
Add "mr run", which can run an arbitrary command in each repository.

13 years agoreleasing version 1.00
Joey Hess [Wed, 19 Jan 2011 18:29:26 +0000 (14:29 -0400)]
releasing version 1.00

13 years agoThe -p flag is now enabled by default.
Joey Hess [Wed, 19 Jan 2011 18:28:06 +0000 (14:28 -0400)]
The -p flag is now enabled by default.

mr first reads ~/.mrconfig, and then looks for an additional .mrconfig file in
the current directory or one of its parent directories. Closes: #557963

13 years agoTrust flag day.
Joey Hess [Wed, 19 Jan 2011 18:09:53 +0000 (14:09 -0400)]
Trust flag day.

All mrconfig files except the main ~/.mrconfig are now untrusted by
default, until listed in ~/.mrtrust.

13 years agoDEP5
Joey Hess [Thu, 13 Jan 2011 22:54:48 +0000 (18:54 -0400)]
DEP5

13 years agoreleasing version 0.51
Joey Hess [Thu, 16 Dec 2010 17:15:05 +0000 (13:15 -0400)]
releasing version 0.51

13 years agoDo not return a nonzero exit status when all repositories were skipped. Closes: ...
Joey Hess [Thu, 16 Dec 2010 16:53:30 +0000 (12:53 -0400)]
Do not return a nonzero exit status when all repositories were skipped. Closes: #607287

14 years agoAdd push to manpage synopsis. Closes: #603029
Joey Hess [Wed, 10 Nov 2010 15:03:02 +0000 (11:03 -0400)]
Add push to manpage synopsis. Closes: #603029

14 years agoFix display when absolute directories are configured in mrconfig.
Joey Hess [Thu, 28 Oct 2010 22:02:21 +0000 (18:02 -0400)]
Fix display when absolute directories are configured in mrconfig.

14 years agoanother example of fixups hook
Joey Hess [Sun, 29 Aug 2010 19:04:48 +0000 (15:04 -0400)]
another example of fixups hook

14 years agoreleasing version 0.50
Joey Hess [Sun, 29 Aug 2010 19:01:20 +0000 (15:01 -0400)]
releasing version 0.50

14 years agoAdded support for arbitrary pre and post hooks for all defined mr commands. For examp...
Joey Hess [Sun, 29 Aug 2010 18:53:57 +0000 (14:53 -0400)]
Added support for arbitrary pre and post hooks for all defined mr commands. For example, pre_commit is run before all commits; post_update is run after all updates. Closes: #481341

14 years agoAdded fixups hook, which can be used to run a command after a repository is checked...
Joey Hess [Sun, 29 Aug 2010 18:44:18 +0000 (14:44 -0400)]
Added fixups hook, which can be used to run a command after a repository is checked out or updated. Closes: #590868

14 years agoupdate
Joey Hess [Sun, 15 Aug 2010 16:38:36 +0000 (12:38 -0400)]
update

14 years agofix quoting
Joey Hess [Sun, 15 Aug 2010 16:36:28 +0000 (12:36 -0400)]
fix quoting

14 years agorevert unnecessary line move
Joey Hess [Sun, 15 Aug 2010 16:35:18 +0000 (12:35 -0400)]
revert unnecessary line move

14 years agotypo
Joey Hess [Sun, 15 Aug 2010 16:34:55 +0000 (12:34 -0400)]
typo

14 years agoAdded fossil support
Jimmy Tang [Sun, 15 Aug 2010 00:17:37 +0000 (01:17 +0100)]
Added fossil support

14 years agoreleasing version 0.49
Joey Hess [Mon, 19 Jul 2010 03:09:28 +0000 (23:09 -0400)]
releasing version 0.49

14 years agoTypo. Closes: #586233, #588913
Joey Hess [Tue, 13 Jul 2010 16:30:28 +0000 (12:30 -0400)]
Typo. Closes: #586233, #588913

14 years agoTypo. Closes: #586233
Joey Hess [Thu, 17 Jun 2010 17:32:48 +0000 (13:32 -0400)]
Typo. Closes: #586233

14 years agoUse short mode status output for git and bzr.
Joey Hess [Thu, 17 Jun 2010 17:19:12 +0000 (13:19 -0400)]
Use short mode status output for git and bzr.

14 years agouse dpkg-mergechangelog
Joey Hess [Mon, 24 May 2010 15:12:47 +0000 (11:12 -0400)]
use dpkg-mergechangelog

14 years agoremove quotes
Joey Hess [Tue, 11 May 2010 23:51:08 +0000 (19:51 -0400)]
remove quotes

14 years agoUpdate suggests for git-core to git transition.
Joey Hess [Thu, 8 Apr 2010 20:07:03 +0000 (16:07 -0400)]
Update suggests for git-core to git transition.

14 years agoreleasing version 0.48
Joey Hess [Fri, 5 Feb 2010 22:15:38 +0000 (17:15 -0500)]
releasing version 0.48

14 years agoFix the hours_since function built into mr's shell library to not exit, but return...
Joey Hess [Fri, 5 Feb 2010 22:13:17 +0000 (17:13 -0500)]
Fix the hours_since function built into mr's shell library to not exit, but return a true/false exit status. This allows it to be used outside of skip tests.

14 years agoreleasing version 0.47
Joey Hess [Fri, 5 Feb 2010 21:41:25 +0000 (16:41 -0500)]
releasing version 0.47

14 years agoAllow empty sections to be used in mrconfig files.
Joey Hess [Thu, 24 Dec 2009 17:23:27 +0000 (12:23 -0500)]
Allow empty sections to be used in mrconfig files.

Previously the parser only added a section if it had at least one
configuration line. With this change, an empty section cannot be checked
out by mr, but it can be updated, etc.

14 years agoPass -L to curl to allow it to follow redirects when bootstrapping. (Pavel Avgustinov)
Joey Hess [Sun, 13 Dec 2009 18:05:27 +0000 (13:05 -0500)]
Pass -L to curl to allow it to follow redirects when bootstrapping. (Pavel Avgustinov)

14 years agoAvoid using abs_path to determine canonical repo path, as that fails when the repo...
Joey Hess [Thu, 10 Dec 2009 22:29:50 +0000 (17:29 -0500)]
Avoid using abs_path to determine canonical repo path, as that fails when the repo has not yet been checked out.

14 years agoreleasing version 0.45
Joey Hess [Tue, 8 Dec 2009 20:06:03 +0000 (15:06 -0500)]
releasing version 0.45

14 years agoFix handling of a repository in "."
Joey Hess [Tue, 8 Dec 2009 19:57:50 +0000 (14:57 -0500)]
Fix handling of a repository in "."

I threw in an abs_path because a repository in "." would turn into
something like "/home/joey/."

I think this is a reasonably safe change.

14 years agoAdd --insecure option that can be used to ignore SSL cert errors when bootstrapping...
Joey Hess [Mon, 30 Nov 2009 19:45:53 +0000 (14:45 -0500)]
Add --insecure option that can be used to ignore SSL cert errors when bootstrapping. (Pavel Avgustinov)

14 years agoAdd -k/--insecure option to ignore SSL errors on bootstrap.
Pavel Avgustinov [Sun, 29 Nov 2009 14:37:12 +0000 (14:37 +0000)]
Add -k/--insecure option to ignore SSL errors on bootstrap.

15 years agoclarify
Joey Hess [Fri, 27 Nov 2009 17:52:33 +0000 (12:52 -0500)]
clarify

15 years agobootstrap: Improve stats display.
Joey Hess [Fri, 27 Nov 2009 17:47:46 +0000 (12:47 -0500)]
bootstrap: Improve stats display.

15 years agomerge from my real .mrconfig, and remove some stuff
Joey Hess [Thu, 26 Nov 2009 20:22:13 +0000 (15:22 -0500)]
merge from my real .mrconfig, and remove some stuff

15 years agobugnum
Joey Hess [Thu, 26 Nov 2009 20:12:38 +0000 (15:12 -0500)]
bugnum

15 years agothoughts on -p as default
Joey Hess [Thu, 26 Nov 2009 20:09:21 +0000 (15:09 -0500)]
thoughts on -p as default

15 years agoomit \n between repos in quiet mode
Joey Hess [Thu, 26 Nov 2009 17:08:40 +0000 (12:08 -0500)]
omit \n between repos in quiet mode

15 years agouse [.] instead of []
Joey Hess [Thu, 26 Nov 2009 16:56:50 +0000 (11:56 -0500)]
use [.] instead of []

[] only works at all due to implementation details and users
should not need to worry about it. mr bootstrap only support [.]

15 years agoFix pod error. Closes: #558012
Joey Hess [Wed, 25 Nov 2009 22:27:38 +0000 (17:27 -0500)]
Fix pod error. Closes: #558012

15 years agoreleasing version 0.44
Joey Hess [Wed, 25 Nov 2009 18:03:39 +0000 (13:03 -0500)]
releasing version 0.44

15 years agorecommend perl to get perl-modules including File::Temp and File::Move
Joey Hess [Wed, 25 Nov 2009 17:38:01 +0000 (12:38 -0500)]
recommend perl to get perl-modules including File::Temp and File::Move

Only used by bootstrap, so recommends seems ok.

15 years agomr bootstrap: Fix cross-device rename failure. Closes: #557962
Joey Hess [Wed, 25 Nov 2009 17:36:17 +0000 (12:36 -0500)]
mr bootstrap: Fix cross-device rename failure. Closes: #557962

15 years agochangelog
Joey Hess [Tue, 3 Nov 2009 00:24:57 +0000 (19:24 -0500)]
changelog

15 years agode-hardcode paths
Joey Hess [Tue, 3 Nov 2009 00:24:23 +0000 (19:24 -0500)]
de-hardcode paths

15 years agoMerge branch 'master' of git://github.com/geoffdavis/mr
Joey Hess [Tue, 3 Nov 2009 00:23:54 +0000 (19:23 -0500)]
Merge branch 'master' of git://github.com/geoffdavis/mr

15 years agoFix help page display on Solaris and OS X
Geoff Davis [Mon, 2 Nov 2009 20:26:20 +0000 (12:26 -0800)]
Fix help page display on Solaris and OS X

mr assumed that we were using Linux/GNU man. Added logic to detect SunOS
and Darwin, and call man with the appropriate arguments

15 years agotypo
Joey Hess [Fri, 25 Sep 2009 15:43:31 +0000 (11:43 -0400)]
typo

15 years agoMake mr -i pass -i to the shell, to insure it knows it should be an interactive shell.
Joey Hess [Fri, 25 Sep 2009 01:52:51 +0000 (21:52 -0400)]
Make mr -i pass -i to the shell, to insure it knows it should be an interactive shell.

15 years agoreleasing version 0.43
Joey Hess [Wed, 9 Sep 2009 00:25:00 +0000 (20:25 -0400)]
releasing version 0.43