summaryrefslogtreecommitdiff
path: root/IkiWiki/Rcs/git.pm
blob: 1882b43ef5f1c8e642b429785ca9e55af556ae48 (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' seen in diff-tree output") if !defined $ci{'tree'};
  166. if (defined $ci{'parents'}) {
  167. $ci{'parent'} = @{ $ci{'parents'} }[0];
  168. }
  169. else {
  170. $ci{'parent'} = 0 x 40;
  171. }
  172. # Commit message.
  173. while (my $line = shift @{ $dt_ref }) {
  174. if ($line =~ m/^$/) {
  175. # Trailing empty line signals next section.
  176. last;
  177. };
  178. $line =~ s/^ //;
  179. push @{ $ci{'comment'} }, $line;
  180. }
  181. # Modified files.
  182. while (my $line = shift @{ $dt_ref }) {
  183. if ($line =~ m{^
  184. (:+) # number of parents
  185. ([^\t]+)\t # modes, sha1, status
  186. (.*) # file names
  187. $}xo) {
  188. my $num_parents = length $1;
  189. my @tmp = split(" ", $2);
  190. my ($file, $file_to) = split("\t", $3);
  191. my @mode_from = splice(@tmp, 0, $num_parents);
  192. my $mode_to = shift(@tmp);
  193. my @sha1_from = splice(@tmp, 0, $num_parents);
  194. my $sha1_to = shift(@tmp);
  195. my $status = shift(@tmp);
  196. if ($file =~ m/^"(.*)"$/) {
  197. ($file=$1) =~ s/\\([0-7]{1,3})/chr(oct($1))/eg;
  198. }
  199. $file =~ s/^\Q$prefix\E//;
  200. if (length $file) {
  201. push @{ $ci{'details'} }, {
  202. 'file' => decode_utf8($file),
  203. 'sha1_from' => $sha1_from[0],
  204. 'sha1_to' => $sha1_to,
  205. };
  206. }
  207. next;
  208. };
  209. last;
  210. }
  211. return \%ci;
  212. } #}}}
  213. sub git_commit_info ($;$) { #{{{
  214. # Return an array of commit info hashes of num commits (default: 1)
  215. # starting from the given sha1sum.
  216. my ($sha1, $num) = @_;
  217. $num ||= 1;
  218. my @raw_lines = run_or_die('git', 'log', "--max-count=$num",
  219. '--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
  220. '-r', $sha1, '--', '.');
  221. my ($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');
  222. my @ci;
  223. while (my $parsed = _parse_diff_tree(($prefix or ""), \@raw_lines)) {
  224. push @ci, $parsed;
  225. }
  226. warn "Cannot parse commit info for '$sha1' commit" if !@ci;
  227. return wantarray ? @ci : $ci[0];
  228. } #}}}
  229. sub git_sha1 (;$) { #{{{
  230. # Return head sha1sum (of given file).
  231. my $file = shift || q{--};
  232. # Ignore error since a non-existing file might be given.
  233. my ($sha1) = run_or_non('git', 'rev-list', '--max-count=1', 'HEAD', $file);
  234. if ($sha1) {
  235. ($sha1) = $sha1 =~ m/($sha1_pattern)/; # sha1 is untainted now
  236. } else { debug("Empty sha1sum for '$file'.") }
  237. return defined $sha1 ? $sha1 : q{};
  238. } #}}}
  239. sub rcs_update () { #{{{
  240. # Update working directory.
  241. if (length $config{gitorigin_branch}) {
  242. run_or_cry('git', 'pull', $config{gitorigin_branch});
  243. }
  244. } #}}}
  245. sub rcs_prepedit ($) { #{{{
  246. # Return the commit sha1sum of the file when editing begins.
  247. # This will be later used in rcs_commit if a merge is required.
  248. my ($file) = @_;
  249. return git_sha1($file);
  250. } #}}}
  251. sub rcs_commit ($$$;$$) { #{{{
  252. # Try to commit the page; returns undef on _success_ and
  253. # a version of the page with the rcs's conflict markers on
  254. # failure.
  255. my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
  256. if (defined $user) {
  257. $message = "web commit by $user" .
  258. (length $message ? ": $message" : "");
  259. }
  260. elsif (defined $ipaddr) {
  261. $message = "web commit from $ipaddr" .
  262. (length $message ? ": $message" : "");
  263. }
  264. # Check to see if the page has been changed by someone else since
  265. # rcs_prepedit was called.
  266. my $cur = git_sha1($file);
  267. my ($prev) = $rcstoken =~ /^($sha1_pattern)$/; # untaint
  268. if (defined $cur && defined $prev && $cur ne $prev) {
  269. my $conflict = _merge_past($prev, $file, $dummy_commit_msg);
  270. return $conflict if defined $conflict;
  271. }
  272. # git commit returns non-zero if file has not been really changed.
  273. # so we should ignore its exit status (hence run_or_non).
  274. $message = possibly_foolish_untaint($message);
  275. if (run_or_non('git', 'commit', '-q', '-m', $message, '-i', $file)) {
  276. if (length $config{gitorigin_branch}) {
  277. run_or_cry('git', 'push', $config{gitorigin_branch});
  278. }
  279. }
  280. return undef; # success
  281. } #}}}
  282. sub rcs_add ($) { # {{{
  283. # Add file to archive.
  284. my ($file) = @_;
  285. run_or_cry('git', 'add', $file);
  286. } #}}}
  287. sub rcs_recentchanges ($) { #{{{
  288. # List of recent changes.
  289. my ($num) = @_;
  290. eval q{use Date::Parse};
  291. error($@) if $@;
  292. my @rets;
  293. foreach my $ci (git_commit_info('HEAD', $num)) {
  294. # Skip redundant commits.
  295. next if (@{$ci->{'comment'}}[0] eq $dummy_commit_msg);
  296. my ($sha1, $when) = (
  297. $ci->{'sha1'},
  298. $ci->{'author_epoch'}
  299. );
  300. my (@pages, @messages);
  301. foreach my $detail (@{ $ci->{'details'} }) {
  302. my $file = $detail->{'file'};
  303. my $diffurl = $config{'diffurl'};
  304. $diffurl =~ s/\[\[file\]\]/$file/go;
  305. $diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
  306. $diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
  307. $diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
  308. push @pages, {
  309. page => pagename($file),
  310. diffurl => $diffurl,
  311. };
  312. }
  313. push @messages, { line => $_ } foreach @{$ci->{'comment'}};
  314. my ($user, $type) = (q{}, "web");
  315. if (defined $messages[0] &&
  316. $messages[0]->{line} =~ m/$config{web_commit_regexp}/) {
  317. $user = defined $2 ? "$2" : "$3";
  318. $messages[0]->{line} = $4;
  319. }
  320. else {
  321. $type ="git";
  322. $user = $ci->{'author_username'};
  323. }
  324. push @rets, {
  325. rev => $sha1,
  326. user => $user,
  327. committype => $type,
  328. when => $when,
  329. message => [@messages],
  330. pages => [@pages],
  331. } if @pages;
  332. last if @rets >= $num;
  333. }
  334. return @rets;
  335. } #}}}
  336. sub rcs_diff ($) { #{{{
  337. my $rev=shift;
  338. my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint
  339. my @lines;
  340. foreach my $line (run_or_non("git", "show", $sha1)) {
  341. if (@lines || $line=~/^diff --git/) {
  342. push @lines, $line."\n";
  343. }
  344. }
  345. if (wantarray) {
  346. return @lines;
  347. }
  348. else {
  349. return join("", @lines);
  350. }
  351. } #}}}
  352. sub rcs_getctime ($) { #{{{
  353. my $file=shift;
  354. # Remove srcdir prefix
  355. $file =~ s/^\Q$config{srcdir}\E\/?//;
  356. my $sha1 = git_sha1($file);
  357. my $ci = git_commit_info($sha1);
  358. my $ctime = $ci->{'author_epoch'};
  359. debug("ctime for '$file': ". localtime($ctime));
  360. return $ctime;
  361. } #}}}
  362. 1