]> 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
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

17 years agoreleasing version 0.8
Joey Hess [Thu, 25 Oct 2007 10:22:59 +0000 (06:22 -0400)]
releasing version 0.8

17 years ago* Patch from Simon McVittie, to pass -a to darcs commands to avoid
Joey Hess [Thu, 25 Oct 2007 10:22:32 +0000 (06:22 -0400)]
* Patch from Simon McVittie, to pass -a to darcs commands to avoid
  interactive updates. Closes: #447999

17 years ago* Improve "in subdir" message.
Joey Hess [Wed, 24 Oct 2007 22:18:10 +0000 (18:18 -0400)]
* Improve "in subdir" message.

17 years agoreleasing version 0.7
Joey Hess [Wed, 24 Oct 2007 05:18:51 +0000 (01:18 -0400)]
releasing version 0.7

17 years ago* Patch from Simon McVittie, adding support for darcs repositories.
Joey Hess [Tue, 23 Oct 2007 16:46:58 +0000 (12:46 -0400)]
* Patch from Simon McVittie, adding support for darcs repositories.
Closes: #447729
17 years agouse git tag -l , needed by older gits
Joey Hess [Mon, 22 Oct 2007 18:57:06 +0000 (14:57 -0400)]
use git tag -l , needed by older gits

17 years ago* Fix inverted tests in tags command. (madduck)
Joey Hess [Mon, 22 Oct 2007 16:29:19 +0000 (12:29 -0400)]
* Fix inverted tests in tags command. (madduck)

17 years agoswitch tests for vcs directories for tags method
martin f. krafft [Mon, 22 Oct 2007 06:38:59 +0000 (08:38 +0200)]
switch tests for vcs directories for tags method

Signed-off-by: martin f. krafft <madduck@madduck.net>
17 years agoreleasing version 0.6
Joey Hess [Mon, 22 Oct 2007 01:54:42 +0000 (21:54 -0400)]
releasing version 0.6

17 years agodon't print \n between skipped repos
Joey Hess [Mon, 22 Oct 2007 00:04:26 +0000 (20:04 -0400)]
don't print \n between skipped repos

17 years agogetcwd might fail if the working directory is deleted. deal with it.
Joey Hess [Mon, 22 Oct 2007 00:02:18 +0000 (20:02 -0400)]
getcwd might fail if the working directory is deleted. deal with it.

17 years agofix leaf subdir case
Joey Hess [Sun, 21 Oct 2007 23:33:33 +0000 (19:33 -0400)]
fix leaf subdir case

17 years ago* Add ability to reorder repos, if you want mr to act on a given repo first
Joey Hess [Sun, 21 Oct 2007 21:21:22 +0000 (17:21 -0400)]
* Add ability to reorder repos, if you want mr to act on a given repo first
  or last.

17 years agoimprove wording
Joey Hess [Sun, 21 Oct 2007 18:09:53 +0000 (14:09 -0400)]
improve wording

17 years ago* hours_since was broken by design, and fixing it involved changing
Joey Hess [Sun, 21 Oct 2007 18:08:36 +0000 (14:08 -0400)]
* hours_since was broken by design, and fixing it involved changing
  its calling convention. If you used the old version, you'll get errors
  from the new old.

17 years agoreally works now
Joey Hess [Sun, 21 Oct 2007 06:16:22 +0000 (02:16 -0400)]
really works now

17 years agoon second thought, this is a better test
Joey Hess [Sun, 21 Oct 2007 06:12:21 +0000 (02:12 -0400)]
on second thought, this is a better test

17 years agoadd syntax check to build process
Joey Hess [Sun, 21 Oct 2007 06:11:11 +0000 (02:11 -0400)]
add syntax check to build process

17 years agoassume any action with "update" in its name is like update, and should checkout inste...
Joey Hess [Sun, 21 Oct 2007 06:09:56 +0000 (02:09 -0400)]
assume any action with "update" in its name is like update, and should checkout instead if the
directory isn't present

not very happy with this, but it makes the quietupdate hack work..

