aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Rcs
Commit message (Collapse)AuthorAge
* fix use orderingJoey Hess2008-07-11
| | | | | The recent setup revamp exposed some latent bugs in use/package ordering that caused some symbols to not the exported into the correct scope.
* git: Skip over signed-off-by and similar lines in commit messages when ↵Joey Hess2008-05-15
| | | | generating recentchanges.
* git: Put -- before the filename when calling git rev-list to avoid warning ↵Joey Hess2008-05-02
| | | | message when the file doesn't exist.
* Use bzr --quiet to avoid it outputting stuff and messing up http headers. ↵Joey Hess2008-04-10
| | | | (Scott Bronson)
* Fix broken rcs_update for bzr. (Scott Bronson)Joey Hess2008-04-10
|
* truncate recentchangesdiffs after 200 linesJoey Hess2008-03-12
| | | | | | | 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.
* use git show to get the diffJoey Hess2008-03-12
| | | | | 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.
* * monotone: Require version 0.38 or greater, and stop using the mtnmergercJoey Hess2008-03-12
| | | | option. (Brian May)
* * Remove locking code in git rcs_commit. I'm not sure if this was everJoey Hess2008-03-07
| | | | | | 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.
* * Add recentchangesdiff plugin that adds diffs to the recentchanges feeds.Joey Hess2008-03-03
| | | | | | * 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.
* * tla: Remove call to escapeHTML when constructing recentchanges message;Joey Hess2008-02-20
| | | | | the html is escaped at a different level. Closes: #466495 * bzr, mercurial: Remove unused import of escapeHTML.
* * monotone: Add code to default mergerc file to runJoey Hess2008-02-14
| | | | _MTN/ikiwiki-netsync-hook when a commit is merged in from the net.
* remove spurious EOFJoey Hess2008-02-03
|
* * monotone changes by Brian May:Joey Hess2008-02-03
| | | | | | | - On commits, replace "mtn sync" bidirectional with "mtn push" single direction. No need to pull changes when doing a commit. mtn sync is still called in rcs_update. - Support for viewing differences via patches using viewmtn.
* Expand file-id in diffurl in the bzr backend.Jelmer Vernooij2008-01-30
|
* rename bazaar -> bzr after discussion with jelmerJoey Hess2008-01-29
|
* commit only the changed fileJoey Hess2008-01-29
|
* stylistic changesJoey Hess2008-01-29
| | | | Remarkably few. Also, I removed the stub for the obsolete rcs_notify function.
* Merge git://git.samba.org/jelmer/ikiwikiJoey Hess2008-01-29
|\
| * Finish bazaar backend and make the remaining test pass.Jelmer Vernooij2008-01-28
| |
| * Initial work adding support for Bazaar.Jelmer Vernooij2008-01-28
| |
* | * Removed support for sending commit notification mails. Along with it wentJoey Hess2008-01-29
| | | | | | | | | | the svnrepo and notify settings, though both will be ignored if left in setup files.
* | change rcs_recentchanges when to absolute, not relative, timeJoey Hess2008-01-28
| | | | | | | | | | No point in using a relative time value in rcs_recentchanges. Different consumers of the info want different things.
* | remove debug messageJoey Hess2008-01-28
| | | | | | | | This can legitimately happen when there's a simple merge.
* | figured out how rev is used..Joey Hess2008-01-28
| |
* | add an id field to the rcs_recentchanges return structureJoey Hess2008-01-28
| | | | | | | | | | There was an undocumented field named "rev", I think "id" is a better name, and nothing uses it yet.
* | remove extraneous quotingJoey Hess2008-01-28
| |
* | test1Joey Hess2008-01-28
| |
* | really fix commentJoey Hess2008-01-28
| | | | | | | | It doesn't really make sense to do notification from a post-commit hook.
* | update commentJoey Hess2008-01-28
|/ | | | | This is not only called from post-update in all configurations. Also, the comment was innaccurate about what the post-update hook is passed.
* Add full parser for git diff-tree outputBrian Downing2008-01-17
| | | | | | | | | | | 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>
* * git: Correct display of multiline commit messages in recentchanges.Joey Hess2007-12-16
|
* * The first git commit legitimately has no parents. Avoid recentchangesJoey Hess2007-11-12
| | | | | spewing uninitialised value warnings and debug messages about it. Dummying up a parent of 0000000 allows gitweb to work too.
* fix dumb mistakeJoey Hess2007-10-31
|
* * Don't truncate git commit messages to the first line in RecentChanges,Joey Hess2007-10-31
| | | | show the full message.
* * Improve the RecentChanges display for git merges, by passing -c insteadJoey Hess2007-10-31
| | | | | of -m to git-log, and by skipping display of commits that change no pages.
* * Avoid using commands like git-diff and instead use "git diff".Joey Hess2007-10-31
| | | | In some configurations, only the main git command is in the path.
* * Avoid a race in the git rcs_commit function, by not assuming HEAD willJoey Hess2007-10-31
| | | | stay the same for the duration of the function.
* Run git-commit -q (though it doesn't do much good due to its stderr abuse).Joey Hess2007-10-26
|
* * If gitorigin_branch is set to the empty string, don't push or pull.joey2007-10-22
| | | | Useful for laptop clones of remote wikis.
* minor stylistic changesjoey2007-10-21
|
* * Correct a pair of logic errors that triggered if svnpath was empty.joey2007-10-21
|
* * Support git authors of the form "joey <joey>", which is common whenjoey2007-10-21
| | | | | importing from a svn repo.
* * Fix strange stderr-hiding code in the git module, allow error messagesjoey2007-10-10
| | | | | to be passed on to stderr. Also fixes a potential bug, since git error meesages were treated as if they came from git stdout.
* * French translation update. Closes: #445923joey2007-10-10
| | | | * Fix --get-ctime with git, needed to remove srcdir from filename.
* * Tidy ctime debug output for git.joey2007-10-04
|
* git.pm: Handle operating in sub-trees of a git repository.joshtriplett2007-08-30
| | | | | | | | | | 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>.
* git.pm: Renames from git-diff-tree aren't handled, so don't ask for them.joshtriplett2007-08-30
| | | | | Patch by Jamey Sharp <jamey@minilop.net>.
* Use git-log rather than the shell, git-rev-list, and git-diff-tree.joshtriplett2007-08-30
| | | | | Patch by Jamey Sharp <jamey@minilop.net>.
* use --style default for get_ctime toojoey2007-08-29
|