Commit Graph

63 Commits (f7b8f2297cf828ffc3b4175959e3c69fc2db93e2)

Author SHA1 Message Date
Joey Hess f7b8f2297c Add test for old versions of git that don't support --cleanup=verbatim, and munge empty commit messages. 2008-07-31 19:23:54 -04:00
Joey Hess cbddb5a4b8 add rcs_commit_staged and rcs_rename
Implemented for git and svn so far.

Note that rcs_commit_staged does assume that the rcs has the ability to
"stage" multiple changes for a later commit. Support for this varies, but
all we really care about is staging removals and renames, which, AFAIK, all
modern rcs's support.
2008-07-22 16:14:33 -04:00
Joey Hess c6d1ae33d2 All rcs backends need to implement rcs_remove
(Done for svn, git.)
2008-07-21 13:41:17 -04:00
Joey Hess 2c9ab7065e mark old web commits as from web 2008-07-17 19:25:10 -04:00
Joey Hess e8a11957df fix web commit determination 2008-07-17 19:23:00 -04:00
Joey Hess afd3126e55 dummy up an email address for web commits
Not doing so breaks cia and other things that try to parse a username out
of the email address.
2008-07-17 19:12:34 -04:00
Joey Hess 1b318dacbd git: Fix parsing of git logs with no commit messages at all. 2008-07-17 16:53:54 -04:00
Joey Hess f66eddccc6 change how web commits are specified
The trailer line was a bit complex and ugly;
I think it's better to just put "(web)" after the user
name.

This has a side effect of making web commits with no messages
have a completly empty commit message. Use --cleanup=verbatim
to force git to accept such.
2008-07-17 16:35:18 -04:00
Joey Hess ac62a47ea4 git: Put web committer name/openid/address in the git author field
The committer's email address is not used (because leaking email addresses
is not liked by many users). Closes: #451023

A "Web-commit" trailer is added, to allow telling the difference between
web commits and direct commits.
2008-07-17 16:17:15 -04:00
Joey Hess 4e1d7d8ff2 fix use ordering
The recent setup revamp exposed some latent bugs in use/package ordering
that caused some symbols to not the exported into the correct scope.
2008-07-11 06:09:34 -04:00
Joey Hess 0bf5248427 git: Skip over signed-off-by and similar lines in commit messages when generating recentchanges. 2008-05-15 18:03:44 -04:00
Joey Hess f06267fc3b git: Put -- before the filename when calling git rev-list to avoid warning message when the file doesn't exist. 2008-05-02 13:03:42 -04:00
Joey Hess 862ca19eb1 truncate recentchangesdiffs after 200 lines
This works around a perl crasher bug, and also avoids bloating pages
with enormous diffs.

rcs_recentchanges modified to return a list in an array context.
2008-03-12 15:45:10 -04:00
Joey Hess 3dc979470e use git show to get the diff
If a diff of the firsst commit in a git repo was requested, it would fail and
print to stderr since first^ isn't valid. Using git show will always work.
2008-03-12 14:44:20 -04:00
Joey Hess fc4c1b7ec8 * Remove locking code in git rcs_commit. I'm not sure if this was ever
correct, and it's certianly not correct now, since the wiki is locked
  before rcs_commit is ever called, and should not be unlocked by
  rcs_commit either.
2008-03-07 12:25:40 -05:00
Joey Hess d93aaed791 * Add recentchangesdiff plugin that adds diffs to the recentchanges feeds.
* rcs_diff is a new function that rcs modules should implement.
* Implemented rcs_diff for git, svn, and tla (tla version untested).
  Mercurial and monotone still todo.
2008-03-03 15:53:34 -05:00
Joey Hess d7fdd04b5a * Removed support for sending commit notification mails. Along with it went
the svnrepo and notify settings, though both will be ignored if left in
  setup files.
2008-01-29 00:36:58 -05:00
Joey Hess 9f25e3436b change rcs_recentchanges when to absolute, not relative, time
No point in using a relative time value in rcs_recentchanges. Different
consumers of the info want different things.
2008-01-28 22:57:22 -05:00
Joey Hess ad4f7bc075 remove debug message
This can legitimately happen when there's a simple merge.
2008-01-28 22:47:43 -05:00
Joey Hess e30b96baba figured out how rev is used.. 2008-01-28 21:23:56 -05:00
Joey Hess b11ddb88e6 add an id field to the rcs_recentchanges return structure
There was an undocumented field named "rev", I think "id" is a better name,
and nothing uses it yet.
2008-01-28 20:34:11 -05:00
Joey Hess 161947160b remove extraneous quoting 2008-01-28 18:01:51 -05:00
Joey Hess 84d3856512 test1 2008-01-28 17:41:02 -05:00
Joey Hess df32ad1139 really fix comment
It doesn't really make sense to do notification from a post-commit hook.
2008-01-28 17:36:36 -05:00
Joey Hess 52b16186c4 update comment
This is not only called from post-update in all configurations. Also, the
comment was innaccurate about what the post-update hook is passed.
2008-01-28 17:33:22 -05:00
Brian Downing 6d85ccdb6f Add full parser for git diff-tree output
The -c option to git log/diff-tree produces "merged" diffs with a
different format from normal ones.  However, the existing diff-tree
parser only accepted non-merged diff lines.  Merged diff lines caused
the parser to get out of sync.  This patch adds a full parser for diffs
with any number of parents.  See the "DIFF FORMAT FOR MERGES" section in
the git-diff-tree man page for more information.

