From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Julio Merino Newsgroups: gmane.emacs.bugs Subject: bug#6513: vc-mtn broken with monotone 0.48 (can't even open files) Date: Sun, 5 Sep 2010 13:02:36 +0100 Message-ID: <5666743B-2157-4D9C-A2AC-0013D052C2A4@gmail.com> References: <1283411965.30748.1392965255@webmail.messagingengine.com> <8289C439-EC9F-4D70-85E3-E032DAEBA31F@gmail.com> <58A4E91D-E34F-4C20-8143-C0A54ECF8738@gmail.com> <87occd8hbe.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v1081) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1283688610 8924 80.91.229.12 (5 Sep 2010 12:10:10 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 5 Sep 2010 12:10:10 +0000 (UTC) Cc: Dan Nicolaescu , era eriksson , 6513@debbugs.gnu.org To: Chong Yidong Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Sep 05 14:10:07 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OsE2w-0000Oq-LV for geb-bug-gnu-emacs@m.gmane.org; Sun, 05 Sep 2010 14:10:07 +0200 Original-Received: from localhost ([127.0.0.1]:44488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OsE2w-0005AX-0w for geb-bug-gnu-emacs@m.gmane.org; Sun, 05 Sep 2010 08:10:06 -0400 Original-Received: from [140.186.70.92] (port=43694 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OsE2q-0005AL-C2 for bug-gnu-emacs@gnu.org; Sun, 05 Sep 2010 08:10:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OsE2p-0008Ot-3j for bug-gnu-emacs@gnu.org; Sun, 05 Sep 2010 08:10:00 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:60415) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OsE2p-0008Oo-12 for bug-gnu-emacs@gnu.org; Sun, 05 Sep 2010 08:09:59 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1OsDsE-0002bh-E7; Sun, 05 Sep 2010 07:59:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Julio Merino Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 05 Sep 2010 11:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6513 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 6513-submit@debbugs.gnu.org id=B6513.128368790910011 (code B ref 6513); Sun, 05 Sep 2010 11:59:02 +0000 Original-Received: (at 6513) by debbugs.gnu.org; 5 Sep 2010 11:58:29 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OsDrg-0002bQ-Qk for submit@debbugs.gnu.org; Sun, 05 Sep 2010 07:58:29 -0400 Original-Received: from mail-ww0-f42.google.com ([74.125.82.42]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OsDrf-0002bI-7r for 6513@debbugs.gnu.org; Sun, 05 Sep 2010 07:58:28 -0400 Original-Received: by wwj40 with SMTP id 40so1140572wwj.3 for <6513@debbugs.gnu.org>; Sun, 05 Sep 2010 05:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:mime-version :content-type:from:in-reply-to:date:cc:content-transfer-encoding :message-id:references:to:x-mailer; bh=ghASobDscqM/ROhJai3yvKxGApdzL+XET8E3hVVDhZA=; b=SvpNs4v9x1AB49sItyeIs3cBzGMzkVt2dIe9yU+hmIw/85yHL0lEOKlmE7PpdOiQum axT7GyhXz9VmxWq1k3Vr8f3YiJ9Tq2SQCVJXYC/bmKuXnsaKvu414wPgBC4Dewgp8uCA HhqZdtCKnepx1WCo343zJdQ0jsbDvMNrawOp8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-mailer; b=V6ISCLIaROsh1jBUssYEaEu1rQGIpz+x7El/EO1U0fU7FDwR/bxipTF8jtXO2DD+RS cvGY3oOpux0Ctf/iHLbbbSREYQTLENPmPZRWZu5HNAuaAUt9ZTXd6jl3HhE92niUBuJx LhE2wT5UkVFqvUyTiFcghP9TcnJlF55/eUzcU= Original-Received: by 10.227.37.8 with SMTP id v8mr820787wbd.37.1283688014901; Sun, 05 Sep 2010 05:00:14 -0700 (PDT) Original-Received: from calypso-wifi.julipedia.org (87-198-252-22.static.ptr.magnet.ie [87.198.252.22]) by mx.google.com with ESMTPS id b23sm3568796wbb.22.2010.09.05.05.00.12 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 05 Sep 2010 05:00:13 -0700 (PDT) In-Reply-To: <87occd8hbe.fsf@stupidchicken.com> X-Mailer: Apple Mail (2.1081) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sun, 05 Sep 2010 07:59:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:39990 Archived-At: On Sep 4, 2010, at 8:00 PM, Chong Yidong wrote: > Julio Merino writes: >=20 >>> Do you want to take a stab at it? >>> Just need to modify the parser for the mtn command... >>=20 >> Sure, and I actually even tried. But it's not as easy as changing >> some regexps... my elisp knowledge tends to zero. The thing is that >> the automate interface is good for automatic interaction, but its >> output is completely different to what the interactive interface >> provides. Hence, some of the assumptions currently in the code make >> it a bit harder to adjust... >=20 > If you provide several precise examples of the monotone output, = someone > else could try. OK, here they go. I'm listing all the different calls to mtn that I = found in vc-mtn, what they are being used for, and what they should be = instead. As I mentioned above, the code should be using "mtn automate" instead of = the commands directly, because the output of the automate subcommands is = designed to be parseable and to remain stable. Hope this helps. =3D=3D=3D> mtn status This is currently used to determine: 1) The state of a file. 2) The state of a directory. 3) The current branch name. 4) The identifier of the parent revision. Its output in 0.48 is something like: ---- begin ---- $ mtn status ---------------------------------------------------------------------- Revision: 74b28934c805d0f851ddf65b506b2b294b28bd1f Parent: fae253a2ecad09ee873d95fae7c53148708d5496 Author: jmmv@NetBSD.org Date: 09/05/10 12:41:28 Branch: testing Changes against parent fae253a2ecad09ee873d95fae7c53148708d5496 dropped dir2 dropped dir2/bar dropped file2 renamed dir1 to dir3 renamed file1 to file3 added dir4 added dir4/baz added file4 patched file0 ---- end ---- 1, 2 and 4 should be obtained using "mtn automate get_current_revision": ---- begin ---- $ mtn automate get_current_revision format_version "1" new_manifest [ebc50c8bd814864861acc5a3cbf8596e2f6424ca] old_revision [fae253a2ecad09ee873d95fae7c53148708d5496] delete "dir2" delete "dir2/bar" delete "file2" rename "dir1" to "dir3" rename "file1" to "file3" add_dir "dir4" add_file "dir4/baz" content [da39a3ee5e6b4b0d3255bfef95601890afd80709] add_file "file4" content [da39a3ee5e6b4b0d3255bfef95601890afd80709] patch "file0" from [da39a3ee5e6b4b0d3255bfef95601890afd80709] to [c2dfb20012cea6a8088917c6edea86db619000c8] ---- end ---- To get 3, aka the current branch name, one has to obtain the = old_revision value from the output above and run "mtn automate certs" on = it, to later get the value of the "branch" certificate: ---- begin ---- mtn automate certs fae253a2ecad09ee873d95fae7c53148708d5496 key [6ea96157b01677a59e263d6b82337b781ce57370] signature "ok" name "author" value "jmmv@NetBSD.org" trust "trusted" key [6ea96157b01677a59e263d6b82337b781ce57370] signature "ok" name "branch" value "testing" trust "trusted" key [6ea96157b01677a59e263d6b82337b781ce57370] signature "ok" name "changelog" value "Another. " trust "trusted" key [6ea96157b01677a59e263d6b82337b781ce57370] signature "ok" name "date" value "2010-09-05T09:08:42" trust "trusted" ---- end ---- =3D=3D=3D> mtn cat -r Use "mtn -r automate get_file_of " instead. =3D=3D=3D> mtn list tags Use "mtn automate tags": ---- begin ---- $ mtn automate tags tag "atf-0.1" revision [b5177db1b525d850f0df932506cf6a0910eb1696] signer [6ea96157b01677a59e263d6b82337b781ce57370] branches "org.NetBSD.atf.src" tag "atf-0.10" revision [bab5e0f99e767de2e6650bf3c1aa7a7aad23a915] signer [6ea96157b01677a59e263d6b82337b781ce57370] branches "org.NetBSD.atf.src" tag "atf-0.2" revision [d448334ad6893ecd494228e8d5555272adcc5643] signer [6ea96157b01677a59e263d6b82337b781ce57370] branches "org.NetBSD.atf.src" [... more similar entries ...] ---- end ---- =3D=3D=3D> mtn list branches Use "mtn automate branches": ---- begin ---- $ mtn automate branches org.NetBSD.atf.htdocs org.NetBSD.atf.src org.NetBSD.atf.src.doc org.NetBSD.atf.src.reorg ---- end ---- =3D=3D=3D> mtn add =3D=3D=3D> mtn commit -m =3D=3D=3D> mtn revert =3D=3D=3D> mtn log =3D=3D=3D> mtn diff =3D=3D=3D> mtn annotate =3D=3D=3D> mtn complete revision Can't find how to do these with the automate interface, so they should = remain as they are.