Commit graph

68 commits

Author SHA1 Message Date
Joey Hess
bb4f31a0ee Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.

This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.

A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.

Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)

Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.

One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 17:03:12 -04:00
Joey Hess
a1e52f0ce5 hlint 2012-02-16 00:44:51 -04:00
Joey Hess
a35278430a log: Add --gource mode, which generates output usable by gource.
As part of this, I fixed up how log was getting the descriptions of
remotes.
2012-01-07 18:18:09 -04:00
Joey Hess
bdc49ddbdb typo 2012-01-07 00:45:01 -04:00
Joey Hess
dfa76069d4 reap zombies 2012-01-07 00:22:16 -04:00
Joey Hess
b8966433ef sped up git annex log rather a lot
See comment! Isn't git fun, always interesting approaches to optimise
things that seemed unfixably slow.
2012-01-07 00:15:01 -04:00
Joey Hess
945f56f348 cleanup
Broke out pure general functions etc.
2012-01-07 00:11:15 -04:00
Joey Hess
24b35113cf tweak 2012-01-06 23:43:18 -04:00
Joey Hess
64f9d00bed tweak 2012-01-06 21:51:39 -04:00
Joey Hess
2557bb8764 complete set of log options 2012-01-06 21:48:30 -04:00
Joey Hess
8e7de01047 log --before=date 2012-01-06 21:32:08 -04:00
Joey Hess
539f8c6f14 --boundry was not needed 2012-01-06 21:09:23 -04:00
Joey Hess
d8d72781af better data type 2012-01-06 18:58:35 -04:00
Joey Hess
3c88d57399 log --max-count=n 2012-01-06 17:48:02 -04:00
Joey Hess
078788a9e7 change log display
Including the file in the lines behaves better when limiting with --after,
since only files that changed in the time period are shown.

Still not fully happy with the line layout, but putting the +/- first
followed by the date seems a good change.
2012-01-06 17:36:13 -04:00
Joey Hess
9fb5f3edc7 log --after=date 2012-01-06 17:24:03 -04:00
Joey Hess
47646d44b7 use a zipper 2012-01-06 16:24:40 -04:00
Joey Hess
a3a9f87047 log: New command that displays the location log for file, showing each repository they were added to and removed from.
This needs to run git log on the location log files to get at all past
versions of the file, which tends to be a bit slow.

It would be possible to make a version optimised for showing the location
logs for every key. That would only need to run git log once, so would be
faster, but it would need to process an enormous amount of data, so
would not speed up the individual file case.

In the future it would be nice to support log --format. log --json also
doesn't work right yet.
2012-01-06 15:40:07 -04:00