]> 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
16 years agoimplement commit/record for git-fake-bare checkouts
martin f. krafft [Mon, 3 Mar 2008 19:19:52 +0000 (20:19 +0100)]
implement commit/record for git-fake-bare checkouts
(cherry picked from commit 9eeb4702a761002ad6013a3e5051e0f54b60bd5f)

16 years agoimplement diff for git-fake-bare checkouts
martin f. krafft [Mon, 3 Mar 2008 19:11:18 +0000 (20:11 +0100)]
implement diff for git-fake-bare checkouts
(cherry picked from commit 761ae95df672a00fb1037ccb89e4442eda88de6f)

16 years agofactor out extracting the worktree to a function
martin f. krafft [Mon, 3 Mar 2008 19:10:55 +0000 (20:10 +0100)]
factor out extracting the worktree to a function
(cherry picked from commit 8a8e85c5d8ca8fbddc6ac61de3c125cbe14d189a)

16 years ago* Correct GIT_CONFIG settings in git-svn. Closes: #463941
Joey Hess [Wed, 6 Feb 2008 18:05:02 +0000 (13:05 -0500)]
* Correct GIT_CONFIG settings in git-svn. Closes: #463941

16 years agoreleasing version 0.23
Joey Hess [Tue, 5 Feb 2008 18:26:59 +0000 (13:26 -0500)]
releasing version 0.23

16 years ago* Fix tests in git-svn include file to use MR_REPO. Closes: #463941
Joey Hess [Mon, 4 Feb 2008 18:37:27 +0000 (13:37 -0500)]
* Fix tests in git-svn include file to use MR_REPO. Closes: #463941

16 years agoreleasing version 0.22
Joey Hess [Sun, 3 Feb 2008 22:05:18 +0000 (17:05 -0500)]
releasing version 0.22

16 years ago* Update bzr registration code to work with current version of bzr,
Joey Hess [Sun, 3 Feb 2008 22:04:58 +0000 (17:04 -0500)]
* Update bzr registration code to work with current version of bzr,
  using bzr info to get the url. Closes: #463867

16 years agoyay, even more git-*
Joey Hess [Sun, 3 Feb 2008 04:19:29 +0000 (23:19 -0500)]
yay, even more git-*

16 years agolast git-*
Joey Hess [Sun, 3 Feb 2008 04:17:28 +0000 (23:17 -0500)]
last git-*

16 years agoreleasing version 0.21
Joey Hess [Thu, 24 Jan 2008 18:46:28 +0000 (13:46 -0500)]
releasing version 0.21

16 years agodocument how to make it rebase
Joey Hess [Thu, 24 Jan 2008 18:43:44 +0000 (13:43 -0500)]
document how to make it rebase

16 years agomerge git-svn support from Bastian Kleineidam's implementation
Joey Hess [Thu, 24 Jan 2008 18:41:05 +0000 (13:41 -0500)]
merge git-svn support from Bastian Kleineidam's implementation

Adds register command, and better tests. Use git-svn log. I left the update
command using git-svn fetch instead of git-svn rebase for now, may change this
later.

16 years ago* Add lib/git-svn, which can be included to add support for git-svn
Joey Hess [Sat, 19 Jan 2008 18:18:46 +0000 (13:18 -0500)]
* Add lib/git-svn, which can be included to add support for git-svn
  repositories.

16 years agoadd handler for record
Joey Hess [Sat, 19 Jan 2008 18:17:32 +0000 (13:17 -0500)]
add handler for record

16 years agotypo
Joey Hess [Sat, 19 Jan 2008 18:12:32 +0000 (13:12 -0500)]
typo

16 years agoupdates, merge from my main mrconfig
Joey Hess [Sat, 12 Jan 2008 23:36:34 +0000 (18:36 -0500)]
updates, merge from my main mrconfig

16 years agoreleasing version 0.20
Joey Hess [Thu, 3 Jan 2008 04:08:59 +0000 (23:08 -0500)]
releasing version 0.20

