From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#22860: [PATCH] vc-hg: prompt for branch to merge Date: Tue, 26 Nov 2019 00:57:59 +0200 Message-ID: <0cd1b663-0abc-256f-790e-2bc6af79992a@yandex.ru> References: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> <83lfs6tpb1.fsf@gnu.org> <1C27CCD0-2335-4EE2-B815-3D85F4B84D85@gmail.com> <83ftieto20.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="35995"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 Cc: 22860@debbugs.gnu.org To: Andrii Kolomoiets Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Nov 26 00:14:13 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iZNYa-0009Eq-0Z for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Nov 2019 00:14:12 +0100 Original-Received: from localhost ([::1]:48984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZNYY-0008I6-N1 for geb-bug-gnu-emacs@m.gmane.org; Mon, 25 Nov 2019 18:14:10 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45223) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZNYP-00088A-De for bug-gnu-emacs@gnu.org; Mon, 25 Nov 2019 18:14:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZNJu-0005xq-GS for bug-gnu-emacs@gnu.org; Mon, 25 Nov 2019 17:59:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:43923) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iZNJu-0005xB-AC for bug-gnu-emacs@gnu.org; Mon, 25 Nov 2019 17:59:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iZNJu-0004HO-9b for bug-gnu-emacs@gnu.org; Mon, 25 Nov 2019 17:59:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 25 Nov 2019 22:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22860 X-GNU-PR-Package: emacs Original-Received: via spool by 22860-submit@debbugs.gnu.org id=B22860.157472269016388 (code B ref 22860); Mon, 25 Nov 2019 22:59:02 +0000 Original-Received: (at 22860) by debbugs.gnu.org; 25 Nov 2019 22:58:10 +0000 Original-Received: from localhost ([127.0.0.1]:49896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZNJ4-0004GG-JB for submit@debbugs.gnu.org; Mon, 25 Nov 2019 17:58:10 -0500 Original-Received: from mail-wm1-f47.google.com ([209.85.128.47]:39180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZNJ2-0004Fz-GK for 22860@debbugs.gnu.org; Mon, 25 Nov 2019 17:58:09 -0500 Original-Received: by mail-wm1-f47.google.com with SMTP id t26so1139922wmi.4 for <22860@debbugs.gnu.org>; Mon, 25 Nov 2019 14:58:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=96WO9+j/AjWkaPok9YIt2ONvAT2Az6wa9/MaPvF6r+Y=; b=RwEqeK5++1kfnl/gHGou0e0OR2UYMz81MEgnWBi0ZskJaOUxgxkhEfW2nHrD2Cq6rS DvHrqJPf7p0gzzoAxMoH/qiosfmqg6xEOdH4wBJOBNxBcmNg9bRTGxHmc7x6JK/R9aNC PW90UR1Kw0+hxEjxcko9Gif26bNM1DKXTgLYT8R5aHsgQV0Q2gUaf5Pzps520zYf/U9Y pK7FXAxM1yQtDoPukRzYQcXr07c6hsLz5oc+yz2I9CdXccLS/bMZ8LG3ISNePx5gNS2U VlD3AEZ5SbynnMpUS2Ka34Id2Y0rwNg8y2uE6XjcQB9NC+4azwsjQCMAlenzHrCYhdhA AUlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=96WO9+j/AjWkaPok9YIt2ONvAT2Az6wa9/MaPvF6r+Y=; b=IHD69aJpWUsQGJLGWTTSinVSIISvhnqspStbFdoYNcEApIHvxnk5qo5RbbsnnMnkrS ARmzoQH9rLekJK4NgldL3KhrwZe4N9wQxmIDZDPvMVc4OGNbKSKycJs+zJ+l0wAgUZlP /Tp7A8bjOq+S2Tbj7TOB7UzpNVbcuu1s7bwEmf737vOUrEoOXzEoGdA/x32imCkkeBq5 NsLSU/iJzkXDV1QrI7TK9s9FBudZucRhi2D1XlRl2GjIyNAsScj+z3o6M7TiNSAXDacJ Sak4eI90OWXZv/F9RqAMecIo3+PoOMUMJI42do56tR6Q4dVq06CBJn3riVbTFyPfgyuC NJMQ== X-Gm-Message-State: APjAAAW3rxA0aXDq7Cpnsu+/SsFOiuGItskaUiigz4rYhgBud2NTUmuO choSRAULik5JWQFpR0lEWKIAYRsW X-Google-Smtp-Source: APXvYqyi/rWDFpKEJLDHBeXZpyPVcgUFjtIspIbhgMRGQFsv8CwCgg6FqnCuW9f6jNfbUPz5JyQEtg== X-Received: by 2002:a1c:7c18:: with SMTP id x24mr1005789wmc.21.1574722682075; Mon, 25 Nov 2019 14:58:02 -0800 (PST) Original-Received: from [192.168.0.5] ([212.50.117.215]) by smtp.googlemail.com with ESMTPSA id 205sm2059217wmb.3.2019.11.25.14.58.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Nov 2019 14:58:01 -0800 (PST) In-Reply-To: Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:172396 Archived-At: On 25.11.2019 23:55, Andrii Kolomoiets wrote: >> It's missing a colon after "NEWS" (":"). > > Fixed. Thank you. >>> +to the current repository). On Mercurial, this prompts for argument to >>> +pass to @command{hg merge}, with branch and tag names completion. The >>> +output from running the merge command is shown in a separate buffer. >> >> The fact that there is completion here is incidental. I'd omit that from this particular place in the manual. > > Fixed. In my defense, that sentence was modelled after git's one :) In that case, my opinion might conflict with Eli's (sorry). So I'll leave the final review to him. >>> +*** The Hg (Mercurial) back-end now prompts for revision to merge on >>> +'C-x v m' ('vc-merge'). >> >> Branch or revision? I understand that in practice the difference is minimal, but we should pick one or the other wording and use it consistently. Here, in the functions' docstrings, and in the prompt string as well. >> >> I'd prefer "branch" since it's usually what someone merges, but saying "revision" everywhere should also be okay. > > Initially it was "branch". But vc-hg doesn't work with branches at the moment. Even vc-create-tag creates bookmark instead of branch, see bug#17586 (but let's leave it to the future patches). Sure. It really creates (if branchp "bookmark" "tag"), but I'm not clear on the difference between branches and bookmarks in Mercurial anyway. > Besides that, "revision" is used in the "merge" command manual. "revision" can mean a lot of things, see "hg help revisions". Thats why I decide to replace "branch" with "revision". Ok, thank you. I think that "meaning lots of things" can correspond to Git's notion of "ref".