summaryrefslogtreecommitdiff
path: root/IkiWiki/Rcs
AgeCommit message (Collapse)Author
2008-04-10Use bzr --quiet to avoid it outputting stuff and messing up http headers. ↵Joey Hess
(Scott Bronson)
2008-04-10Fix broken rcs_update for bzr. (Scott Bronson)Joey Hess
2008-03-12truncate recentchangesdiffs after 200 linesJoey Hess
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-12use git show to get the diffJoey Hess
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* monotone: Require version 0.38 or greater, and stop using the mtnmergercJoey Hess
option. (Brian May)
2008-03-07* Remove locking code in git rcs_commit. I'm not sure if this was everJoey Hess
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-03* Add recentchangesdiff plugin that adds diffs to the recentchanges feeds.Joey Hess
* 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-02-20* tla: Remove call to escapeHTML when constructing recentchanges message;Joey Hess
the html is escaped at a different level. Closes: #466495 * bzr, mercurial: Remove unused import of escapeHTML.
2008-02-14* monotone: Add code to default mergerc file to runJoey Hess
_MTN/ikiwiki-netsync-hook when a commit is merged in from the net.
2008-02-03remove spurious EOFJoey Hess
2008-02-03* monotone changes by Brian May:Joey Hess
- 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.
2008-01-30Expand file-id in diffurl in the bzr backend.Jelmer Vernooij
2008-01-29rename bazaar -> bzr after discussion with jelmerJoey Hess
2008-01-29commit only the changed fileJoey Hess
2008-01-29stylistic changesJoey Hess
Remarkably few. Also, I removed the stub for the obsolete rcs_notify function.
2008-01-29Merge git://git.samba.org/jelmer/ikiwikiJoey Hess
2008-01-29* Removed support for sending commit notification mails. Along with it wentJoey Hess
the svnrepo and notify settings, though both will be ignored if left in setup files.
2008-01-28change rcs_recentchanges when to absolute, not relative, timeJoey Hess
No point in using a relative time value in rcs_recentchanges. Different consumers of the info want different things.
2008-01-28remove debug messageJoey Hess
This can legitimately happen when there's a simple merge.
2008-01-28figured out how rev is used..Joey Hess
2008-01-28add an id field to the rcs_recentchanges return structureJoey Hess
There was an undocumented field named "rev", I think "id" is a better name, and nothing uses it yet.
2008-01-28remove extraneous quotingJoey Hess
2008-01-28test1Joey Hess
2008-01-28really fix commentJoey Hess
It doesn't really make sense to do notification from a post-commit hook.
2008-01-28update commentJoey Hess
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-28Finish bazaar backend and make the remaining test pass.Jelmer Vernooij
2008-01-28Initial work adding support for Bazaar.Jelmer Vernooij
2008-01-17Add full parser for git diff-tree outputBrian Downing
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>
2007-12-16* git: Correct display of multiline commit messages in recentchanges.Joey Hess
2007-11-12* The first git commit legitimately has no parents. Avoid recentchangesJoey Hess
spewing uninitialised value warnings and debug messages about it. Dummying up a parent of 0000000 allows gitweb to work too.
2007-10-31fix dumb mistakeJoey Hess
2007-10-31* Don't truncate git commit messages to the first line in RecentChanges,Joey Hess
show the full message.
2007-10-31* Improve the RecentChanges display for git merges, by passing -c insteadJoey Hess
of -m to git-log, and by skipping display of commits that change no pages.
2007-10-31* Avoid using commands like git-diff and instead use "git diff".Joey Hess
In some configurations, only the main git command is in the path.
2007-10-31* Avoid a race in the git rcs_commit function, by not assuming HEAD willJoey Hess
stay the same for the duration of the function.
2007-10-26Run git-commit -q (though it doesn't do much good due to its stderr abuse).Joey Hess
2007-10-22* If gitorigin_branch is set to the empty string, don't push or pull.joey
Useful for laptop clones of remote wikis.
2007-10-21minor stylistic changesjoey
2007-10-21* Correct a pair of logic errors that triggered if svnpath was empty.joey
2007-10-21 * Support git authors of the form "joey <joey>", which is common whenjoey
importing from a svn repo.
2007-10-10* Fix strange stderr-hiding code in the git module, allow error messagesjoey
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* French translation update. Closes: #445923joey
* Fix --get-ctime with git, needed to remove srcdir from filename.
2007-10-04* Tidy ctime debug output for git.joey
2007-08-30git.pm: Handle operating in sub-trees of a git repository.joshtriplett
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-30git.pm: Renames from git-diff-tree aren't handled, so don't ask for them.joshtriplett
Patch by Jamey Sharp <jamey@minilop.net>.
2007-08-30Use git-log rather than the shell, git-rev-list, and git-diff-tree.joshtriplett
Patch by Jamey Sharp <jamey@minilop.net>.
2007-08-29use --style default for get_ctime toojoey
2007-08-29* mercurial: Fix rcs_getctime (thanks, bma)joey
2007-08-29thank goodness for test suitesjoey
2007-08-29* mercurial: Pass --style defaults to hg log to ensure right format is used.joey