16 years ago* Improve unison support.
Joey Hess [Thu, 3 Jan 2008 03:56:10 +0000 (22:56 -0500)]
* Improve unison support.

16 years agooops
Joey Hess [Sat, 22 Dec 2007 19:02:15 +0000 (14:02 -0500)]
oops

16 years ago* Add a "record" subcommand, borrowing termonology from darcs. This does a
Joey Hess [Sat, 22 Dec 2007 19:01:25 +0000 (14:01 -0500)]
* Add a "record" subcommand, borrowing termonology from darcs. This does a
  local commit, but does not push changes to remote repos.

16 years ago* Add -q flag.
Joey Hess [Sat, 22 Dec 2007 18:55:05 +0000 (13:55 -0500)]
* Add -q flag.
* darcs: Add -u to diff to get a more usual unified diff.

16 years agoadd "mr -q" to shut up all the repository related info
Anthony Towns [Sat, 22 Dec 2007 18:52:54 +0000 (13:52 -0500)]
add "mr -q" to shut up all the repository related info

16 years agoreleasing version 0.19
Joey Hess [Thu, 13 Dec 2007 02:35:03 +0000 (21:35 -0500)]
releasing version 0.19

16 years ago* Updating git repos no longer uses git-pull -t by default. Git makes it
Joey Hess [Thu, 13 Dec 2007 02:29:16 +0000 (21:29 -0500)]
* Updating git repos no longer uses git-pull -t by default. Git makes it
  to much of a PITA to do this, since -t makes git-pull require the
  repository and refspec be specified at the command line (which is a bug in
  git (#456035). mr used to hardcode those to "origin" and "master", but
  that's not always the right choice. So give up on forcing git to be sane
  about pulling down all tags. It's insane. Live with it, or configure your
  own update command.

16 years ago* Support versions of man that don't use -l.
Joey Hess [Tue, 4 Dec 2007 20:13:54 +0000 (15:13 -0500)]
* Support versions of man that don't use -l.

16 years agoFix some typos
Elijah Newren [Sat, 1 Dec 2007 02:47:34 +0000 (19:47 -0700)]
Fix some typos

16 years agoreleasing version 0.18
Joey Hess [Thu, 29 Nov 2007 22:48:36 +0000 (17:48 -0500)]
releasing version 0.18

16 years ago* darcs: Use record subcommand, there is no commit subcommand. Closes: #453501
Joey Hess [Thu, 29 Nov 2007 22:48:06 +0000 (17:48 -0500)]
* darcs: Use record subcommand, there is no commit subcommand. Closes: #453501
* darcs: De-p register code. Closes: #453502

16 years agoreleasing version 0.17
Joey Hess [Thu, 29 Nov 2007 16:18:47 +0000 (11:18 -0500)]
releasing version 0.17

16 years ago* Use LC_MESSAGES=C not LANG=C, as if the user has LC_MESSAGES set, LANG
Joey Hess [Wed, 28 Nov 2007 20:46:45 +0000 (15:46 -0500)]
* Use LC_MESSAGES=C not LANG=C, as if the user has LC_MESSAGES set, LANG
  won't override it. Closes: #453305

16 years agoreleasing version 0.15
Joey Hess [Sun, 25 Nov 2007 18:14:30 +0000 (13:14 -0500)]
releasing version 0.15

16 years ago* Add a warning about runing too many jobs at a time.
Joey Hess [Sun, 25 Nov 2007 18:13:43 +0000 (13:13 -0500)]
* Add a warning about runing too many jobs at a time.

16 years ago* Make -j with no argument run unlimited jobs in parallel, like make -j
Josh Triplett [Fri, 23 Nov 2007 03:57:38 +0000 (19:57 -0800)]
* Make -j with no argument run unlimited jobs in parallel, like make -j

16 years agohmm, this turns out to have been requested in the bts too, add bugnum
Joey Hess [Sun, 25 Nov 2007 17:07:55 +0000 (12:07 -0500)]
hmm, this turns out to have been requested in the bts too, add bugnum

16 years ago* Allow -n to be passed a number to specify how deep to go into
Joey Hess [Sun, 25 Nov 2007 17:04:51 +0000 (12:04 -0500)]
* Allow -n to be passed a number to specify how deep to go into
  subdirectories to find repositories to act on.

17 years agoimprove message
Joey Hess [Tue, 13 Nov 2007 21:18:04 +0000 (16:18 -0500)]
improve message

17 years agoreleasing version 0.14
Joey Hess [Sun, 11 Nov 2007 06:10:34 +0000 (01:10 -0500)]
releasing version 0.14

17 years ago* Cut number of rcs tests run in half.
Joey Hess [Fri, 9 Nov 2007 02:30:43 +0000 (21:30 -0500)]
* Cut number of rcs tests run in half.

17 years ago* Portability fixes for the non-POSIX shell of SunOS 5. Patch from Ken
Joey Hess [Wed, 7 Nov 2007 16:55:57 +0000 (11:55 -0500)]
* Portability fixes for the non-POSIX shell of SunOS 5. Patch from Ken
  Bloom. Closes: #449592

17 years ago* -c was broken, fix. Closes: #449539
Joey Hess [Tue, 6 Nov 2007 16:39:30 +0000 (11:39 -0500)]
* -c was broken, fix. Closes: #449539

17 years agosync
Joey Hess [Tue, 6 Nov 2007 05:12:52 +0000 (00:12 -0500)]
sync

17 years agoreleasing version 0.12
Joey Hess [Sat, 3 Nov 2007 18:22:44 +0000 (14:22 -0400)]
releasing version 0.12

17 years ago* Don't try to test the repo type when doing a checkout, that can't work
Joey Hess [Sat, 3 Nov 2007 18:06:43 +0000 (14:06 -0400)]
* Don't try to test the repo type when doing a checkout, that can't work
  since the repo isn't there yet. It was actually checking the repo type
  of the parent directory, which caused several unexpected behaviors.

17 years ago* Avoid creating parent directory for a checkout that will ultimately be
Joey Hess [Sat, 3 Nov 2007 17:59:06 +0000 (13:59 -0400)]
* Avoid creating parent directory for a checkout that will ultimately be
  skipped.

17 years agoreleasing version 0.11
Joey Hess [Sat, 3 Nov 2007 03:29:29 +0000 (23:29 -0400)]
releasing version 0.11

17 years agoupdates from my real config files
Joey Hess [Sat, 3 Nov 2007 03:28:48 +0000 (23:28 -0400)]
updates from my real config files

17 years ago* Better error message if more than one repo type test matches a single
Joey Hess [Sat, 3 Nov 2007 02:42:51 +0000 (22:42 -0400)]
* Better error message if more than one repo type test matches a single
  directory.

17 years agoAllow option bundling, mostly so "-j2" will work.
Joey Hess [Fri, 2 Nov 2007 03:53:15 +0000 (23:53 -0400)]
Allow option bundling, mostly so "-j2" will work.

17 years ago* Avoid using commands like git-config and instead use "git config".
Joey Hess [Tue, 30 Oct 2007 20:09:16 +0000 (16:09 -0400)]
* Avoid using commands like git-config and instead use "git config".
  In some configurations, only the main git command is in the path.

17 years agoreleasing version 0.10
Joey Hess [Sun, 28 Oct 2007 23:55:17 +0000 (19:55 -0400)]
releasing version 0.10

17 years ago* Make registration work when no config file yet exists. Closes: #448422
Joey Hess [Sun, 28 Oct 2007 23:55:02 +0000 (19:55 -0400)]
* Make registration work when no config file yet exists. Closes: #448422

17 years agofunction reorder
Joey Hess [Fri, 26 Oct 2007 08:32:04 +0000 (04:32 -0400)]
function reorder

17 years ago* Add a lib file for using unison with mr.
Joey Hess [Fri, 26 Oct 2007 08:04:15 +0000 (04:04 -0400)]
* Add a lib file for using unison with mr.

17 years agoadd an example of how to include all available libs
Joey Hess [Fri, 26 Oct 2007 07:59:37 +0000 (03:59 -0400)]
add an example of how to include all available libs

17 years agoMerge branch 'master' of git://git.madduck.net/code/mr
Joey Hess [Fri, 26 Oct 2007 07:40:54 +0000 (03:40 -0400)]
Merge branch 'master' of git://git.madduck.net/code/mr

17 years agoFix git_fake_bare_update
martin f. krafft [Fri, 26 Oct 2007 07:40:12 +0000 (09:40 +0200)]
Fix git_fake_bare_update

By removing the check for Git repo type: it's fake-bare anyway.

17 years agoreleasing version 0.9
Joey Hess [Fri, 26 Oct 2007 07:01:39 +0000 (03:01 -0400)]
releasing version 0.9

17 years agoa few more tweaks
Joey Hess [Fri, 26 Oct 2007 06:58:52 +0000 (02:58 -0400)]
a few more tweaks

17 years agook, it's clean enough now
Joey Hess [Fri, 26 Oct 2007 06:55:40 +0000 (02:55 -0400)]
ok, it's clean enough now

17 years agoRevert "replace `pwd` calls with $PWD"
Joey Hess [Fri, 26 Oct 2007 06:36:35 +0000 (02:36 -0400)]
Revert "replace `pwd` calls with $PWD"

This actually makes mr slower by calling pwd on *every* run.

Instead, call pwd just when it's needed, on register opterations that don't
need to be fast, and that happen to call it a max of 1 time anyway.

17 years agoMerge commit 'madduck/master'
Joey Hess [Fri, 26 Oct 2007 06:30:51 +0000 (02:30 -0400)]
Merge commit 'madduck/master'

17 years agojust a few more functions..
Joey Hess [Fri, 26 Oct 2007 06:30:28 +0000 (02:30 -0400)]
just a few more functions..

17 years agoreplace `pwd` calls with $PWD
martin f. krafft [Fri, 26 Oct 2007 06:27:05 +0000 (08:27 +0200)]
replace `pwd` calls with $PWD

also ensure that $PWD is defined by adding it to lib

17 years agoGet rid of GIT_WORK_TREE
martin f. krafft [Fri, 26 Oct 2007 06:21:53 +0000 (08:21 +0200)]
Get rid of GIT_WORK_TREE

Since we store core.worktree on checkout, we can get rid of the variable
and make it all a bit easier in the config file, passing worktree to the
checkout helper function.

17 years agoadd a vim modeline to preserve joey's tabbing prefs
martin f. krafft [Fri, 26 Oct 2007 06:20:38 +0000 (08:20 +0200)]
add a vim modeline to preserve joey's tabbing prefs

17 years agomore reorganisation
Joey Hess [Fri, 26 Oct 2007 06:20:33 +0000 (02:20 -0400)]
more reorganisation

17 years agoarn't you glad you use functions? don't you wish everybody did?
Joey Hess [Fri, 26 Oct 2007 06:08:45 +0000 (02:08 -0400)]
arn't you glad you use functions? don't you wish everybody did?

17 years agorename file
Joey Hess [Fri, 26 Oct 2007 05:51:37 +0000 (01:51 -0400)]
rename file

17 years agoremove set -x
Joey Hess [Fri, 26 Oct 2007 05:37:58 +0000 (01:37 -0400)]
remove set -x

17 years agofix use of old hours_since syntax
Joey Hess [Fri, 26 Oct 2007 05:36:17 +0000 (01:36 -0400)]
fix use of old hours_since syntax

17 years agoadd usage example
Joey Hess [Fri, 26 Oct 2007 05:31:34 +0000 (01:31 -0400)]
add usage example

17 years agoimprovements to git fake bare checkouts
Joey Hess [Fri, 26 Oct 2007 05:28:47 +0000 (01:28 -0400)]
improvements to git fake bare checkouts

17 years agomeh, try again at getting register to use the right configs
Joey Hess [Fri, 26 Oct 2007 05:14:37 +0000 (01:14 -0400)]
meh, try again at getting register to use the right configs

17 years agoquote all url and dir strings written by mr reg
Joey Hess [Fri, 26 Oct 2007 05:08:55 +0000 (01:08 -0400)]
quote all url and dir strings written by mr reg

This isn't perfect (fails if there's a single quote), but is much better than nothing.

17 years agofixed git fake bare checkout
Joey Hess [Fri, 26 Oct 2007 05:06:20 +0000 (01:06 -0400)]
fixed git fake bare checkout

Got the order and variables right, which I screwed up before, and added a
function to handle the messy checkout

17 years agofix mr register to support actions defined in config files
Joey Hess [Fri, 26 Oct 2007 04:46:38 +0000 (00:46 -0400)]
fix mr register to support actions defined in config files

It was looking for actions in $config{""}{DEFAULT}, which only
contained built-ins.

17 years agoactions not split by rcs override those that are
Joey Hess [Fri, 26 Oct 2007 02:07:32 +0000 (22:07 -0400)]
actions not split by rcs override those that are

17 years agochangelog improvement
Joey Hess [Fri, 26 Oct 2007 02:03:55 +0000 (22:03 -0400)]
changelog improvement

17 years agoadd
Joey Hess [Fri, 26 Oct 2007 01:58:41 +0000 (21:58 -0400)]
add

17 years ago* Add support for including one mrconfig file from another. Unlike chaining,
Joey Hess [Fri, 26 Oct 2007 01:57:18 +0000 (21:57 -0400)]
* Add support for including one mrconfig file from another. Unlike chaining,
  this doesn't change the paths, and is not tied to a particular
  subdirectory. It's useful for loading up library mrconfig files.
* Split git fake-bare support out into a mrconfig.git-fake-bare.
  Partly because it's a good example of how to add a new revision control
  type, and partly because it's currently too ugly to be in mr itself
  due to bugs and limitations in git.

17 years agosome fixes to bare and fake-bare registering
Joey Hess [Fri, 26 Oct 2007 01:34:48 +0000 (21:34 -0400)]
some fixes to bare and fake-bare registering

17 years agochangelog formatting
Joey Hess [Fri, 26 Oct 2007 01:12:05 +0000 (21:12 -0400)]
changelog formatting

17 years agomerge in madduck's changes to fix fake-bare worktree checkout
Joey Hess [Fri, 26 Oct 2007 01:10:22 +0000 (21:10 -0400)]
merge in madduck's changes to fix fake-bare worktree checkout

Forgot to do this in the prior commit.

17 years agomerge madduck's fix to not fail determining git url
Joey Hess [Fri, 26 Oct 2007 01:01:10 +0000 (21:01 -0400)]
merge madduck's fix to not fail determining git url

17 years agoMerge commit 'madduck/master'
Joey Hess [Fri, 26 Oct 2007 00:55:48 +0000 (20:55 -0400)]
Merge commit 'madduck/master'

17 years agoadd changelog entries for madduck's changes
Joey Hess [Fri, 26 Oct 2007 00:54:11 +0000 (20:54 -0400)]
add changelog entries for madduck's changes

17 years agofinished up the action splitting
Joey Hess [Fri, 26 Oct 2007 00:49:21 +0000 (20:49 -0400)]
finished up the action splitting

This includes changes to how mr register works internally. Should be back-compatible.

17 years agodon't list rcs specific commands in usage message or
Joey Hess [Thu, 25 Oct 2007 23:49:32 +0000 (19:49 -0400)]
don't list rcs specific commands in usage message or
allow them to be run manually

Just too confusing.

This does also prevent user-defined commands from
having '_' in the name, but I think that's acceptable.

17 years agosplit up actions by rcs
Joey Hess [Thu, 25 Oct 2007 23:45:45 +0000 (19:45 -0400)]
split up actions by rcs

This will make it much easier to add new rcses, or modify just the command
that mr uses for one command for one rcs, without duplicating a lot of code.

17 years agoFix fake-bare worktree checkout
martin f. krafft [Thu, 25 Oct 2007 23:33:28 +0000 (01:33 +0200)]
Fix fake-bare worktree checkout

We have to jump through hoops to check out fake-bare repositories since
the target directory probably already exists. Thus, we cheat by telling
git-clone *not* to checkout and then read-tree and checkout-index
ourselves. We also convert the non-bare repository to a fake bare one by
moving stuff around.

Probably a bit hackish but this is the best I can do for now.

17 years agoFix fake-bare worktree checkout
martin f. krafft [Thu, 25 Oct 2007 23:33:28 +0000 (01:33 +0200)]
Fix fake-bare worktree checkout

We have to jump through hoops to check out fake-bare repositories since
the target directory probably already exists. Thus, we cheat by telling
git-clone *not* to checkout and then read-tree and checkout-index
ourselves. We also convert the non-bare repository to a fake bare one by
moving stuff around.

Probably a bit hackish but this is the best I can do for now.

17 years agoDo not fail determining git url
martin f. krafft [Thu, 25 Oct 2007 23:11:08 +0000 (01:11 +0200)]
Do not fail determining git url

If no remote URL is in GIT_CONFIG, git-config returns non-zero and thus
causes the script to fail due to set -e. We test for $url anyway, so we
can just keep going here.

17 years agoreplace basename call with shell construct
martin f. krafft [Thu, 25 Oct 2007 21:44:41 +0000 (23:44 +0200)]
replace basename call with shell construct

Use ${PWD##*/} instead of $(basename $PWD)

17 years agoAdd info() and warning() akin to error()
martin f. krafft [Thu, 25 Oct 2007 21:39:41 +0000 (23:39 +0200)]
Add info() and warning() akin to error()

They don't exist but print to stderr.

17 years agoreplace $(pwd) calls with $PWD
martin f. krafft [Thu, 25 Oct 2007 21:37:24 +0000 (23:37 +0200)]
replace $(pwd) calls with $PWD

also ensure that $PWD is defined by adding it to lib

17 years agoRefactor repository type detection
martin f. krafft [Thu, 25 Oct 2007 21:35:00 +0000 (23:35 +0200)]
Refactor repository type detection

Repo type is now detected in get_repo_type() and case statements are
used instead of the if/elif/else/fi statements.

17 years agoRefactor checking for (type of) Git repository
martin f. krafft [Thu, 25 Oct 2007 20:41:12 +0000 (22:41 +0200)]
Refactor checking for (type of) Git repository

lib now has two new functions:

is_git_repo returns 0/true if its argument is a git repository
get_git_repo_type return 0/true if its argument is a git repository and
  prints one of non-bare/bare/fake-bare to stdout

The mr function implementations now use these functions and have been
simplified. We also allow bare repositories with limited functionality.

17 years agoImplement (initial) support for fake bare git repositories
martin f. krafft [Thu, 25 Oct 2007 19:57:17 +0000 (21:57 +0200)]
Implement (initial) support for fake bare git repositories

Fake bare git repositories are non-bare git repositories with a detached
worktree. Thus, they require core.worktree set in the configuration. The
current implementation assumes that such repositories are named foo.git.

So far, support has only been added for register, update, log, and
status. Specifically diff and commit do not work yet.

17 years agoadd a vim modeline to preserve joey's tabbing prefs
martin f. krafft [Thu, 25 Oct 2007 19:38:13 +0000 (21:38 +0200)]
add a vim modeline to preserve joey's tabbing prefs