From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Welsh Duggan Newsgroups: gmane.emacs.devel Subject: Re: merging emacs-24 Date: Fri, 28 Nov 2014 10:06:48 -0500 Message-ID: <8761dzfjp3.fsf@maru2.md5i.com> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87k32hrdj5.fsf@engster.org> <87vbm0a6zv.fsf@engster.org> <8361e0o7ee.fsf@gnu.org> <87fvd4trzx.fsf@igel.home> <831tooo576.fsf@gnu.org> <87k32ga3dh.fsf@engster.org> <877fyg9t8y.fsf@engster.org> <87r3wo5ftl.fsf@lifelogs.com> <83r3wnn3bq.fsf@gnu.org> <87bnnrflu1.fsf@maru2.md5i.com> <834mtjmkvi.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417187235 4980 80.91.229.3 (28 Nov 2014 15:07:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Nov 2014 15:07:15 +0000 (UTC) Cc: Michael Welsh Duggan , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 28 16:07:09 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XuN8V-0003cR-LC for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 16:07:07 +0100 Original-Received: from localhost ([::1]:44827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuN8V-0002O4-5U for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 10:07:07 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuN8M-0002Nr-Tt for emacs-devel@gnu.org; Fri, 28 Nov 2014 10:07:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XuN8I-0007c3-Ae for emacs-devel@gnu.org; Fri, 28 Nov 2014 10:06:58 -0500 Original-Received: from md5i.com ([75.151.244.229]:59530 helo=maru2) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuN8D-0007b9-9X; Fri, 28 Nov 2014 10:06:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=md5i.com; s=dkim; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:References:Subject:Cc:To:From; bh=YhFR1uWT5xjL/Q7R26M0DOHfYc02gWU8nd6wkF3k6s8=; b=XQg0JbOHtbMXe898ap8v6x8bdsrWY6rUn4K1a1ra8Hw9B5h+TT/glLrZK6NFP66KPx2qZ6IIK61XHuPUkZzDsHV/W1O1UAI2sTYMR1cDXxfnR4u1CIBc3l0gK3ip5MzD; Original-Received: from md5i by maru2 with local (Exim 4.84) (envelope-from ) id 1XuN8C-0007K9-Ei; Fri, 28 Nov 2014 10:06:48 -0500 In-Reply-To: <834mtjmkvi.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 28 Nov 2014 16:59:29 +0200") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 75.151.244.229 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178423 Archived-At: Eli Zaretskii writes: >> From: Michael Welsh Duggan >> Cc: emacs-devel@gnu.org >> Date: Fri, 28 Nov 2014 09:20:38 -0500 >> >> I experimented with setting the GIT_TRACE and GIT_TRACE_SETUP >> environment variables to ~/.git.log. On the upside, you get a log of >> what was done. On the downside, you get a log of just about >> _everything_ that was done. It is difficult to tell at a glance what >> command you typed in versus what commands your command is running under >> the hood. (Though git is usually fast enough that looking at the >> timestamps can give you a very good indication of what was manual versus >> automated.) >> >> It's definitely not as nice as .bzr.log, and the output is more tuned to >> debugging git than remembering what you did. But you should probably >> try it and see if its output is useful for you. > > Thanks, will do. As an extra note: if you set GIT_TRACE_PERFORMANCE to the same log, you a) get even more output! (Not really what you want, but...) b) You get output when the command ends that you can trace back to the beginning, allowing you to automate chunking the data. For example, from running 'git fetch': 10:05:38.995341 trace.c:315 setup: git_dir: .git 10:05:38.995375 trace.c:316 setup: worktree: /usr/local/home/md5i/src/emacs/master 10:05:38.995379 trace.c:317 setup: cwd: /usr/local/home/md5i/src/emacs/master 10:05:38.995383 trace.c:318 setup: prefix: (null) 10:05:38.995388 git.c:349 trace: built-in: git 'fetch' 10:05:39.187844 run-command.c:341 trace: run_command: 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet' 10:05:39.188061 exec_cmd.c:134 trace: exec: 'git' 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet' 10:05:39.188772 trace.c:315 setup: git_dir: .git 10:05:39.188794 trace.c:316 setup: worktree: /usr/local/home/md5i/src/emacs/master 10:05:39.188797 trace.c:317 setup: cwd: /usr/local/home/md5i/src/emacs/master 10:05:39.188800 trace.c:318 setup: prefix: (null) 10:05:39.188806 git.c:349 trace: built-in: git 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet' 10:05:39.191515 trace.c:414 performance: 0.002864780 s: git command: 'git' 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet' 10:05:39.192073 run-command.c:341 trace: run_command: 'rev-list' '--objects' '--stdin' '--not' '--all' 10:05:39.192224 exec_cmd.c:134 trace: exec: 'git' 'rev-list' '--objects' '--stdin' '--not' '--all' 10:05:39.192836 trace.c:315 setup: git_dir: .git 10:05:39.192856 trace.c:316 setup: worktree: /usr/local/home/md5i/src/emacs/master 10:05:39.192860 trace.c:317 setup: cwd: /usr/local/home/md5i/src/emacs/master 10:05:39.192863 trace.c:318 setup: prefix: (null) 10:05:39.192868 git.c:349 trace: built-in: git 'rev-list' '--objects' '--stdin' '--not' '--all' 10:05:39.195159 trace.c:414 performance: 0.002428034 s: git command: 'git' 'rev-list' '--objects' '--stdin' '--not' '--all' 10:05:39.196573 run-command.c:341 trace: run_command: 'gc' '--auto' 10:05:39.196690 exec_cmd.c:134 trace: exec: 'git' 'gc' '--auto' 10:05:39.197279 trace.c:315 setup: git_dir: .git 10:05:39.197297 trace.c:316 setup: worktree: /usr/local/home/md5i/src/emacs/master 10:05:39.197301 trace.c:317 setup: cwd: /usr/local/home/md5i/src/emacs/master 10:05:39.197304 trace.c:318 setup: prefix: (null) 10:05:39.197309 git.c:349 trace: built-in: git 'gc' '--auto' 10:05:39.197418 trace.c:414 performance: 0.000230295 s: git command: 'git' 'gc' '--auto' 10:05:39.197509 trace.c:414 performance: 0.202293483 s: git command: 'git' 'fetch' -- Michael Welsh Duggan (md5i@md5i.com)