Commit Graph

38 Commits (9eeb031265f762e37bc85b6cfa418f1a16d80b5f)

Author SHA1 Message Date
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
joey 702b8721d3 * Add an openid plugin to support logging in using OpenID.
* Web commits by OpenID users will record the full OpenID url for the user,
  but in recentchanges, these urls will be converted to a simplified display
  form+link.
* Modified svn, git, tla backends to recognise such web commits.
2006-11-20 02:46:58 +00:00
joey 35ee7e44a6 * Make sure to check for errors from every eval. 2006-11-08 21:03:33 +00:00
joey f27a462b18 cosmetic changes from Recai 2006-10-14 03:10:33 +00:00
joey dae0f48e91 * Work on firming up the plugin interface:
- Plugins should not need to load IkiWiki::Render to get commonly
    used functions, so moved some functions from there to IkiWiki.
  - Picked out the set of functions and variables that most plugins
    use, documented them, and made IkiWiki export them by default,
    like a proper perl module should.
  - Use the other functions at your own risk.
  - This is not quite complete, I still have to decide whether to
    export some other things.
* Changed all plugins included in ikiwiki to not use "IkiWiki::" when
  referring to stuff now exported by the IkiWiki module.
* Anyone with a third-party ikiwiki plugin is strongly enrouraged
  to make like changes to it and avoid use of non-exported symboles from
  "IkiWiki::".
* Link debian/changelog and debian/news to NEWS and CHANGELOG.
* Support hyperestradier version 1.4.2, which adds a new required phraseform
  setting.
2006-09-09 22:50:27 +00:00
joey b6075d6163 move html escaping 2006-09-04 04:29:18 +00:00
joey 92065444d9 * Simplify the data structure returned by rcs_recentchanges to avoid
each rcs plugin needing to form complex strings on its own.
2006-09-03 19:53:23 +00:00
joey afedd60d79 * Match 'web commit from' in SVN and git, these are web commits too.
(Faidon)
2006-07-11 20:55:14 +00:00
joey 89697f2c7a * Patch from Recai to fix utf8 issues in git backend. 2006-07-05 20:54:10 +00:00
joey d1d212203c * Centralised all calls to HTML::Template and force all the templates
to be read as utf8.
2006-07-02 19:06:08 +00:00
joey 77c7582f72 * Patch from Recai to fix git recentchanges code to work with git 1.4 which
changed some output.
* Copyright update.
2006-06-19 03:33:23 +00:00
joey 57d10171e3 another from Recai 2006-06-04 13:14:13 +00:00
joey 00d761ab53 misc fixes from Recai 2006-06-03 18:03:41 +00:00
joey 30afedcfe2 * Add support for using git instead of subversion as the RCS backend,
tremendous thanks to Recai Oktaş for this.
* Doc updates for git.
2006-06-02 05:32:20 +00:00