summaryrefslogtreecommitdiff
path: root/IkiWiki/Rcs/git.pm
blob: 3407354c9a28a5e9ccbe4f313ade0f4dd40ed6b2 (plain)
  1. #!/usr/bin/perl
  2. use warnings;
  3. use strict;
  4. use IkiWiki;
  5. use Encode;
  6. use open qw{:utf8 :std};
  7. package IkiWiki;
  8. my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
  9. my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes
  10. sub _safe_git (&@) { #{{{
  11. # Start a child process safely without resorting /bin/sh.
  12. # Return command output or success state (in scalar context).
  13. my ($error_handler, @cmdline) = @_;
  14. my $pid = open my $OUT, "-|";
  15. error("Cannot fork: $!") if !defined $pid;
  16. if (!$pid) {
  17. # In child.
  18. # Git commands want to be in wc.
  19. chdir $config{srcdir}
  20. or error("Cannot chdir to $config{srcdir}: $!");
  21. exec @cmdline or error("Cannot exec '@cmdline': $!");
  22. }
  23. # In parent.
  24. my @lines;
  25. while (<$OUT>) {
  26. chomp;
  27. push @lines, $_;
  28. }
  29. close $OUT;
  30. $error_handler->("'@cmdline' failed: $!") if $? && $error_handler;
  31. return wantarray ? @lines : ($? == 0);
  32. }
  33. # Convenient wrappers.
  34. sub run_or_die ($@) { _safe_git(\&error, @_) }
  35. sub run_or_cry ($@) { _safe_git(sub { warn @_ }, @_) }
  36. sub run_or_non ($@) { _safe_git(undef, @_) }
  37. #}}}
  38. sub _merge_past ($$$) { #{{{
  39. # Unlike with Subversion, Git cannot make a 'svn merge -rN:M file'.
  40. # Git merge commands work with the committed changes, except in the
  41. # implicit case of '-m' of git-checkout(1). So we should invent a
  42. # kludge here. In principle, we need to create a throw-away branch
  43. # in preparing for the merge itself. Since branches are cheap (and
  44. # branching is fast), this shouldn't cost high.
  45. #
  46. # The main problem is the presence of _uncommitted_ local changes. One
  47. # possible approach to get rid of this situation could be that we first
  48. # make a temporary commit in the master branch and later restore the
  49. # initial state (this is possible since Git has the ability to undo a
  50. # commit, i.e. 'git-reset --soft HEAD^'). The method can be summarized
  51. # as follows:
  52. #
  53. # - create a diff of HEAD:current-sha1
  54. # - dummy commit
  55. # - create a dummy branch and switch to it
  56. # - rewind to past (reset --hard to the current-sha1)
  57. # - apply the diff and commit
  58. # - switch to master and do the merge with the dummy branch
  59. # - make a soft reset (undo the last commit of master)
  60. #
  61. # The above method has some drawbacks: (1) it needs a redundant commit
  62. # just to get rid of local changes, (2) somewhat slow because of the
  63. # required system forks. Until someone points a more straight method
  64. # (which I would be grateful) I have implemented an alternative method.
  65. # In this approach, we hide all the modified files from Git by renaming
  66. # them (using the 'rename' builtin) and later restore those files in
  67. # the throw-away branch (that is, we put the files themselves instead
  68. # of applying a patch).
  69. my ($sha1, $file, $message) = @_;
  70. my @undo; # undo stack for cleanup in case of an error
  71. my $conflict; # file content with conflict markers
  72. eval {
  73. # Hide local changes from Git by renaming the modified file.
  74. # Relative paths must be converted to absolute for renaming.
  75. my ($target, $hidden) = (
  76. "$config{srcdir}/${file}", "$config{srcdir}/${file}.${sha1}"
  77. );
  78. rename($target, $hidden)
  79. or error("rename '$target' to '$hidden' failed: $!");
  80. # Ensure to restore the renamed file on error.
  81. push @undo, sub {
  82. return if ! -e "$hidden"; # already renamed
  83. rename($hidden, $target)
  84. or warn "rename '$hidden' to '$target' failed: $!";
  85. };
  86. my $branch = "throw_away_${sha1}"; # supposed to be unique
  87. # Create a throw-away branch and rewind backward.
  88. push @undo, sub { run_or_cry('git-branch', '-D', $branch) };
  89. run_or_die('git-branch', $branch, $sha1);
  90. # Switch to throw-away branch for the merge operation.
  91. push @undo, sub {
  92. if (!run_or_cry('git-checkout', $config{gitmaster_branch})) {
  93. run_or_cry('git-checkout','-f',$config{gitmaster_branch});
  94. }
  95. };
  96. run_or_die('git-checkout', $branch);
  97. # Put the modified file in _this_ branch.
  98. rename($hidden, $target)
  99. or error("rename '$hidden' to '$target' failed: $!");
  100. # _Silently_ commit all modifications in the current branch.
  101. run_or_non('git-commit', '-m', $message, '-a');
  102. # ... and re-switch to master.
  103. run_or_die('git-checkout', $config{gitmaster_branch});
  104. # Attempt to merge without complaining.
  105. if (!run_or_non('git-pull', '--no-commit', '.', $branch)) {
  106. $conflict = readfile($target);
  107. run_or_die('git-reset', '--hard');
  108. }
  109. };
  110. my $failure = $@;
  111. # Process undo stack (in reverse order). By policy cleanup
  112. # actions should normally print a warning on failure.
  113. while (my $handle = pop @undo) {
  114. $handle->();
  115. }
  116. error("Git merge failed!\n$failure\n") if $failure;
  117. return $conflict;
  118. } #}}}
  119. sub _parse_diff_tree ($@) { #{{{
  120. # Parse the raw diff tree chunk and return the info hash.
  121. # See git-diff-tree(1) for the syntax.
  122. my ($prefix, $dt_ref) = @_;
  123. # End of stream?
  124. return if !defined @{ $dt_ref } ||
  125. !defined @{ $dt_ref }[0] || !length @{ $dt_ref }[0];
  126. my %ci;
  127. # Header line.
  128. while (my $line = shift @{ $dt_ref }) {
  129. return if $line !~ m/^(.+) ($sha1_pattern)/;
  130. my $sha1 = $2;
  131. $ci{'sha1'} = $sha1;
  132. last;
  133. }
  134. # Identification lines for the commit.
  135. while (my $line = shift @{ $dt_ref }) {
  136. # Regexps are semi-stolen from gitweb.cgi.
  137. if ($line =~ m/^tree ([0-9a-fA-F]{40})$/) {
  138. $ci{'tree'} = $1;
  139. }
  140. elsif ($line =~ m/^parent ([0-9a-fA-F]{40})$/) {
  141. # XXX: collecting in reverse order
  142. push @{ $ci{'parents'} }, $1;
  143. }
  144. elsif ($line =~ m/^(author|committer) (.*) ([0-9]+) (.*)$/) {
  145. my ($who, $name, $epoch, $tz) =
  146. ($1, $2, $3, $4 );
  147. $ci{ $who } = $name;
  148. $ci{ "${who}_epoch" } = $epoch;
  149. $ci{ "${who}_tz" } = $tz;
  150. if ($name =~ m/^([^<]+) <([^@>]+)/) {
  151. my ($fullname, $username) = ($1, $2);
  152. $ci{"${who}_fullname"} = $fullname;
  153. $ci{"${who}_username"} = $username;
  154. }
  155. else {
  156. $ci{"${who}_fullname"} =
  157. $ci{"${who}_username"} = $name;
  158. }
  159. }
  160. elsif ($line =~ m/^$/) {
  161. # Trailing empty line signals next section.
  162. last;
  163. }
  164. }
  165. debug("No 'tree' or 'parents' seen in diff-tree output")
  166. if !defined $ci{'tree'} || !defined $ci{'parents'};
  167. $ci{'parent'} = @{ $ci{'parents'} }[0] if defined $ci{'parents'};
  168. # Commit message.
  169. while (my $line = shift @{ $dt_ref }) {
  170. if ($line =~ m/^$/) {
  171. # Trailing empty line signals next section.
  172. last;
  173. };
  174. $line =~ s/^ //;
  175. push @{ $ci{'comment'} }, $line;
  176. }
  177. # Modified files.
  178. while (my $line = shift @{ $dt_ref }) {
  179. if ($line =~ m{^:
  180. ([0-7]{6})[ ] # from mode
  181. ([0-7]{6})[ ] # to mode
  182. ($sha1_pattern)[ ] # from sha1
  183. ($sha1_pattern)[ ] # to sha1
  184. (.) # status
  185. ([0-9]{0,3})\t # similarity
  186. (.*) # file
  187. $}xo) {
  188. my ($sha1_from, $sha1_to, $file) =
  189. ($3, $4, $7 );
  190. if ($file =~ m/^"(.*)"$/) {
  191. ($file=$1) =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
  192. }
  193. $file =~ s/^\Q$prefix\E//;
  194. if (length $file) {
  195. push @{ $ci{'details'} }, {
  196. 'file' => decode_utf8($file),
  197. 'sha1_from' => $sha1_from,
  198. 'sha1_to' => $sha1_to,
  199. };
  200. }
  201. next;
  202. };
  203. last;
  204. }
  205. debug("No detail in diff-tree output") if !defined $ci{'details'};
  206. return \%ci;
  207. } #}}}
  208. sub git_commit_info ($;$) { #{{{
  209. # Return an array of commit info hashes of num commits (default: 1)
  210. # starting from the given sha1sum.
  211. my ($sha1, $num) = @_;
  212. $num ||= 1;
  213. my @raw_lines =
  214. run_or_die('git-log', "--max-count=$num", '--pretty=raw', '--raw', '--abbrev=40', '--always', '-m', '-r', $sha1, '--', '.');
  215. my ($prefix) = run_or_die('git-rev-parse', '--show-prefix');
  216. my @ci;
  217. while (my $parsed = _parse_diff_tree(($prefix or ""), \@raw_lines)) {
  218. push @ci, $parsed;
  219. }
  220. warn "Cannot parse commit info for '$sha1' commit" if !@ci;
  221. return wantarray ? @ci : $ci[0];
  222. } #}}}
  223. sub git_sha1 (;$) { #{{{
  224. # Return head sha1sum (of given file).
  225. my $file = shift || q{--};
  226. # Ignore error since a non-existing file might be given.
  227. my ($sha1) = run_or_non('git-rev-list', '--max-count=1', 'HEAD', $file);
  228. if ($sha1) {
  229. ($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
  230. } else { debug("Empty sha1sum for '$file'.") }
  231. return defined $sha1 ? $sha1 : q{};
  232. } #}}}
  233. sub rcs_update () { #{{{
  234. # Update working directory.
  235. run_or_cry('git-pull', $config{gitorigin_branch});
  236. } #}}}
  237. sub rcs_prepedit ($) { #{{{
  238. # Return the commit sha1sum of the file when editing begins.
  239. # This will be later used in rcs_commit if a merge is required.
  240. my ($file) = @_;
  241. return git_sha1($file);
  242. } #}}}
  243. sub rcs_commit ($$$;$$) { #{{{
  244. # Try to commit the page; returns undef on _success_ and
  245. # a version of the page with the rcs's conflict markers on
  246. # failure.
  247. my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
  248. if (defined $user) {
  249. $message = "web commit by $user" .
  250. (length $message ? ": $message" : "");
  251. }
  252. elsif (defined $ipaddr) {
  253. $message = "web commit from $ipaddr" .
  254. (length $message ? ": $message" : "");
  255. }
  256. # XXX: Wiki directory is in the unlocked state when starting this
  257. # action. But it takes time for a Git process to finish its job
  258. # (especially if a merge required), so we must re-lock to prevent
  259. # race conditions. Only when the time of the real commit action
  260. # (i.e. git-push(1)) comes, we'll unlock the directory.
  261. lockwiki();
  262. # Check to see if the page has been changed by someone else since
  263. # rcs_prepedit was called.
  264. my $cur = git_sha1($file);
  265. my ($prev) = $rcstoken =~ /^($sha1_pattern)$/; # untaint
  266. if (defined $cur && defined $prev && $cur ne $prev) {
  267. my $conflict = _merge_past($prev, $file, $dummy_commit_msg);
  268. return $conflict if defined $conflict;
  269. }
  270. # git-commit(1) returns non-zero if file has not been really changed.
  271. # so we should ignore its exit status (hence run_or_non).
  272. $message = possibly_foolish_untaint($message);
  273. if (run_or_non('git-commit', '-m', $message, '-i', $file)) {
  274. unlockwiki();
  275. run_or_cry('git-push', $config{gitorigin_branch});
  276. }
  277. return undef; # success
  278. } #}}}
  279. sub rcs_add ($) { # {{{
  280. # Add file to archive.
  281. my ($file) = @_;
  282. run_or_cry('git-add', $file);
  283. } #}}}
  284. sub rcs_recentchanges ($) { #{{{
  285. # List of recent changes.
  286. my ($num) = @_;
  287. eval q{use Date::Parse};
  288. error($@) if $@;
  289. my @rets;
  290. foreach my $ci (git_commit_info('HEAD', $num)) {
  291. my $title = @{ $ci->{'comment'} }[0];
  292. # Skip redundant commits.
  293. next if ($title eq $dummy_commit_msg);
  294. my ($sha1, $when) = (
  295. $ci->{'sha1'},
  296. time - $ci->{'author_epoch'}
  297. );
  298. my (@pages, @messages);
  299. foreach my $detail (@{ $ci->{'details'} }) {
  300. my $diffurl = $config{'diffurl'};
  301. my $file = $detail->{'file'};
  302. $diffurl =~ s/\[\[file\]\]/$file/go;
  303. $diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
  304. $diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
  305. $diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
  306. push @pages, {
  307. page => pagename($file),
  308. diffurl => $diffurl,
  309. };
  310. }
  311. push @messages, { line => $title };
  312. my ($user, $type) = (q{}, "web");
  313. if (defined $messages[0] &&
  314. $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
  315. $user = defined $2 ? "$2" : "$3";
  316. $messages[0]->{line} = $4;
  317. }
  318. else {
  319. $type ="git";
  320. $user = $ci->{'author_username'};
  321. }
  322. push @rets, {
  323. rev => $sha1,
  324. user => $user,
  325. committype => $type,
  326. when => $when,
  327. message => [@messages],
  328. pages => [@pages],
  329. };
  330. last if @rets >= $num;
  331. }
  332. return @rets;
  333. } #}}}
  334. sub rcs_notify () { #{{{
  335. # Send notification mail to subscribed users.
  336. #
  337. # In usual Git usage, hooks/update script is presumed to send
  338. # notification mails (see git-receive-pack(1)). But we prefer
  339. # hooks/post-update to support IkiWiki commits coming from a
  340. # cloned repository (through command line) because post-update
  341. # is called _after_ each ref in repository is updated (update
  342. # hook is called _before_ the repository is updated). Since
  343. # post-update hook does not accept command line arguments, we
  344. # don't have an $ENV variable in this function.
  345. #
  346. # Here, we rely on a simple fact: we can extract all parts of the
  347. # notification content by parsing the "HEAD" commit (which also
  348. # triggers a refresh of IkiWiki pages) and we can obtain the diff
  349. # by comparing HEAD and HEAD^ (the previous commit).
  350. my $sha1 = 'HEAD'; # the commit which triggers this action
  351. my $ci = git_commit_info($sha1);
  352. return if !defined $ci;
  353. my @changed_pages = map { $_->{'file'} } @{ $ci->{'details'} };
  354. my ($user, $message);
  355. if (@{ $ci->{'comment'} }[0] =~ m/$config{web_commit_regexp}/) {
  356. $user = defined $2 ? "$2" : "$3";
  357. $message = $4;
  358. }
  359. else {
  360. $user = $ci->{'author_username'};
  361. $message = join "\n", @{ $ci->{'comment'} };
  362. }
  363. require IkiWiki::UserInfo;
  364. send_commit_mails(
  365. sub {
  366. $message;
  367. },
  368. sub {
  369. join "\n", run_or_die('git-diff', "${sha1}^", $sha1);
  370. }, $user, @changed_pages
  371. );
  372. } #}}}
  373. sub rcs_getctime ($) { #{{{
  374. my $file=shift;
  375. # Remove srcdir prefix
  376. $file =~ s/^\Q$config{srcdir}\E\/?//;
  377. my $sha1 = git_sha1($file);
  378. my $ci = git_commit_info($sha1);
  379. my $ctime = $ci->{'author_epoch'};
  380. debug("ctime for '$file': ". localtime($ctime));
  381. return $ctime;
  382. } #}}}
  383. 1