17 years agoinclude a simplified mrconfig and move the hairy stuff to mrconfig.complex
Joey Hess [Sun, 21 Oct 2007 05:54:40 +0000 (01:54 -0400)]
include a simplified mrconfig and move the hairy stuff to mrconfig.complex

17 years ago* Add to the example mrconfig a "tags" command that lists tags.
Joey Hess [Sun, 21 Oct 2007 05:49:49 +0000 (01:49 -0400)]
* Add to the example mrconfig a "tags" command that lists tags.
  (Currently only for svn and git.)

17 years agoreword
Joey Hess [Sun, 21 Oct 2007 05:43:46 +0000 (01:43 -0400)]
reword

17 years agomention mercurial too
Joey Hess [Sun, 21 Oct 2007 05:42:49 +0000 (01:42 -0400)]
mention mercurial too

17 years agoadd announcedir target, for news on its web page
Joey Hess [Sun, 21 Oct 2007 05:29:05 +0000 (01:29 -0400)]
add announcedir target, for news on its web page

17 years agoreleasing version 0.5
Joey Hess [Sun, 21 Oct 2007 05:27:40 +0000 (01:27 -0400)]
releasing version 0.5

17 years agomention new feature
Joey Hess [Sun, 21 Oct 2007 05:26:55 +0000 (01:26 -0400)]
mention new feature

17 years agoneed to manally reap children since it manually forks now
Joey Hess [Sun, 21 Oct 2007 05:23:29 +0000 (01:23 -0400)]
need to manally reap children since it manually forks now

17 years agotypo
Joey Hess [Sun, 21 Oct 2007 05:17:54 +0000 (01:17 -0400)]
typo

17 years agominor wording improvements
Joey Hess [Sun, 21 Oct 2007 05:15:42 +0000 (01:15 -0400)]
minor wording improvements

17 years agofix -j mode to preserve stderr distinct from stdout,
Joey Hess [Sun, 21 Oct 2007 05:10:59 +0000 (01:10 -0400)]
fix -j mode to preserve stderr distinct from stdout,
while still buffering them together

17 years agotypo
Joey Hess [Sat, 20 Oct 2007 21:32:46 +0000 (17:32 -0400)]
typo

17 years ago-j bugfixes
Joey Hess [Sat, 20 Oct 2007 21:29:11 +0000 (17:29 -0400)]
-j bugfixes

No need to explicitly wait for processes, closing the filehandle
to the child does that.

17 years agoreorder to avoid race
Joey Hess [Sat, 20 Oct 2007 21:18:19 +0000 (17:18 -0400)]
reorder to avoid race

17 years ago* Incorporate code from on Anthony Towns's mrs, to allow running
Joey Hess [Sat, 20 Oct 2007 21:08:54 +0000 (17:08 -0400)]
* Incorporate code from on Anthony Towns's mrs, to allow running
  multiple jobs in parallel. The -j flag controls this.
  This can produce enormous speedups. For me, mr update takes
  12 minutes, while mr -j 10 update takes 1 minute!

17 years agoimprove quietupdate
Joey Hess [Sat, 20 Oct 2007 17:31:17 +0000 (13:31 -0400)]
improve quietupdate

17 years agoadd an example of how to run git w/o getting random crap on stderr
Joey Hess [Sat, 20 Oct 2007 17:25:22 +0000 (13:25 -0400)]
add an example of how to run git w/o getting random crap on stderr

git is a real mess when it comes to
 a) parsing command line options consistently,
 b) outputting non-errors to stderr