Signed-off-by: Brian Downing <bdowning@lavos.net>
2008-01-17 11:15:23 -05:00
Joey Hess 58f1ef0784 * git: Correct display of multiline commit messages in recentchanges. 2007-12-16 16:52:39 -05:00
Joey Hess 8ffa59e610 * The first git commit legitimately has no parents. Avoid recentchanges
spewing uninitialised value warnings and debug messages about it.
  Dummying up a parent of 0000000 allows gitweb to work too.
2007-11-12 12:53:46 -05:00
Joey Hess 9e7160a664 fix dumb mistake 2007-10-31 18:42:14 -04:00
Joey Hess ada249e0dd * Don't truncate git commit messages to the first line in RecentChanges,
show the full message.
2007-10-31 18:35:37 -04:00
Joey Hess 3506f4ba07 * Improve the RecentChanges display for git merges, by passing -c instead
of -m to git-log, and by skipping display of commits that change no
  pages.
2007-10-31 18:32:22 -04:00
Joey Hess b8887c1cd7 * Avoid using commands like git-diff and instead use "git diff".
In some configurations, only the main git command is in the path.
2007-10-31 17:37:33 -04:00
Joey Hess c5d9c0d6b6 * Avoid a race in the git rcs_commit function, by not assuming HEAD will
stay the same for the duration of the function.
2007-10-31 17:17:03 -04:00
Joey Hess 730a3fb4b7 Run git-commit -q (though it doesn't do much good due to its stderr abuse). 2007-10-26 03:22:44 -04:00
joey 3613f72a3b * If gitorigin_branch is set to the empty string, don't push or pull.
Useful for laptop clones of remote wikis.
2007-10-22 01:47:30 +00:00
joey cadfac387c minor stylistic changes 2007-10-21 22:59:18 +00:00
joey a22d9f9721 * Support git authors of the form "joey <joey>", which is common when
importing from a svn repo.
2007-10-21 00:27:11 +00:00
joey eec289e281 * Fix strange stderr-hiding code in the git module, allow error messages
to be passed on to stderr. Also fixes a potential bug, since git error
  meesages were treated as if they came from git stdout.
2007-10-10 23:27:11 +00:00
joey 3fd86def96 * French translation update. Closes: #445923
* Fix --get-ctime with git, needed to remove srcdir from filename.
2007-10-10 18:15:15 +00:00
joey f948133a61 * Tidy ctime debug output for git. 2007-10-04 09:00:08 +00:00
joshtriplett 8de136222e git.pm: Handle operating in sub-trees of a git repository.
When looking for git commits that affect the wiki, only include changes
that affect the ikiwiki source directory. If that is not the top-level
directory in this git repository, strip off the prefix as given by
`git-rev-parse --show-prefix` from all names reported by git-log.

Patch by Jamey Sharp <jamey@minilop.net>.
2007-08-30 02:32:35 +00:00
joshtriplett c5ee59ec5e git.pm: Renames from git-diff-tree aren't handled, so don't ask for them.
Patch by Jamey Sharp <jamey@minilop.net>.
2007-08-30 02:32:32 +00:00
joshtriplett 7144514b93 Use git-log rather than the shell, git-rev-list, and git-diff-tree.
Patch by Jamey Sharp <jamey@minilop.net>.
2007-08-30 02:32:29 +00:00
joey c2ec0a97a1 remove unncessesary and unused loop labels 2007-08-24 18:07:15 +00:00
joey 72dbbe3a2c * Make gitorigin_branch and gitmaster_branch configurable via the setup
file. Closes: #408599
2007-01-27 23:56:17 +00:00
joey 76dd3c46aa cosmetics patch from Recai 2006-11-26 20:07:00 +00:00
joey c8a59c1c10 * Git backend improvements, including bug fixes and better robustness. 2006-11-26 20:05:57 +00:00
joey 04a9dbfe7d updates 2006-11-22 14:28:38 +00:00
joey ffb2700043 * Add a test suite for the mercurial backend, contributed by Emanuele Aina.
* Add a test suite for the svn backend.
* Daemonize before sending RPC pings, since that can take a while
  and/or hang.
* Daemonize before sending commit mails, as that can also take a long
  time/hang if the mail server is unhappy.
* Factor out commit mail sending code into new function.
2006-11-21 17:47:53 +00:00
joey 77356e8513 better subjects 2006-11-21 04:21:03 +00:00