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: Mon, 25 Nov 2019 16:41:32 +0200 Message-ID: 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="181541"; 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 , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Nov 25 15:42:18 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 1iZFZC-000l7w-4y for geb-bug-gnu-emacs@m.gmane.org; Mon, 25 Nov 2019 15:42:18 +0100 Original-Received: from localhost ([::1]:44802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZFZB-0007j7-35 for geb-bug-gnu-emacs@m.gmane.org; Mon, 25 Nov 2019 09:42:17 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53118) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZFYx-0007j1-7E for bug-gnu-emacs@gnu.org; Mon, 25 Nov 2019 09:42:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZFYw-0006vF-96 for bug-gnu-emacs@gnu.org; Mon, 25 Nov 2019 09:42:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:42046) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iZFYw-0006v8-55 for bug-gnu-emacs@gnu.org; Mon, 25 Nov 2019 09:42:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iZFYw-0008GH-4M for bug-gnu-emacs@gnu.org; Mon, 25 Nov 2019 09:42: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 14:42: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.157469291231741 (code B ref 22860); Mon, 25 Nov 2019 14:42:02 +0000 Original-Received: (at 22860) by debbugs.gnu.org; 25 Nov 2019 14:41:52 +0000 Original-Received: from localhost ([127.0.0.1]:48019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZFYl-0008Ft-Tv for submit@debbugs.gnu.org; Mon, 25 Nov 2019 09:41:52 -0500 Original-Received: from mail-ed1-f42.google.com ([209.85.208.42]:39257) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZFYk-0008Fh-KV for 22860@debbugs.gnu.org; Mon, 25 Nov 2019 09:41:50 -0500 Original-Received: by mail-ed1-f42.google.com with SMTP id n26so12909566edw.6 for <22860@debbugs.gnu.org>; Mon, 25 Nov 2019 06:41:50 -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=ND2WPsmVQW3kIdyLN4ZfOcdvNirndSqI7I8RtjCUeFE=; b=DSsM3zxPQUcyxKM18xj0NoNAW2Krgrxhql4/DyD+ESkFpURbSQ24NRZpU1I2L1Pkck lea5dmzmB5p2QFDhySpyGJ0OljtKB/KKtUh6TuAVh62DgdeLRNRylH0twbsUwn9fi465 Jb2RZB4xzpZ+vHtMwmjGjV5dfKW/Yr1QxgP22Z7zJw8PodOgoXIePZuBfAPAcMRQxKCC xeEhvefaWHs3SOgWCvVAoGKz6zAU8wtd3GpJ3eVItjG3mX1HqwszEwbRpYyENaS/TXls 92cPpcEFL24lP6V8T1eYaa1a4S2nS1M67YqpJd84CPrblKA4qTNMinczQYQqUUebB8Qg mHNw== 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=ND2WPsmVQW3kIdyLN4ZfOcdvNirndSqI7I8RtjCUeFE=; b=KRSHrwnvBwXTXalXZUXBiE5V4EcTEnKoFfPlPJt63mEYQRt6YjBGSyl3/08Pzfse+3 s2Xozs7VX49Uho9zLekEecN5DTY/3FGtZluIp7TwIsAWl8ZHlqDCvbhVRuU8iLNQZHa3 c0kwPwoh8uhZ7FzByOXQKM9Qr0vI2uiPNw+2kbmdX2jEVGQXioLFN4GL1khKiHy0kHBJ HxYgXZ2k4WOa+J6q+DkTyPA1EzKwK/yWNwEmF7Z4EbZ7gtE2tdnpXKtJsvZR7DFo0lTq DKSeGitnnceBJbNpjI0KBxjQ8yn6V8qSfwI4/xES1bThFb8ogXQdSiK2jVRWrvwfDPB6 K5nw== X-Gm-Message-State: APjAAAWxkSvyRZsVKRn0yQR/jANPqIzaalvbK7viVo1A0B2dTdAVBE1a 3AWvTcNDESnKJmb427Ct52BOWzuG X-Google-Smtp-Source: APXvYqzh0FEvzDtMx1k7ccWIjQr673yY7USZtA3wsMmc504w/qNcsF9Y5xNUTSKuDUlBJrcKioor0w== X-Received: by 2002:aa7:c65a:: with SMTP id z26mr19028411edr.261.1574692904556; Mon, 25 Nov 2019 06:41:44 -0800 (PST) Original-Received: from [192.168.0.149] ([109.110.245.170]) by smtp.googlemail.com with ESMTPSA id v20sm264715edr.69.2019.11.25.06.41.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Nov 2019 06:41:43 -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:172364 Archived-At: Hi Andrii, The patch looks good to me. Some minor nits: On 23.11.2019 22:15, Andrii Kolomoiets wrote: > * etc/NEWS Mention changes of vc-hg.el It's missing a colon after "NEWS" (":"). > +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. > +*** 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.