:-(

17 years agoadd mercurial
Joey Hess [Sat, 20 Oct 2007 17:02:57 +0000 (13:02 -0400)]
add mercurial

17 years agocleanups
Joey Hess [Sat, 20 Oct 2007 17:01:38 +0000 (13:01 -0400)]
cleanups

17 years agoAdd support for mercurial
Alexander Wirt [Sat, 20 Oct 2007 10:10:25 +0000 (12:10 +0200)]
Add support for mercurial

Hi Joey,

this patch adds support for mecurial to mr.
It would be nice if you would be able to integrate it into mr.

Thanks
Alex

17 years agogit push example
Joey Hess [Sat, 20 Oct 2007 00:53:53 +0000 (20:53 -0400)]
git push example

17 years ago* Change mr update to use git pull -t origin master, to make sure new tags
Joey Hess [Sat, 20 Oct 2007 00:52:55 +0000 (20:52 -0400)]
* Change mr update to use git pull -t origin master, to make sure new tags
  are pulled. And since those might not always be the right parameters
  for git pull, any parameters passed to mr update will replace them.

17 years agoexample
Joey Hess [Fri, 19 Oct 2007 20:15:58 +0000 (16:15 -0400)]
example

17 years ago* Fix output of "mr config DEFAULT lib".
Joey Hess [Fri, 19 Oct 2007 20:14:58 +0000 (16:14 -0400)]
* Fix output of "mr config DEFAULT lib".

17 years agorewording
Joey Hess [Fri, 19 Oct 2007 20:02:47 +0000 (16:02 -0400)]
rewording

17 years ago* Removed special case repository deletion handling code. The same
Joey Hess [Fri, 19 Oct 2007 20:01:11 +0000 (16:01 -0400)]
* Removed special case repository deletion handling code. The same
  thing can be accomplished in a mrconfig by skipping a repo unless
  it exists, and printing a reminder on update. See the mrconfig file
  for an example.

17 years agocrazy idea
Joey Hess [Fri, 19 Oct 2007 00:17:49 +0000 (20:17 -0400)]
crazy idea

17 years agoa todo item based on one from madduck, plus my own experiences with chained updates
Joey Hess [Thu, 18 Oct 2007 22:35:01 +0000 (18:35 -0400)]
a todo item based on one from madduck, plus my own experiences with chained updates

17 years agoreleasing version 0.4
Joey Hess [Thu, 18 Oct 2007 22:24:52 +0000 (18:24 -0400)]
releasing version 0.4

17 years agoupdate changelog
Joey Hess [Thu, 18 Oct 2007 22:02:18 +0000 (18:02 -0400)]
update changelog

17 years agoI think it works now
Joey Hess [Thu, 18 Oct 2007 21:59:47 +0000 (17:59 -0400)]
I think it works now

17 years agoMerge branch 'master' into mrconfig_bestguess
Joey Hess [Thu, 18 Oct 2007 21:30:44 +0000 (17:30 -0400)]
Merge branch 'master' into mrconfig_bestguess

17 years agodon't abs_path($ENV{MR_CONFIG})
Joey Hess [Thu, 18 Oct 2007 20:42:30 +0000 (16:42 -0400)]
don't abs_path($ENV{MR_CONFIG})

mrconfig files can be symlinks to files in other directories. But the directory
the file is is significant, as it's the directory paths in the file
are relative to. abs_path follows the symlink, so take care not to use it.

17 years ago* Support registering CVS repositories. Closes: #447171
Joey Hess [Thu, 18 Oct 2007 20:20:51 +0000 (16:20 -0400)]
* Support registering CVS repositories. Closes: #447171

17 years agoincomplete work to try to guess the right mrconfig to register to
Joey Hess [Thu, 18 Oct 2007 20:11:31 +0000 (16:11 -0400)]
incomplete work to try to guess the right mrconfig to register to

madduck suggested that mr register should register to the closest
mrconfig file. This branch is a start at trying to do that, by redefining
MR_CONFIG to hold either the config file that registers the given repo,
or for unregistered repos, the closest mrconfig file

Current issues:
- absolute path is always passed in MR_CONFIG, which makes mr config
  add new repos with absolute paths
- MR_CONFIG is not set to the closest mrconfig file for unregistered repos
  yet. The problem is, if I do this, then it will override the setting
  from -c, and so it won't be possible to use mr register to register in an
  explicitly specified config file.

I think it also has some other bugs. For example, the current mapping
between directory and config file only allows for one config file in a given
directory. Which might not be true if you're using mr -c.

As far as I can take it for now, so stashing away in this branch.

17 years agotypo
Joey Hess [Thu, 18 Oct 2007 19:45:06 +0000 (15:45 -0400)]
typo

17 years agotypo
Joey Hess [Thu, 18 Oct 2007 19:44:56 +0000 (15:44 -0400)]
typo

17 years ago* Allow for more complex deleted tests, such as marking a repo deleted on
Joey Hess [Thu, 18 Oct 2007 19:43:09 +0000 (15:43 -0400)]
* Allow for more complex deleted tests, such as marking a repo deleted on
  some hosts, while not on others.

17 years agofis logic stupidity
Joey Hess [Thu, 18 Oct 2007 19:31:33 +0000 (15:31 -0400)]
fis logic stupidity

This kind of thing is why I shouldn't commit changes before lunch. But do I wait for lunch before committing stupid logic errors? Noo..

17 years ago* Add the -n switch, for disabling recursion.
Joey Hess [Thu, 18 Oct 2007 19:20:19 +0000 (15:20 -0400)]
* Add the -n switch, for disabling recursion.

17 years ago* Fix a bug caused by a stupid typo.
Joey Hess [Thu, 18 Oct 2007 19:01:17 +0000 (15:01 -0400)]
* Fix a bug caused by a stupid typo.

17 years ago* Output list of failed repos to stderr when -s is used.
Joey Hess [Thu, 18 Oct 2007 18:57:21 +0000 (14:57 -0400)]
* Output list of failed repos to stderr when -s is used.

17 years agoimprove changelog
Joey Hess [Thu, 18 Oct 2007 18:29:24 +0000 (14:29 -0400)]
improve changelog

17 years agofixup comment
Joey Hess [Thu, 18 Oct 2007 18:14:50 +0000 (14:14 -0400)]
fixup comment

17 years agoadd changelog entry and use mkdir -p
Joey Hess [Thu, 18 Oct 2007 18:09:27 +0000 (14:09 -0400)]
add changelog entry and use mkdir -p

17 years agoensure parent dir exists prior to checkout
martin f. krafft [Thu, 18 Oct 2007 15:30:30 +0000 (17:30 +0200)]
ensure parent dir exists prior to checkout

Signed-off-by: martin f. krafft <madduck@madduck.net>
17 years ago* Signal handling for commands run by mr, including handling of SIGINT
Joey Hess [Thu, 18 Oct 2007 17:58:44 +0000 (13:58 -0400)]
* Signal handling for commands run by mr, including handling of SIGINT
  to stop mr.

17 years ago* Fix mr register to work when -c is specified using a relative path and
Joey Hess [Thu, 18 Oct 2007 17:33:05 +0000 (13:33 -0400)]
* Fix mr register to work when -c is specified using a relative path and
  is used to register a sibdirectory.

17 years agoreleasing version 0.3
Joey Hess [Wed, 17 Oct 2007 16:49:19 +0000 (12:49 -0400)]
releasing version 0.3

17 years ago* Typo files from madduck.
Joey Hess [Wed, 17 Oct 2007 16:47:17 +0000 (12:47 -0400)]
* Typo files from madduck.

17 years ago* mr register will now write to whatever config file is specified with -c
Joey Hess [Wed, 17 Oct 2007 16:46:09 +0000 (12:46 -0400)]
* mr register will now write to whatever config file is specified with -c

17 years agotypo
Joey Hess [Wed, 17 Oct 2007 01:17:14 +0000 (21:17 -0400)]
typo

17 years ago* Add a check to make sure the expected directory exists after checkout.
Joey Hess [Tue, 16 Oct 2007 23:51:42 +0000 (19:51 -0400)]
* Add a check to make sure the expected directory exists after checkout.

17 years agosimplify, not going to track my own file for this as it's increasingly not
Joey Hess [Tue, 16 Oct 2007 18:30:57 +0000 (14:30 -0400)]
simplify, not going to track my own file for this as it's increasingly not
a good example :-)

17 years agoupdate
Joey Hess [Tue, 16 Oct 2007 18:29:28 +0000 (14:29 -0400)]
update