Commit Graph

104 Commits (29f3082772095030895111f199d6420ef1835250)

Author SHA1 Message Date
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 19cfec2654 * Correct a pair of logic errors that triggered if svnpath was empty. 2007-10-21 22:57:11 +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 c73e0b78f9 use --style default for get_ctime too 2007-08-29 03:02:41 +00:00
joey 67c6ff9b08 * mercurial: Fix rcs_getctime (thanks, bma) 2007-08-29 02:16:45 +00:00
joey 5b8e1cc369 thank goodness for test suites 2007-08-29 02:09:43 +00:00
joey 7813bcf08a * mercurial: Pass --style defaults to hg log to ensure right format is used. 2007-08-29 02:01:23 +00:00
joey c2ec0a97a1 remove unncessesary and unused loop labels 2007-08-24 18:07:15 +00:00
joey a18d99c3fa apply monotone patch 2007-08-24 01:20:25 +00:00
joey c2c943bc25 monotone updates 2007-08-21 16:55:13 +00:00
joey 38353384cf minor changes (but lots of them) 2007-08-21 03:58:00 +00:00
joey 62a4ea821d move enormous data block to __DATA__ 2007-08-21 03:31:27 +00:00
joey 4fcf25a820 remove the mtnbinpath config option; users should use PATH if they need
this kind of thing.

change formatting of some quotes
2007-08-21 03:22:45 +00:00
joey 50e1b43408 * Add monotone support, contributed by William Uther. 2007-08-21 03:10:35 +00:00
joey c8f7b9480e proper fix for adding file, based on jkoenig's patch 2007-08-15 00:06:20 +00:00
joey 3bfa109971 * Allow svnpath config option to contain additional extra slashes anywhere
w/o confusing ikiwiki.
* Rcs modules are now imported, so other modules that need similar
  normalisation of configs etc can do so.
2007-06-23 12:12:59 +00:00
joey 5c36a5cfc6 * Apply patch from hb that uses the full path to a file when adding a file
using the mercurial backend. Not 100% sure why it failed w/o the full
  path, but this still passes the test suite, and indeed, is how the test
  suite calls hg add.
2007-04-29 03:25:09 +00:00
joey 1e62d2bc0c * In mercurial backend, untaint ipaddr when using it as the user for the
commit. Thanks, Alexander Wirt. Closes: #420428
2007-04-22 17:45:39 +00:00
joey c5975243a5 * Support setting svnpath to "" for wikis that are rooted at the top of
their svn repositories, with no trunk directory.
2007-04-16 19:07:52 +00:00
joey 13c7a51f1f * Optimise displaytime, trimming maybe 6% off the build time. 2007-04-10 01:49:16 +00:00
joey c936ba1719 * Fix mercurial backend to deal with empty commit messages. 2007-03-24 15:14:53 +00:00
joey cb0c642aed * Applied a patch from Michał to make the mercurial backend pass --quiet to
hg.
2007-03-18 22:20:44 +00:00
joey c566e16d9e * Improve use of svn merge, by specifying the file to merge, rather than
chdiring to the srcdir (which wasn't right when merging in a subdir).
  Thanks Ethan.
2007-01-28 00:06:01 +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 d69488a9df qouting 2007-01-14 04:51:35 +00:00
joey 912521ef07 * Initial work on internationalization of the program code. po/ikiwiki.pot
is available for translation.
* Export gettext() from IkiWiki module.
2006-12-29 04:38:40 +00:00