From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 29 15:57:01 2016 Received: (at submit) by debbugs.gnu.org; 29 Feb 2016 20:57:02 +0000 Received: from localhost ([127.0.0.1]:54157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aaUsH-00089s-Ez for submit@debbugs.gnu.org; Mon, 29 Feb 2016 15:57:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45267) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aaUsD-00089H-Su for submit@debbugs.gnu.org; Mon, 29 Feb 2016 15:56:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaUs7-0002dk-DP for submit@debbugs.gnu.org; Mon, 29 Feb 2016 15:56:52 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:48483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaUs7-0002bt-9w for submit@debbugs.gnu.org; Mon, 29 Feb 2016 15:56:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaUs4-0004ay-QB for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 15:56:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaUrv-0002Zl-MC for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 15:56:48 -0500 Received: from esa2.ucsf.iphmx.com ([68.232.143.34]:5255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaUrv-0002ZX-C6 for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 15:56:39 -0500 Received: from mcbmobwap002.ucsfmedicalcenter.org ([64.54.35.146]) by esa2.ucsf.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 29 Feb 2016 12:56:38 -0800 X-AuditID: 40362392-f795c6d000005f23-93-56d4b084c0ff Received: from bcuda3.ucsf.edu (otp005580ots.ucsfmedicalcenter.org [64.54.36.202]) by mcbmobwap002.ucsfmedicalcenter.org (Symantec Mail Security) with SMTP id BA.9D.24355.480B4D65; Mon, 29 Feb 2016 12:56:36 -0800 (PST) X-ASG-Debug-ID: 1456779395-0a655e456358ff90002-HqB3X1 Received: from exht04.net.ucsf.edu (mx.ucsf.edu [64.54.247.193]) by bcuda3.ucsf.edu with ESMTP id nUQiVQ9wSBBPhomh (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 29 Feb 2016 12:56:35 -0800 (PST) X-Barracuda-Envelope-From: Ross.Boylan@ucsf.edu X-Barracuda-Effective-Source-IP: mx.ucsf.edu[64.54.247.193] X-Barracuda-Apparent-Source-IP: 64.54.247.193 Received: from ross-sas (64.54.171.2) by exht04.net.ucsf.edu (64.54.247.221) with Microsoft SMTP Server id 14.3.224.2; Mon, 29 Feb 2016 12:56:35 -0800 Received: from ross by ross-sas with local (Exim 4.82) (envelope-from ) id 1aaUrd-000E9G-9f for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 12:56:21 -0800 From: Ross Boylan To: Subject: 24.3; hg merge not too functional Date: Mon, 29 Feb 2016 12:56:21 -0800 X-ASG-Orig-Subj: 24.3; hg merge not too functional Message-ID: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> MIME-Version: 1.0 Content-Type: text/plain X-Barracuda-Connect: mx.ucsf.edu[64.54.247.193] X-Barracuda-Start-Time: 1456779395 X-Barracuda-Encrypted: ECDHE-RSA-AES256-SHA X-Barracuda-URL: https://bcuda3.ucsf.edu:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 5304 X-Virus-Scanned: by bsmtpd at ucsf.edu X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.27451 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-CFilter-Loop: Reflected X-Brightmail-Tracker: H4sIAAAAAAAAA01TbUgTcRzuv7vmqbu6ttJf0zCvF1LzpReldy2ShAyCYB8qqJs7t+Xe2m2l fShhmRQhkiBmihJlM9NFiJl9aA2MjAprGmmmS/xgoWUklJrV3e5m+/bc8/ye//P87s+fwJSX ItSE0eJg7RbGRMuj8JysdZrUi/f7NBktrvRtP73nclDepeqsw+ho1C4dazKeYe3pe05GGR5O f8ZtnUnF32Y/ykvRQOIVFEkAtRVe1bUsFnEM9A575FdQFKGkhhAEPnUjUciE8ck+mShMI7jj rpAc6eDvHZCLeCf0VdbhIk4F3/MbSDTUIJh6eQ0XPzoQVA7VYMKUnNoAtzsf8ccSxHIqDnoq gmYVlQzPLs4FR3BqHbxpf40JI0BthtbXRwSa5GFzuUsu4mXQc30saMUogKfj41io28zIO2kB Ghq63VLnFPjuvizxu6HLWy4Xj0+AwdF4kV4PgxOuCBGrobzpk7RWPHxtDkjrXoCKD4+DKwL1 DsHoTL1kWAlP3e/xSrSqNqxebVi9RiS7i2hzgdZs1Z5lbBkZm9OcBVyhmdUZCxhTASvcbZrV rn+Agre75lon+uXa50MUgWgF2Zjp1ygXM2e4ErMPpRMyegU5ca9Po1yitepKDAxnOGF3mliO Xk5iV3maXKC1TlORDwGB8dLqckHSMSXnWLtVNPhQHIHTseR8WYVGSekZB1vEsjbWHlIzCYIG 8mcbb1xmZ/VscaHR5AjJvC9JUKhwRQyUEZE+lEoo+FSrR0jlbIyZM+olo4psa+BZRYgVTC9Q LuHtCrTKlLjFamHVseRk8HBhxuC0LKSqY8gTpbywNEwQ/KFX8QWl8L9MRSYJuQr+zfyPVZKL BDJaIgXXF76ljG8JnrdCSwfjCG9Z9d0vtJRYYV5diqK9XabjMzss/V/Pb1TrUooHD0wqTHRP /dbcMdeG6dqE2fG5nv1Ydf3avKEnqcn5OY3zW2wdv90ph7Kd+b/7d92KDmQd+zNROPV3BB1s bY7TJ8uQv/fUzecJA1zCFlV2YlmMtippb9Ps9u6soh/Y+uw/Zafb8Y+F/VbPcJqGnlLROGdg NiVjdo75B+j9GzAZBAAA X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) C-x v d put me in version control dired mode for a mercurial-controlled directory. C-x v m then says Running "hg merge"... abort: branch 'logit' has one head - please merge with an explicit rev (run 'hg heads' to see all heads) It doesn't seem there's any way to specify the merge target. I am not prompted for it, even if using C-u as a prefix. vc.el says ;; - merge-branch () ;; ;; Merge another branch into the current one, prompting for a ;; location to merge from. ;; but in vc-hg.el that does not seem to be the behavior. This is probably a known problem, since the header on vc-hg.el has ;; - merge (file rev1 rev2) NEEDED This comment remains in the latest git revision. In GNU Emacs 24.3.1 (x86_64-pc-linux-gnu, GTK+ Version 3.10.7) of 2014-03-07 on lamiak, modified by Debian System Description: Ubuntu 14.04.4 LTS Configured using: `configure '--build' 'x86_64-linux-gnu' '--build' 'x86_64-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var/lib' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs24:/etc/emacs:/usr/local/share/emacs/24.3/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/24.3/site-lisp:/usr/share/emacs/site-lisp' '--with-crt-dir=/usr/lib/x86_64-linux-gnu' '--with-x=yes' '--with-x-toolkit=gtk3' '--with-toolkit-scroll-bars' 'build_alias=x86_64-linux-gnu' 'CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall' 'LDFLAGS=-Wl,-Bsymbolic-functions -Wl,-z,relro' 'CPPFLAGS=-D_FORTIFY_SOURCE=2'' Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix default enable-multibyte-characters: t Major mode: Emacs-Lisp Minor modes in effect: shell-dirtrack-mode: t tooltip-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t buffer-read-only: t line-number-mode: t transient-mark-mode: t Recent input: G M C-g # # SPC n e w SPC d a y RET d a t e ; SPC h g SPC h e a d s RET C-x v d RET C-x v m C-u C-x v m C-h c C-x v m C-h f v c - m e r g e RET C-x o ESC O B ESC O C ESC O C RET ESC [ 6 ~ ESC [ 5 ~ C-s v c - m e r g e C-s - b C-s C-s C-s C-s C-s C-g C-g ESC O A ESC O A ESC O A ESC O A ESC O A ESC O A ESC O A ESC O A ESC O A ESC O A ESC O C ESC O C ESC O C ESC O C ESC O C ESC O C ESC O C C-r v c - c a l l - b a c k e n d C-r C-r C-r C-r C-r RET C-r d e f u n SPC v c - c a l l C-s C-s C-s ESC < C-s v c - c a l l - b a c k e n d C-s C-s C-s C-s C-s C-s C-s C-s C-s C-s C-s C-s ESC < ESC [ 6 ~ ESC [ 6 ~ ESC [ 6 ~ ESC [ 6 ~ ESC [ 6 ~ C-x C-f v c - h g TAB RET C-s d e f u n SPC m e r DEL DEL DEL v c - m e r g e RET C-s m e r g e - b r ESC < ESC [ 6 ~ ESC [ 5 ~ ESC x r e p o r t - b u g RET Recent messages: uncompressing vc.el.gz...done Note: file is write protected Quit Mark saved where search started [2 times] Mark set Mark saved where search started Mark set uncompressing vc-hg.el.gz...done Note: file is write protected Mark saved where search started [2 times] Load-path shadows: /usr/share/emacs/24.3/site-lisp/debian-startup hides /usr/share/emacs/site-lisp/debian-startup Features: (shadow sort gnus-util mail-extr emacsbug message rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils find-func vc-git vc-bzr vc-sccs vc-svn vc-cvs vc-rcs vc-dir ewoc vc vc-dispatcher help-mode misearch multi-isearch dired ediff-merg ediff-diff ediff-wind ediff-help ediff-util ediff-mult ediff-init ediff server jka-compr info vc-hg ido ess-toolbar ess-mouse mouseme thingatpt browse-url ess-menu ess-swv ess-noweb ess-noweb-font-lock-mode ess-bugs-l essd-els ess-sas-d ess-sas-l ess-sas-a shell pcomplete ess-sta-d ess-sta-l cc-vars cc-defs make-regexp ess-sp6-d ess-sp3-d ess-julia ess-r-d compile ess-tracebug format-spec ess-roxy advice cl-lib advice-preload hideshow ess-help ess-developer ess-r-args eldoc help-fns ess-s-l ess ess-inf comint ansi-color ring ess-mode ess-noweb-mode ess-utils time-date ess-custom executable easymenu ess-compat ess-site emacs-goodies-el emacs-goodies-custom emacs-goodies-loaddefs easy-mmode tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs) From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 23 13:12:51 2019 Received: (at 22860) by debbugs.gnu.org; 23 Nov 2019 18:12:51 +0000 Received: from localhost ([127.0.0.1]:57737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYZtq-00007Z-NC for submit@debbugs.gnu.org; Sat, 23 Nov 2019 13:12:50 -0500 Received: from mail-lj1-f181.google.com ([209.85.208.181]:38487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYZtm-000077-L9 for 22860@debbugs.gnu.org; Sat, 23 Nov 2019 13:12:47 -0500 Received: by mail-lj1-f181.google.com with SMTP id k8so503506ljh.5 for <22860@debbugs.gnu.org>; Sat, 23 Nov 2019 10:12:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:mime-version:subject:message-id:date:to; bh=G10e9fbD2FCRRZ086mWbE7NI0kQECxn5VSSNcWOPERI=; b=bLnk5lTBysLl7fG1qM+WCHjxcWM/ox8A6iouOj6sqt9rJCOa5QkaUSQLZooxAb3cDe 2A8RO5wb0tE6vm7Kk0CXLiRRW9VxRwR82SUjUUKdBTdwQoU0Ab7S8NTUJhmkB6N3qMe0 l2pYQ+dUyTRWkgN+K2Scp0F/kMHLWJjTEFdLLn8NB4BYjXlD0y4zOXjoDbuNjJOOYwHX JrnNzlMxGPpnYb1F+sommHgCtblSAU6IZn1Uxqq/NVm3kTali3QgCWLK9E065c0dtgZ2 5At/idvQg1FqhwM7mBMrtfPbitTunK5sk/eSbsV9msjghEnNUKq2Wh62O5+g4OFlou2R vFfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:subject:message-id:date:to; bh=G10e9fbD2FCRRZ086mWbE7NI0kQECxn5VSSNcWOPERI=; b=aU80DVSaxdUVTHJb0+5qZvrWq7d999PtcG/8zlZ5ldSM2iHKgSrR0AbRMlTy0Ch0YN XlsA0Zd5GIOstX8hdrBuLFBCUH3ha2SQofmcxfafB2rstqCiD822DgXuaZbLsQaOgyJ8 ms9rimX6rWLp2EBpe3mSGGpK2OHPS1DJ/FJs04v2lXAxhs/HOr/YNH5szJVrKNrPjL2Z 43aV4hqKJixYWeGZf04W9pIdI+ZJdwU3d/DChlSdNGOq6MmKNJYF+Ttx9Rm+DIEibPOk J7xeGmbx0etrfmGZO93Vll7uvwsWN6si3we+SJ29IHjGly1Nqckto6rF5Uh+EeSFYb35 Ju1w== X-Gm-Message-State: APjAAAWoHfmjAjKEEftVChtU2cGNqwjA8a72Qd3inUMkO7f0xMkHw9VX dCiKyB0NRQ5GEfIucmfkfd101kp/eUc= X-Google-Smtp-Source: APXvYqwN/MXUc9cshd5QPkrwu5EzQRsF3IVO781iANVUgoL7kZ91ceSgoROMuPm+BFkBnQ3SMSd6Iw== X-Received: by 2002:a2e:9b4b:: with SMTP id o11mr16706255ljj.252.1574532750068; Sat, 23 Nov 2019 10:12:30 -0800 (PST) Received: from [192.168.0.104] ([91.206.110.132]) by smtp.gmail.com with ESMTPSA id 144sm1000475lfi.67.2019.11.23.10.12.28 for <22860@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Nov 2019 10:12:29 -0800 (PST) From: Andrii Kolomoiets Content-Type: multipart/mixed; boundary="Apple-Mail=_A48CD698-28DF-4ED7-8A63-96601EC57273" Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3601.0.10\)) Subject: [PATCH] vc-hg: prompt for branch to merge Message-Id: <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> Date: Sat, 23 Nov 2019 20:12:27 +0200 To: 22860@debbugs.gnu.org X-Mailer: Apple Mail (2.3601.0.10) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 22860 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Apple-Mail=_A48CD698-28DF-4ED7-8A63-96601EC57273 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Hi, See attached patch. --Apple-Mail=_A48CD698-28DF-4ED7-8A63-96601EC57273 Content-Disposition: attachment; filename=0001-vc-hg-prompt-for-branch-to-merge.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="0001-vc-hg-prompt-for-branch-to-merge.patch" Content-Transfer-Encoding: quoted-printable =46rom=2052af9a5a85aadb305035139fab2a962abb4eead0=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Andrii=20Kolomoiets=20=0A= Date:=20Sat,=2023=20Nov=202019=2018:43:47=20+0200=0ASubject:=20[PATCH]=20= vc-hg:=20prompt=20for=20branch=20to=20merge=0A=0A*=20lisp/vc/vc-hg.el=20= (vc-hg-merge-branch):=20Prompt=20for=20branch=20to=20merge.=0A= (vc-hg-revision-table):=20Use=20branches=20and=20tags=20as=20competion=20= candidates.=0A=0A*=20etc/NEWS=20Mention=20changes=20of=20vc-hg.el=0A=0A= This=20fixes=20bug#22860=0A=0Adiff=20--git=20a/etc/NEWS=20b/etc/NEWS=0A= index=20ad349b1613..abd2c616bd=20100644=0A---=20a/etc/NEWS=0A+++=20= b/etc/NEWS=0A@@=20-933,6=20+933,11=20@@=20values.=0A=20The=20'C-x=20v=20= h'=20command=20now=20works=20in=20buffers=20that=20visit=20files=20= controlled=0A=20by=20Hg.=0A=0A+***=20The=20Hg=20(Mercurial)=20back-end=20= now=20prompt=20for=20branch=20to=20merge.=0A+=0A+***=20The=20Hg=20= (Mercurial)=20back-end=20now=20use=20tag=20and=20branch=20names=20= instead=20of=0A+revision=20numbers=20as=20completion=20candidates=20on=20= reading=20revision.=0A+=0A=20+++=0A=20***=20'C-u=20C-x=20v=20D'=20= ('vc-root-version-diff')=20prompts=20for=20two=20revisions=0A=20and=20= compares=20their=20entire=20trees.=0Adiff=20--git=20a/lisp/vc/vc-hg.el=20= b/lisp/vc/vc-hg.el=0Aindex=2017d38fa400..b6cb315c1b=20100644=0A---=20= a/lisp/vc/vc-hg.el=0A+++=20b/lisp/vc/vc-hg.el=0A@@=20-564,7=20+564,8=20= @@=20vc-hg-expanded-log-entry=0A=20(defun=20vc-hg-revision-table=20= (files)=0A=20=20=20(let=20((default-directory=20(file-name-directory=20= (car=20files))))=0A=20=20=20=20=20(with-temp-buffer=0A-=20=20=20=20=20=20= (vc-hg-command=20t=20nil=20files=20"log"=20"--template"=20"{rev}=20")=0A= +=20=20=20=20=20=20(vc-hg-command=20t=20nil=20nil=20"branches"=20"-q")=0A= +=20=20=20=20=20=20(vc-hg-command=20t=20nil=20nil=20"tags"=20"-q")=0A=20=20= =20=20=20=20=20(split-string=0A=20=20=20=20=20=20=20=20= (buffer-substring-no-properties=20(point-min)=20(point-max))))))=0A=0A@@=20= -1483,13=20+1484,16=20@@=20vc-hg-push=0A=20=20=20(vc-hg--pushpull=20= "push"=20prompt=20nil=20(called-interactively-p=20'interactive)))=0A=0A=20= (defun=20vc-hg-merge-branch=20()=0A-=20=20"Merge=20incoming=20changes=20= into=20the=20current=20working=20directory.=0A+=20=20"Prompts=20for=20= branch=20and=20merge=20it=20into=20the=20current=20branch.=0A=20This=20= runs=20the=20command=20\"hg=20merge\"."=0A=20=20=20(let*=20((root=20= (vc-hg-root=20default-directory))=0A=20=09=20(buffer=20(format=20"*vc-hg=20= :=20%s*"=20(expand-file-name=20root)))=0A=20=20=20=20=20=20=20=20=20=20= ;;=20Disable=20pager.=0A-=20=20=20=20=20=20=20=20=20(process-environment=20= (cons=20"HGPLAIN=3D1"=20process-environment)))=0A-=20=20=20=20(apply=20= 'vc-do-async-command=20buffer=20root=20vc-hg-program=20'("--config"=20= "ui.report_untrusted=3D0"=20"merge"))=0A+=20=20=20=20=20=20=20=20=20= (process-environment=20(cons=20"HGPLAIN=3D1"=20process-environment))=0A+=20= =20=20=20=20=20=20=20=20(branch=20(vc-read-revision=20"Merge=20from=20= branch:=20")))=0A+=20=20=20=20(apply=20'vc-do-async-command=20buffer=20= root=20vc-hg-program=0A+=20=20=20=20=20=20=20=20=20=20=20(append=20= '("--config"=20"ui.report_untrusted=3D0"=20"merge")=0A+=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20(unless=20(string=3D=20branch=20= "")=20(list=20branch))))=0A=20=20=20=20=20(with-current-buffer=20buffer=20= (vc-run-delayed=20(vc-compilation-mode=20'hg)))=0A=20=20=20=20=20= (vc-set-async-update=20buffer)))=0A=0A--=0A2.15.1=0A= --Apple-Mail=_A48CD698-28DF-4ED7-8A63-96601EC57273-- From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 23 13:34:43 2019 Received: (at 22860) by debbugs.gnu.org; 23 Nov 2019 18:34:43 +0000 Received: from localhost ([127.0.0.1]:57760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaF0-0000fO-T0 for submit@debbugs.gnu.org; Sat, 23 Nov 2019 13:34:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34109) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaEt-0000ey-1u for 22860@debbugs.gnu.org; Sat, 23 Nov 2019 13:34:35 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iYaEn-00075B-TT; Sat, 23 Nov 2019 13:34:29 -0500 Received: from [176.228.60.248] (port=2297 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iYaEl-00014A-AL; Sat, 23 Nov 2019 13:34:29 -0500 Date: Sat, 23 Nov 2019 20:34:10 +0200 Message-Id: <83lfs6tpb1.fsf@gnu.org> From: Eli Zaretskii To: Andrii Kolomoiets In-reply-to: <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> (message from Andrii Kolomoiets on Sat, 23 Nov 2019 20:12:27 +0200) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge References: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Andrii Kolomoiets > Date: Sat, 23 Nov 2019 20:12:27 +0200 > > See attached patch. Thanks. > +*** The Hg (Mercurial) back-end now use tag and branch names instead of > +revision numbers as completion candidates on reading revision. Why "instead of revision numbers"? it sounds like a backward incompatible change. Can't we use both revision numbers and branch/tag names? > (defun vc-hg-merge-branch () > - "Merge incoming changes into the current working directory. > + "Prompts for branch and merge it into the current branch. "Prompt", not "prompts", for consistency with how we word our doc strings for functions. From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 23 13:47:05 2019 Received: (at 22860) by debbugs.gnu.org; 23 Nov 2019 18:47:05 +0000 Received: from localhost ([127.0.0.1]:57798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaQz-00010p-Hq for submit@debbugs.gnu.org; Sat, 23 Nov 2019 13:47:05 -0500 Received: from mail-wr1-f45.google.com ([209.85.221.45]:33763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaQr-00010E-2k for 22860@debbugs.gnu.org; Sat, 23 Nov 2019 13:46:58 -0500 Received: by mail-wr1-f45.google.com with SMTP id w9so12607953wrr.0 for <22860@debbugs.gnu.org>; Sat, 23 Nov 2019 10:46:56 -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=Guzc9imuRuZSmRI1hsBjrQLIjvlHKdGPcT+kZCa4UCU=; b=DKuH0XkYOoXeFeNaDdwHMch3IcR6Bjo+g9ewgfp5vGZob5HNvxaykRgFDUB6dsLFfd RJxbVTjPPRXb7rEZnDRipQIEdxUj5QfpkwhaQPL9MGrC1xLgkEaM1ynayIkSpHZR9Gm6 nqw+0IUxFAOjHI4PxjCIABn8dKt05C1cL0AyUwu+ewGZhDDf5firLhvYIwryI28njWZx 7NYgM1+0KWJ8q+qPsnKgGd3h/QurFYlT3ZkAiOVBLBhsgizP1i8SeillWYq/Lh3hyfJU GeNeFvbgdAVPcHOOIyfTZxlgK5Mfo2So+tdEN++2usPSZ48HQgwzNRYZFxcM9WFUbz0w fmqQ== 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=Guzc9imuRuZSmRI1hsBjrQLIjvlHKdGPcT+kZCa4UCU=; b=t3NgwUr7+kd85nbccKXc7oLnlQtyYVfWs/5VrOcFALfhMjgAy7hO0fUsN+fJJCWLeN c1mJTlknyI70ckXnc+A3m9TTWrFI3iluAOYc6bK5HWYBAhGG3xNRs92rxPMccAhPPpKm 2yPqyhW3C7fLyYq6uyukY75gqk4etynoZj1M7taesWsmkAgFQIc9EzhckDx4S7KX8tFW uoMMqVq01NhmRx6XE+rs3otik+QWJ9ODUBGeNe3XWXwU90KnCtuHObWjrRess11jOJbR MdLjOmw7b8zuQlbOqNKHDMIOyfjc0IC722FMueAKu6pfZ8daud/pB0VBeZqkEYHcOOxO +Quw== X-Gm-Message-State: APjAAAV+T/t/g8sWVD2jk0FZPhwwJLJdmMxhQ5/42QCMdokoGbmnigUu bAMUNjxsmJCiu+eNGJWeBEzdxaEU X-Google-Smtp-Source: APXvYqwjInDO5b0Ipnz6dg2T5C86dvMicIkCQ5Z3AODQ8ap8Lyw/OIVg6Uzp6yXPtoBi9C5MQPTDnQ== X-Received: by 2002:a05:6000:1602:: with SMTP id u2mr24825979wrb.249.1574534810569; Sat, 23 Nov 2019 10:46:50 -0800 (PST) Received: from [192.168.0.5] ([212.50.117.215]) by smtp.googlemail.com with ESMTPSA id z11sm3562295wrg.0.2019.11.23.10.46.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Nov 2019 10:46:50 -0800 (PST) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge To: Eli Zaretskii , Andrii Kolomoiets References: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> <83lfs6tpb1.fsf@gnu.org> From: Dmitry Gutov Message-ID: <3000a697-aaaf-0269-14be-f213f4c093c1@yandex.ru> Date: Sat, 23 Nov 2019 20:46:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <83lfs6tpb1.fsf@gnu.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) On 23.11.2019 20:34, Eli Zaretskii wrote: >> +*** The Hg (Mercurial) back-end now use tag and branch names instead of >> +revision numbers as completion candidates on reading revision. > Why "instead of revision numbers"? it sounds like a backward > incompatible change. Can't we use both revision numbers and > branch/tag names? It's a good change. You could see it in the patch I send yesterday too. The user doesn't need completion for revisions, but they can still input them. And for a large repository, listing all revisions is hella slow. From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 23 13:51:43 2019 Received: (at 22860) by debbugs.gnu.org; 23 Nov 2019 18:51:43 +0000 Received: from localhost ([127.0.0.1]:57806 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaVQ-00017S-CO for submit@debbugs.gnu.org; Sat, 23 Nov 2019 13:51:43 -0500 Received: from mail-lj1-f174.google.com ([209.85.208.174]:46067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaVM-000170-A7 for 22860@debbugs.gnu.org; Sat, 23 Nov 2019 13:51:36 -0500 Received: by mail-lj1-f174.google.com with SMTP id n21so11054752ljg.12 for <22860@debbugs.gnu.org>; Sat, 23 Nov 2019 10:51:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:mime-version:subject:date:in-reply-to:cc:to :references; bh=1Ns0Y0G1MMBMquqqzqSfnKduo1IDII4gfvY7nW3dvMI=; b=YOTnJTiQQlJbEedSCZ3l+bAHNcuRNvlOCngBT9xMYHxtDi+Y92MClpeRyDqmuJYaf9 5XGGWpsgyd8EvmCPLSskfpbb6QK/K1LWaLFJ9Mrn/LW4a+pHEmWejcfiMdaMBZMCVKHU LyftOQFc6r90vp+S8ORneLavCvmx0TRtxRNp7aM7tUaDekSRwycSOgwceCO9hb6X8ev1 m9MYckcKWfhJuie3UxiR63vmN7R4t8/rfJG1w1ZSX8uSLo9C8YRZvl9FnwTmG+vIugNM 99HaPrpeOFAGue2LAMrnJtZi2psXW1v0MQW+Fv85P2GsN3mIJtF1RzK4+QZ0WVuamCeA NKRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=1Ns0Y0G1MMBMquqqzqSfnKduo1IDII4gfvY7nW3dvMI=; b=e1rQTUPPvyNvZQUUl/ZNc7uahBifzhQQTtPMESrFlIRf6yZaV2N5At1ZyfAoa4fD5J 3yeVnMrb3vcsxBmUlL/k1y2hS3Q9t2hFsh4Jz2RqiPh7LQ/CJ4yBEOVx42+4pg9f2Oyu qA2IphlFGo06uEnWAwhMnFQ5RUIgpzP9yijqUXFPX3daqPnBLYJl2T2n9qB0B9KgJ5Mr btLCuBrZHS2X1QkBuYU0bAfzW2v38Zrb93fsNsgdotupZYqABCaCIz0uQYFeyStVY/5h qkx7B/rLVR/Ro5O9689gFHtzXzxVA3GmKNCJEKpLxVMSRoWgNFikv/SqSPp+MoUIuvF8 +wXg== X-Gm-Message-State: APjAAAUEB+lwMoZRQzaNIgZ1EwcmhkNmy3EoWhuGzh9THlHuS5r6vLKq BoZfH4HuOwxS4ncXdOXqtvI= X-Google-Smtp-Source: APXvYqyrYsdUAxGqOlfYjA1maDb9jp/YY9EA9x+mDU8Ff3OSX5szEeU61MLY56awPKPltg9ojHR0dQ== X-Received: by 2002:a2e:8e27:: with SMTP id r7mr16955002ljk.101.1574535090019; Sat, 23 Nov 2019 10:51:30 -0800 (PST) Received: from [192.168.0.104] ([91.206.110.132]) by smtp.gmail.com with ESMTPSA id c9sm1164258lfm.9.2019.11.23.10.51.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Nov 2019 10:51:29 -0800 (PST) From: Andrii Kolomoiets Message-Id: <1C27CCD0-2335-4EE2-B815-3D85F4B84D85@gmail.com> Content-Type: multipart/mixed; boundary="Apple-Mail=_46F4F6E4-BA67-405B-B527-4AE37069BFED" Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3601.0.10\)) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge Date: Sat, 23 Nov 2019 20:51:28 +0200 In-Reply-To: <83lfs6tpb1.fsf@gnu.org> To: Eli Zaretskii References: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> <83lfs6tpb1.fsf@gnu.org> X-Mailer: Apple Mail (2.3601.0.10) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Apple-Mail=_46F4F6E4-BA67-405B-B527-4AE37069BFED Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 23 Nov 2019, at 20:34, Eli Zaretskii wrote: > >> +*** The Hg (Mercurial) back-end now use tag and branch names instead of >> +revision numbers as completion candidates on reading revision. > > Why "instead of revision numbers"? it sounds like a backward > incompatible change. Can't we use both revision numbers and > branch/tag names? You are right, it's backward incompatible. And yes, revision numbers can be used with branch/tag names. But they should not. It was big surprise for me to see numbers from 0 to 116K as completion candidates on vc-retrieve-tag. IMO revision numbers are useles in completions. >> (defun vc-hg-merge-branch () >> - "Merge incoming changes into the current working directory. >> + "Prompts for branch and merge it into the current branch. > > "Prompt", not "prompts", for consistency with how we word our doc > strings for functions. Fixed. --Apple-Mail=_46F4F6E4-BA67-405B-B527-4AE37069BFED Content-Disposition: attachment; filename=0001-vc-hg-prompt-for-branch-to-merge.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="0001-vc-hg-prompt-for-branch-to-merge.patch" Content-Transfer-Encoding: quoted-printable =46rom=2052af9a5a85aadb305035139fab2a962abb4eead0=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Andrii=20Kolomoiets=20=0A= Date:=20Sat,=2023=20Nov=202019=2018:43:47=20+0200=0ASubject:=20[PATCH]=20= vc-hg:=20prompt=20for=20branch=20to=20merge=0A=0A*=20lisp/vc/vc-hg.el=20= (vc-hg-merge-branch):=20Prompt=20for=20branch=20to=20merge.=0A= (vc-hg-revision-table):=20Use=20branches=20and=20tags=20as=20competion=20= candidates.=0A=0A*=20etc/NEWS=20Mention=20changes=20of=20vc-hg.el=0A=0A= This=20fixes=20bug#22860=0A=0Adiff=20--git=20a/etc/NEWS=20b/etc/NEWS=0A= index=20ad349b1613..abd2c616bd=20100644=0A---=20a/etc/NEWS=0A+++=20= b/etc/NEWS=0A@@=20-933,6=20+933,11=20@@=20values.=0A=20The=20'C-x=20v=20= h'=20command=20now=20works=20in=20buffers=20that=20visit=20files=20= controlled=0A=20by=20Hg.=0A=0A+***=20The=20Hg=20(Mercurial)=20back-end=20= now=20prompt=20for=20branch=20to=20merge.=0A+=0A+***=20The=20Hg=20= (Mercurial)=20back-end=20now=20use=20tag=20and=20branch=20names=20= instead=20of=0A+revision=20numbers=20as=20completion=20candidates=20on=20= reading=20revision.=0A+=0A=20+++=0A=20***=20'C-u=20C-x=20v=20D'=20= ('vc-root-version-diff')=20prompts=20for=20two=20revisions=0A=20and=20= compares=20their=20entire=20trees.=0Adiff=20--git=20a/lisp/vc/vc-hg.el=20= b/lisp/vc/vc-hg.el=0Aindex=2017d38fa400..b6cb315c1b=20100644=0A---=20= a/lisp/vc/vc-hg.el=0A+++=20b/lisp/vc/vc-hg.el=0A@@=20-564,7=20+564,8=20= @@=20vc-hg-expanded-log-entry=0A=20(defun=20vc-hg-revision-table=20= (files)=0A=20=20=20(let=20((default-directory=20(file-name-directory=20= (car=20files))))=0A=20=20=20=20=20(with-temp-buffer=0A-=20=20=20=20=20=20= (vc-hg-command=20t=20nil=20files=20"log"=20"--template"=20"{rev}=20")=0A= +=20=20=20=20=20=20(vc-hg-command=20t=20nil=20nil=20"branches"=20"-q")=0A= +=20=20=20=20=20=20(vc-hg-command=20t=20nil=20nil=20"tags"=20"-q")=0A=20=20= =20=20=20=20=20(split-string=0A=20=20=20=20=20=20=20=20= (buffer-substring-no-properties=20(point-min)=20(point-max))))))=0A=0A@@=20= -1483,12=20+1484,15=20@@=20vc-hg-push=0A=20=20=20(vc-hg--pushpull=20= "push"=20prompt=20nil=20(called-interactively-p=20'interactive)))=0A=0A=20= (defun=20vc-hg-merge-branch=20()=0A-=20=20"Merge=20incoming=20changes=20= into=20the=20current=20working=20directory.=0A+=20=20"Prompt=20for=20= branch=20and=20merge=20it=20into=20the=20current=20branch.=0A=20This=20= runs=20the=20command=20\"hg=20merge\"."=0A=20=20=20(let*=20((root=20= (vc-hg-root=20default-directory))=0A=20=09=20(buffer=20(format=20"*vc-hg=20= :=20%s*"=20(expand-file-name=20root)))=0A=20=20=20=20=20=20=20=20=20=20= ;;=20Disable=20pager.=0A-=20=20=20=20=20=20=20=20=20(process-environment=20= (cons=20"HGPLAIN=3D1"=20process-environment)))=0A-=20=20=20=20(apply=20= 'vc-do-async-command=20buffer=20root=20vc-hg-program=20'("--config"=20= "ui.report_untrusted=3D0"=20"merge"))=0A+=20=20=20=20=20=20=20=20=20= (process-environment=20(cons=20"HGPLAIN=3D1"=20process-environment))=0A+=20= =20=20=20=20=20=20=20=20(branch=20(vc-read-revision=20"Merge=20from=20= branch:=20")))=0A+=20=20=20=20(apply=20'vc-do-async-command=20buffer=20= root=20vc-hg-program=0A+=20=20=20=20=20=20=20=20=20=20=20(append=20= '("--config"=20"ui.report_untrusted=3D0"=20"merge")=0A+=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20(unless=20(string=3D=20branch=20= "")=20(list=20branch))))=0A=20=20=20=20=20(with-current-buffer=20buffer=20= (vc-run-delayed=20(vc-compilation-mode=20'hg)))=0A=20=20=20=20=20= (vc-set-async-update=20buffer)))=0A=0A--=0A2.15.1=0A= --Apple-Mail=_46F4F6E4-BA67-405B-B527-4AE37069BFED-- From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 23 13:51:43 2019 Received: (at 22860) by debbugs.gnu.org; 23 Nov 2019 18:51:43 +0000 Received: from localhost ([127.0.0.1]:57808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaVT-00017W-7t for submit@debbugs.gnu.org; Sat, 23 Nov 2019 13:51:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaVM-000178-MA for 22860@debbugs.gnu.org; Sat, 23 Nov 2019 13:51:39 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iYaVH-0002Qm-FM; Sat, 23 Nov 2019 13:51:31 -0500 Received: from [176.228.60.248] (port=3435 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iYaVG-0002IZ-FU; Sat, 23 Nov 2019 13:51:31 -0500 Date: Sat, 23 Nov 2019 20:51:26 +0200 Message-Id: <83h82utoi9.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-reply-to: <3000a697-aaaf-0269-14be-f213f4c093c1@yandex.ru> (message from Dmitry Gutov on Sat, 23 Nov 2019 20:46:48 +0200) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge References: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> <83lfs6tpb1.fsf@gnu.org> <3000a697-aaaf-0269-14be-f213f4c093c1@yandex.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org, andreyk.mad@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Cc: 22860@debbugs.gnu.org > From: Dmitry Gutov > Date: Sat, 23 Nov 2019 20:46:48 +0200 > > On 23.11.2019 20:34, Eli Zaretskii wrote: > >> +*** The Hg (Mercurial) back-end now use tag and branch names instead of > >> +revision numbers as completion candidates on reading revision. > > Why "instead of revision numbers"? it sounds like a backward > > incompatible change. Can't we use both revision numbers and > > branch/tag names? > > It's a good change. You could see it in the patch I send yesterday too. > > The user doesn't need completion for revisions, but they can still input > them. And for a large repository, listing all revisions is hella slow. Do we perhaps want an option to get back the old behavior? From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 23 13:54:10 2019 Received: (at 22860) by debbugs.gnu.org; 23 Nov 2019 18:54:10 +0000 Received: from localhost ([127.0.0.1]:57818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaXp-0001C0-UJ for submit@debbugs.gnu.org; Sat, 23 Nov 2019 13:54:10 -0500 Received: from mail-wm1-f46.google.com ([209.85.128.46]:52984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaXf-0001BO-B3 for 22860@debbugs.gnu.org; Sat, 23 Nov 2019 13:53:59 -0500 Received: by mail-wm1-f46.google.com with SMTP id l1so10991189wme.2 for <22860@debbugs.gnu.org>; Sat, 23 Nov 2019 10:53:59 -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=5DsqyCFw3tTYzVv5Eq1+ZzjB1rapix1SZgMsOv2GiSM=; b=sN36ReR1mJgmgfVPPONbFhlKUk8hw+K9Zsw02I7B/Rt3adlSHRfvXdn1IOQEsSwQy6 GEkUdcHHZE79VPMvQq9x1C/7aRVX0pvgeVLLR9BKuFecQjsjoWuF/oD08KeUuyVWHZEZ 0cWe+jYMkXEDkBjWsksMZhWeVU+btbShoPMq8Emh3yH78qbidR5aoufiQw/VxSO303od GO1iSwkWX6xlb68+G6N6ajySpsO5vt4wqt3kvafjfUtWhRxoIwT7HXk4jZu73PWaMU/E uRY1dKah1CNMcypAWr9sKJG32V2FG44lEqv3/ho2DAkV2Byf6IYs23AlbzSbznFMv9Kp asGw== 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=5DsqyCFw3tTYzVv5Eq1+ZzjB1rapix1SZgMsOv2GiSM=; b=tfBvvatZ2nixDhjwE0EfouXrF0yMKigQWUJaCpFwnnws9o6PNjLPLnd9y7P9WdzNR6 iU7J3GGsRr9as86CGgdS6Fb/NvYqQ5jARGtVYeq3GtbKD9XCK5pipWLwOUPlLUn0rlZr e45CA4fX36ce2x4G12zuqngHj+qCYNBLvj4Md0QFhx7H2ZpC5V83gWQrO1R4W9miPH4A 6KiyWol9n1w8ZjQNK+4vKOSumEquRAat1wGRNlOEUML/NSzSoYHEze+eAEPn7wPX3nM7 LSaNGhJKBWTAD42kwi+rNT1MBxsG6+rS7DF6E+sPRmvvGFjqpWRKR/Zjy1WKL64TYfJD ZWRQ== X-Gm-Message-State: APjAAAVjw+doje1H8ejnA3dEk22fQDZ2nLVx3ka85rzDCMmiUGt8chtz M4LS9Tw7TgBWU80lhuxmV8vmfGVH X-Google-Smtp-Source: APXvYqxrMLsCpqjv5F3o4ZG8QorE0InWkB+w4/Kf0doDgWZcHJ90hdhtl6479reBBtOrlQz41IQx8A== X-Received: by 2002:a7b:c84b:: with SMTP id c11mr20647527wml.158.1574535233277; Sat, 23 Nov 2019 10:53:53 -0800 (PST) Received: from [192.168.0.5] ([212.50.117.215]) by smtp.googlemail.com with ESMTPSA id u26sm2707885wmj.9.2019.11.23.10.53.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Nov 2019 10:53:52 -0800 (PST) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge To: Eli Zaretskii References: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> <83lfs6tpb1.fsf@gnu.org> <3000a697-aaaf-0269-14be-f213f4c093c1@yandex.ru> <83h82utoi9.fsf@gnu.org> From: Dmitry Gutov Message-ID: Date: Sat, 23 Nov 2019 20:53:51 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <83h82utoi9.fsf@gnu.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org, andreyk.mad@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) On 23.11.2019 20:51, Eli Zaretskii wrote: > Do we perhaps want an option to get back the old behavior? I don't think so. There's little point in completion for numbers. From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 23 14:01:31 2019 Received: (at 22860) by debbugs.gnu.org; 23 Nov 2019 19:01:31 +0000 Received: from localhost ([127.0.0.1]:57834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaev-0001P8-8c for submit@debbugs.gnu.org; Sat, 23 Nov 2019 14:01:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYaep-0001Oo-28 for 22860@debbugs.gnu.org; Sat, 23 Nov 2019 14:01:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iYaej-0008V5-2P; Sat, 23 Nov 2019 14:01:17 -0500 Received: from [176.228.60.248] (port=4026 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iYaeg-0003pJ-N5; Sat, 23 Nov 2019 14:01:15 -0500 Date: Sat, 23 Nov 2019 21:01:11 +0200 Message-Id: <83ftieto20.fsf@gnu.org> From: Eli Zaretskii To: Andrii Kolomoiets In-reply-to: <1C27CCD0-2335-4EE2-B815-3D85F4B84D85@gmail.com> (message from Andrii Kolomoiets on Sat, 23 Nov 2019 20:51:28 +0200) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Andrii Kolomoiets > Date: Sat, 23 Nov 2019 20:51:28 +0200 > Cc: 22860@debbugs.gnu.org > > +*** The Hg (Mercurial) back-end now prompt for branch to merge. ^^^^^^ "Prompts" is more correct English. Also, I'm guessing this is about the "C-x v m" command, not in general? The NEWS item should say so. And finally, "C-x v m" is described in the user manual, but it only talks about Git and Bazaar; I thin we should mention Mercurial there as well. From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 23 15:15:19 2019 Received: (at 22860) by debbugs.gnu.org; 23 Nov 2019 20:15:19 +0000 Received: from localhost ([127.0.0.1]:57879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYboN-00038S-A3 for submit@debbugs.gnu.org; Sat, 23 Nov 2019 15:15:19 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:37435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iYboJ-000387-OF for 22860@debbugs.gnu.org; Sat, 23 Nov 2019 15:15:18 -0500 Received: by mail-lj1-f195.google.com with SMTP id d5so11234583ljl.4 for <22860@debbugs.gnu.org>; Sat, 23 Nov 2019 12:15:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:mime-version:subject:date:in-reply-to:cc:to :references; bh=v1Ll52v0IQ3U/8b5Y3yPng3Wp2Y1MyVGkoPstJ0ksTE=; b=RjUA7xVyiffws0tOlhw/d7lyy5rMJp4zeHcVvz2CLoCyKYCBfLjUvevjnOD9jXMdEg 8L2udrk2Gb8Z0U2re8mZMCwxPPB3EQ2kBF0yD8zgGog+vquZlkxCR0kfWdde0HDCjJ2g UERxaAs/gFT/ENYAwID3hBG2MucIk+h4x13OLK3LQvu/ulo9C634gu7cyem7y3m/Oi9U tm7tfcsluutiDI/Uvl6vWJdGQHwKvqp11l4VYPzfFHDwQJF/6TeHEWvzMvntDtseVuGq tMSOoBOzUEFti3oBtoVV0iSBqZ8x2iHzejnKIMFuLZ0x623omwVJJHvTRUMEoXCbw+61 4rQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=v1Ll52v0IQ3U/8b5Y3yPng3Wp2Y1MyVGkoPstJ0ksTE=; b=GP8fPQmATwQldK3SSqEgiMvonEXS8PHoHSzihDzG/g2x2h/dQ3bxZodRdwxivj9SkY nOu/Dn8gy7SB6yJpo0YOEp0FzPPydEEzg9QqVeW9jMbnH1yXx+V3xo2HRk+H3U1shWmi hQQU/JmY7SLHDT12YVc8SnPBVvivBoCTXbFfp7QPUq0zBQa/oH34qWZgyiv7/4jeXLVr dh+tFS28IaNA+V/UhQwrY0DeXehfAxpPfLE3ci9IS4ROzt4zjMe4Hqxj8zeRcgI9XMEP W2aNv4puQIQet028mOWRRAp+4IeXBiUn6BLiu3NSj5/U3UyaLtgrFkDx0/dvK+R4iSht 4rJQ== X-Gm-Message-State: APjAAAWGO65lrxyuXzrYHa6C+cU2XJBVFy/XLEkEkd2lhtTrvzl7H+AX blEljxVBp459U19vlOTpJ8E= X-Google-Smtp-Source: APXvYqwcNFnKMWHEYbeulJ85izyNe29dwXOjXCp15AbMWH6fEn+veUF8cdbwmc2QXYcG2VrxQk7zkQ== X-Received: by 2002:a2e:b4da:: with SMTP id r26mr15466060ljm.153.1574540109794; Sat, 23 Nov 2019 12:15:09 -0800 (PST) Received: from [192.168.0.104] ([91.206.110.132]) by smtp.gmail.com with ESMTPSA id i6sm1099439lfo.12.2019.11.23.12.15.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Nov 2019 12:15:09 -0800 (PST) From: Andrii Kolomoiets Message-Id: Content-Type: multipart/mixed; boundary="Apple-Mail=_46BFE37E-C141-4235-A2C3-2433569C5EB2" Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3601.0.10\)) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge Date: Sat, 23 Nov 2019 22:15:07 +0200 In-Reply-To: <83ftieto20.fsf@gnu.org> To: Eli Zaretskii 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> X-Mailer: Apple Mail (2.3601.0.10) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Apple-Mail=_46BFE37E-C141-4235-A2C3-2433569C5EB2 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 23 Nov 2019, at 21:01, Eli Zaretskii wrote: > >> From: Andrii Kolomoiets >> Date: Sat, 23 Nov 2019 20:51:28 +0200 >> Cc: 22860@debbugs.gnu.org >> >> +*** The Hg (Mercurial) back-end now prompt for branch to merge. > ^^^^^^ > "Prompts" is more correct English. > > Also, I'm guessing this is about the "C-x v m" command, not in > general? The NEWS item should say so. > > And finally, "C-x v m" is described in the user manual, but it only > talks about Git and Bazaar; I thin we should mention Mercurial there > as well. Done. --Apple-Mail=_46BFE37E-C141-4235-A2C3-2433569C5EB2 Content-Disposition: attachment; filename=0001-vc-hg-prompt-for-branch-to-merge.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="0001-vc-hg-prompt-for-branch-to-merge.patch" Content-Transfer-Encoding: quoted-printable =46rom=207fe0f7cb6cd15dfb307601eb126f1b1b72b073bd=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Andrii=20Kolomoiets=20=0A= Date:=20Sat,=2023=20Nov=202019=2018:43:47=20+0200=0ASubject:=20[PATCH]=20= vc-hg:=20prompt=20for=20branch=20to=20merge=0A=0A*=20lisp/vc/vc-hg.el=20= (vc-hg-merge-branch):=20Prompt=20for=20branch=20to=20merge.=0A= (vc-hg-revision-table):=20Use=20branches=20and=20tags=20as=20competion=20= candidates.=0A=0A*=20etc/NEWS=20Mention=20changes=20of=20vc-hg.el=0A=0A*=20= doc/emacs/maintaining.texi=20(Switching=20Branches):=20Mention=20'hg=20= update'=0Acommand.=0A(Merging):=20Mention=20'hg=20merge'=20command.=0A=0A= This=20fixes=20bug#22860=0A=0Adiff=20--git=20= a/doc/emacs/maintaining.texi=20b/doc/emacs/maintaining.texi=0Aindex=20= 33a1ec0be0..6e25461507=20100644=0A---=20a/doc/emacs/maintaining.texi=0A= +++=20b/doc/emacs/maintaining.texi=0A@@=20-1427,7=20+1427,9=20@@=20= Switching=20Branches=0A=20working=20tree=20to=20match=20the=20branch=20= you=20switch=20to.=20=20Bazaar=20also=20supports=0A=20co-located=20= branches,=20in=20which=20case=20the=20@command{bzr=20switch}=20command=0A= =20will=20switch=20branches=20in=20the=20current=20directory.=20=20With=20= Subversion,=20you=0A-switch=20to=20another=20branch=20using=20the=20= @command{svn=20switch}=20command.=0A+switch=20to=20another=20branch=20= using=20the=20@command{svn=20switch}=20command.=20=20On=0A+Mercurial,=20= command=20@command{hg=20update}=20is=20used=20to=20swith=20to=20another=0A= +branch.=0A=20=0A=20=20=20The=20VC=20command=20to=20switch=20to=20= another=20branch=20in=20the=20current=20directory=0A=20is=20@kbd{C-x=20v=20= r=20@var{branch-name}=20@key{RET}}=20(@code{vc-retrieve-tag}).=0A@@=20= -1542,8=20+1544,9=20@@=20Merging=0A=20the=20exact=20arguments=20to=20= pass=20to=20@command{bzr=20merge},=20offering=20a=0A=20sensible=20= default=20if=20possible.=20=20On=20Git,=20this=20prompts=20for=20the=20= name=20of=20a=0A=20branch=20to=20merge=20from,=20with=20completion=20= (based=20on=20the=20branch=20names=20known=0A-to=20the=20current=20= repository).=20=20The=20output=20from=20running=20the=20merge=20command=0A= -is=20shown=20in=20a=20separate=20buffer.=0A+to=20the=20current=20= repository).=20=20On=20Mercurial,=20this=20prompts=20for=20argument=20to=0A= +pass=20to=20@command{hg=20merge},=20with=20branch=20and=20tag=20names=20= completion.=20The=0A+output=20from=20running=20the=20merge=20command=20= is=20shown=20in=20a=20separate=20buffer.=0A=20=0A=20=20=20On=20a=20= centralized=20version=20control=20system=20like=20CVS,=20@kbd{C-x=20v=20= m}=0A=20prompts=20for=20a=20branch=20ID,=20or=20a=20pair=20of=20revision=20= IDs=20(@pxref{Switching=0Adiff=20--git=20a/etc/NEWS=20b/etc/NEWS=0Aindex=20= ad349b1613..462b0ef6a2=20100644=0A---=20a/etc/NEWS=0A+++=20b/etc/NEWS=0A= @@=20-933,6=20+933,12=20@@=20values.=0A=20The=20'C-x=20v=20h'=20command=20= now=20works=20in=20buffers=20that=20visit=20files=20controlled=0A=20by=20= Hg.=0A=20=0A+***=20The=20Hg=20(Mercurial)=20back-end=20now=20prompts=20= for=20revision=20to=20merge=20on=0A+'C-x=20v=20m'=20('vc-merge').=0A+=0A= +***=20The=20Hg=20(Mercurial)=20back-end=20now=20use=20tag=20and=20= branch=20names=20instead=20of=0A+revision=20numbers=20as=20completion=20= candidates=20on=20reading=20revision.=0A+=0A=20+++=0A=20***=20'C-u=20C-x=20= v=20D'=20('vc-root-version-diff')=20prompts=20for=20two=20revisions=0A=20= and=20compares=20their=20entire=20trees.=0Adiff=20--git=20= a/lisp/vc/vc-hg.el=20b/lisp/vc/vc-hg.el=0Aindex=2017d38fa400..3a52e699ec=20= 100644=0A---=20a/lisp/vc/vc-hg.el=0A+++=20b/lisp/vc/vc-hg.el=0A@@=20= -564,7=20+564,8=20@@=20vc-hg-expanded-log-entry=0A=20(defun=20= vc-hg-revision-table=20(files)=0A=20=20=20(let=20((default-directory=20= (file-name-directory=20(car=20files))))=0A=20=20=20=20=20= (with-temp-buffer=0A-=20=20=20=20=20=20(vc-hg-command=20t=20nil=20files=20= "log"=20"--template"=20"{rev}=20")=0A+=20=20=20=20=20=20(vc-hg-command=20= t=20nil=20nil=20"branches"=20"-q")=0A+=20=20=20=20=20=20(vc-hg-command=20= t=20nil=20nil=20"tags"=20"-q")=0A=20=20=20=20=20=20=20(split-string=0A=20= =20=20=20=20=20=20=20(buffer-substring-no-properties=20(point-min)=20= (point-max))))))=0A=20=0A@@=20-1483,13=20+1484,16=20@@=20vc-hg-push=0A=20= =20=20(vc-hg--pushpull=20"push"=20prompt=20nil=20(called-interactively-p=20= 'interactive)))=0A=20=0A=20(defun=20vc-hg-merge-branch=20()=0A-=20=20= "Merge=20incoming=20changes=20into=20the=20current=20working=20= directory.=0A+=20=20"Prompt=20for=20revision=20and=20merge=20it=20into=20= working=20directory.=0A=20This=20runs=20the=20command=20\"hg=20merge\"."=0A= =20=20=20(let*=20((root=20(vc-hg-root=20default-directory))=0A=20=09=20= (buffer=20(format=20"*vc-hg=20:=20%s*"=20(expand-file-name=20root)))=0A=20= =20=20=20=20=20=20=20=20=20;;=20Disable=20pager.=0A-=20=20=20=20=20=20=20= =20=20(process-environment=20(cons=20"HGPLAIN=3D1"=20= process-environment)))=0A-=20=20=20=20(apply=20'vc-do-async-command=20= buffer=20root=20vc-hg-program=20'("--config"=20"ui.report_untrusted=3D0"=20= "merge"))=0A+=20=20=20=20=20=20=20=20=20(process-environment=20(cons=20= "HGPLAIN=3D1"=20process-environment))=0A+=20=20=20=20=20=20=20=20=20= (branch=20(vc-read-revision=20"Merge=20from=20branch:=20")))=0A+=20=20=20= =20(apply=20'vc-do-async-command=20buffer=20root=20vc-hg-program=0A+=20=20= =20=20=20=20=20=20=20=20=20(append=20'("--config"=20= "ui.report_untrusted=3D0"=20"merge")=0A+=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20(unless=20(string=3D=20branch=20"")=20(list=20= branch))))=0A=20=20=20=20=20(with-current-buffer=20buffer=20= (vc-run-delayed=20(vc-compilation-mode=20'hg)))=0A=20=20=20=20=20= (vc-set-async-update=20buffer)))=0A=20=0A--=20=0A2.15.1=0A=0A= --Apple-Mail=_46BFE37E-C141-4235-A2C3-2433569C5EB2-- From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 25 09:41:52 2019 Received: (at 22860) by debbugs.gnu.org; 25 Nov 2019 14:41:52 +0000 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 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 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) 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) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge To: Andrii Kolomoiets , Eli Zaretskii 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> From: Dmitry Gutov Message-ID: Date: Mon, 25 Nov 2019 16:41:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) 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. From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 25 16:55:27 2019 Received: (at 22860) by debbugs.gnu.org; 25 Nov 2019 21:55:27 +0000 Received: from localhost ([127.0.0.1]:49820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZMKM-00052X-OR for submit@debbugs.gnu.org; Mon, 25 Nov 2019 16:55:27 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZMKL-00052K-0i for 22860@debbugs.gnu.org; Mon, 25 Nov 2019 16:55:25 -0500 Received: by mail-wr1-f68.google.com with SMTP id a15so20036245wrf.9 for <22860@debbugs.gnu.org>; Mon, 25 Nov 2019 13:55:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:mime-version:subject:date:in-reply-to:cc:to :references; bh=7HPjbnwMGWRmrm1SiWr7SNvNhMTknCn5rq0/a8eq3Zo=; b=SWDPu1vnjcSkHlHsxKl0fxh5khnrKquTpGwUKw2RgtY+WKWu59eGWO9ODoh6RKQlzg brneS4BFN8eSpT98WY5tY7Qp3F8OXFEklIgW5eOtE+fHL8fJJaR72sowZk3SUDWynZxq bbHIQM/ts7H8FlHopeUml/VjxuRQf/OdflxEMbF2Lhnla2vG5Q1ghorvyec7B4nosJRJ cF24HEexNyY9zJATEb2EzqD0CrsKhViRYx92yHlF9xTUz2sog1cDP4Cje59VCplUcVDi I1mvDTrWVvt6t+3QX0AT86OmULHumxmc6lJffIZeSm/INNC+HgF2+X+8YLYVV2zKuhY0 ppMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=7HPjbnwMGWRmrm1SiWr7SNvNhMTknCn5rq0/a8eq3Zo=; b=tkWmQCg+kgaXAPVGmQrAP+BGIBHOJr85S9W3GxZBakRtKUnnfRdaDoEMYXfWeiR8h+ wz9aHUFZqRuiMu5281stJRPOZrrlID3dYLvLMSzCQJcpA26G1B3JGA4n48nfKbJo8LmB 43aNpznbHTrtpsjs9Z2shSmJk41+MciT0mKo3gtsJnTz16GLnb1AiSZNNuMbSiaN/sAr lIQf37vH3lbP2yE2jTRZrjxiQ17JbH1x5jeuZw3eJ470Vfz5nXHO6i3bPXV2ew5qrU1D GgaamygYs8qJuHvdJDk3DXm8UO0qfrCufSDz23bTxJntaLpxE14CNM85okZmtjPOwFFC 7sug== X-Gm-Message-State: APjAAAXx7hfoudIFzxjNrAD/SfNKLWXmgwJFDRAOOrqgwIdkIjoMVKvY oT/G2ljdk+mGaXVjmqUZs8I= X-Google-Smtp-Source: APXvYqzIYmVqXrCWqrZffm9k6RvqWaHBH/vildGXrqgvyVHJy/yC8AOWA9OAe0j/SIV73Grc/r22xA== X-Received: by 2002:adf:e911:: with SMTP id f17mr35313816wrm.300.1574718919010; Mon, 25 Nov 2019 13:55:19 -0800 (PST) Received: from [192.168.0.104] ([91.206.110.132]) by smtp.gmail.com with ESMTPSA id 19sm14014360wrc.47.2019.11.25.13.55.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Nov 2019 13:55:18 -0800 (PST) From: Andrii Kolomoiets Message-Id: Content-Type: multipart/mixed; boundary="Apple-Mail=_71E7F6DC-1404-4129-AE51-4FC397CEED9C" Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3601.0.10\)) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge Date: Mon, 25 Nov 2019 23:55:16 +0200 In-Reply-To: To: Dmitry Gutov 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> X-Mailer: Apple Mail (2.3601.0.10) X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On 25 Nov 2019, at 16:41, Dmitry Gutov wrote: > > Hi Andrii, Hi Dmitry, > On 23.11.2019 22:15, Andrii Kolomoiets wrote: >> * etc/NEWS Mention changes of vc-hg.el > > It's missing a colon after "NEWS" (":"). Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: yandex.ru] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [91.206.110.132 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (andreyk.mad[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.68 listed in list.dnswl.org] X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org, Eli Zaretskii X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On 25 Nov 2019, at 16:41, Dmitry Gutov wrote: > > Hi Andrii, Hi Dmitry, > On 23.11.2019 22:15, Andrii Kolomoiets wrote: >> * etc/NEWS Mention changes of vc-hg.el > > It's missing a colon after "NEWS" (":"). Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: yandex.ru] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.68 listed in list.dnswl.org] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [91.206.110.132 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (andreyk.mad[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --Apple-Mail=_71E7F6DC-1404-4129-AE51-4FC397CEED9C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 25 Nov 2019, at 16:41, Dmitry Gutov wrote: >=20 > Hi Andrii, Hi Dmitry, > On 23.11.2019 22:15, Andrii Kolomoiets wrote: >> * etc/NEWS Mention changes of vc-hg.el >=20 > It's missing a colon after "NEWS" (":"). Fixed. >> +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. >=20 > 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 :) >> +*** The Hg (Mercurial) back-end now prompts for revision to merge on >> +'C-x v m' ('vc-merge'). >=20 > 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. >=20 > 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). 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". Please see attached patch. Besides fixes, "bookmarks" added to = completion candidates. --Apple-Mail=_71E7F6DC-1404-4129-AE51-4FC397CEED9C Content-Disposition: attachment; filename=0001-vc-hg-prompt-for-branch-to-merge.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="0001-vc-hg-prompt-for-branch-to-merge.patch" Content-Transfer-Encoding: quoted-printable =46rom=20cf764cbe233eb162e3afa9d3f25acc96875e3f8e=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Andrii=20Kolomoiets=20=0A= Date:=20Sat,=2023=20Nov=202019=2018:43:47=20+0200=0ASubject:=20[PATCH]=20= vc-hg:=20prompt=20for=20branch=20to=20merge=0A=0A*=20lisp/vc/vc-hg.el=20= (vc-hg-merge-branch):=20Prompt=20for=20revision=20to=20merge.=0A= (vc-hg-revision-table):=20Use=20branches,=20tags=20and=20bookmarks=20as=20= competion=0Acandidates.=0A=0A*=20etc/NEWS:=20Mention=20changes=20of=20= vc-hg.el=0A=0A*=20doc/emacs/maintaining.texi=20(Switching=20Branches):=20= Mention=20'hg=20update'=0Acommand.=0A(Merging):=20Mention=20'hg=20merge'=20= command.=0A=0AThis=20fixes=20bug#22860=0A=0Adiff=20--git=20= a/doc/emacs/maintaining.texi=20b/doc/emacs/maintaining.texi=0Aindex=20= 33a1ec0be0..67072b5e92=20100644=0A---=20a/doc/emacs/maintaining.texi=0A= +++=20b/doc/emacs/maintaining.texi=0A@@=20-1427,7=20+1427,9=20@@=20= Switching=20Branches=0A=20working=20tree=20to=20match=20the=20branch=20= you=20switch=20to.=20=20Bazaar=20also=20supports=0A=20co-located=20= branches,=20in=20which=20case=20the=20@command{bzr=20switch}=20command=0A= =20will=20switch=20branches=20in=20the=20current=20directory.=20=20With=20= Subversion,=20you=0A-switch=20to=20another=20branch=20using=20the=20= @command{svn=20switch}=20command.=0A+switch=20to=20another=20branch=20= using=20the=20@command{svn=20switch}=20command.=20=20On=0A+Mercurial,=20= command=20@command{hg=20update}=20is=20used=20to=20swith=20to=20another=0A= +branch.=0A=20=0A=20=20=20The=20VC=20command=20to=20switch=20to=20= another=20branch=20in=20the=20current=20directory=0A=20is=20@kbd{C-x=20v=20= r=20@var{branch-name}=20@key{RET}}=20(@code{vc-retrieve-tag}).=0A@@=20= -1542,8=20+1544,9=20@@=20Merging=0A=20the=20exact=20arguments=20to=20= pass=20to=20@command{bzr=20merge},=20offering=20a=0A=20sensible=20= default=20if=20possible.=20=20On=20Git,=20this=20prompts=20for=20the=20= name=20of=20a=0A=20branch=20to=20merge=20from,=20with=20completion=20= (based=20on=20the=20branch=20names=20known=0A-to=20the=20current=20= repository).=20=20The=20output=20from=20running=20the=20merge=20command=0A= -is=20shown=20in=20a=20separate=20buffer.=0A+to=20the=20current=20= repository).=20=20On=20Mercurial,=20this=20prompts=20for=20argument=20to=0A= +pass=20to=20@command{hg=20merge}.=20The=20output=20from=20running=20the=20= merge=20command=20is=0A+shown=20in=20a=20separate=20buffer.=0A=20=0A=20=20= =20On=20a=20centralized=20version=20control=20system=20like=20CVS,=20= @kbd{C-x=20v=20m}=0A=20prompts=20for=20a=20branch=20ID,=20or=20a=20pair=20= of=20revision=20IDs=20(@pxref{Switching=0Adiff=20--git=20a/etc/NEWS=20= b/etc/NEWS=0Aindex=20ad349b1613..4a718e1357=20100644=0A---=20a/etc/NEWS=0A= +++=20b/etc/NEWS=0A@@=20-933,6=20+933,12=20@@=20values.=0A=20The=20'C-x=20= v=20h'=20command=20now=20works=20in=20buffers=20that=20visit=20files=20= controlled=0A=20by=20Hg.=0A=20=0A+***=20The=20Hg=20(Mercurial)=20= back-end=20now=20prompts=20for=20revision=20to=20merge=20on=0A+'C-x=20v=20= m'=20('vc-merge').=0A+=0A+***=20The=20Hg=20(Mercurial)=20back-end=20now=20= use=20tags,=20branches=20and=20bookmarks=0A+instead=20of=20revision=20= numbers=20as=20completion=20candidates=20on=20reading=20revision.=0A+=0A=20= +++=0A=20***=20'C-u=20C-x=20v=20D'=20('vc-root-version-diff')=20prompts=20= for=20two=20revisions=0A=20and=20compares=20their=20entire=20trees.=0A= diff=20--git=20a/lisp/vc/vc-hg.el=20b/lisp/vc/vc-hg.el=0Aindex=20= 17d38fa400..4d45ea1ccc=20100644=0A---=20a/lisp/vc/vc-hg.el=0A+++=20= b/lisp/vc/vc-hg.el=0A@@=20-564,7=20+564,9=20@@=20= vc-hg-expanded-log-entry=0A=20(defun=20vc-hg-revision-table=20(files)=0A=20= =20=20(let=20((default-directory=20(file-name-directory=20(car=20= files))))=0A=20=20=20=20=20(with-temp-buffer=0A-=20=20=20=20=20=20= (vc-hg-command=20t=20nil=20files=20"log"=20"--template"=20"{rev}=20")=0A= +=20=20=20=20=20=20(vc-hg-command=20t=20nil=20nil=20"branches"=20"-q")=0A= +=20=20=20=20=20=20(vc-hg-command=20t=20nil=20nil=20"bookmarks"=20"-q")=0A= +=20=20=20=20=20=20(vc-hg-command=20t=20nil=20nil=20"tags"=20"-q")=0A=20=20= =20=20=20=20=20(split-string=0A=20=20=20=20=20=20=20=20= (buffer-substring-no-properties=20(point-min)=20(point-max))))))=0A=20=0A= @@=20-1483,13=20+1485,16=20@@=20vc-hg-push=0A=20=20=20(vc-hg--pushpull=20= "push"=20prompt=20nil=20(called-interactively-p=20'interactive)))=0A=20=0A= =20(defun=20vc-hg-merge-branch=20()=0A-=20=20"Merge=20incoming=20changes=20= into=20the=20current=20working=20directory.=0A+=20=20"Prompt=20for=20= revision=20and=20merge=20it=20into=20working=20directory.=0A=20This=20= runs=20the=20command=20\"hg=20merge\"."=0A=20=20=20(let*=20((root=20= (vc-hg-root=20default-directory))=0A=20=09=20(buffer=20(format=20"*vc-hg=20= :=20%s*"=20(expand-file-name=20root)))=0A=20=20=20=20=20=20=20=20=20=20= ;;=20Disable=20pager.=0A-=20=20=20=20=20=20=20=20=20(process-environment=20= (cons=20"HGPLAIN=3D1"=20process-environment)))=0A-=20=20=20=20(apply=20= 'vc-do-async-command=20buffer=20root=20vc-hg-program=20'("--config"=20= "ui.report_untrusted=3D0"=20"merge"))=0A+=20=20=20=20=20=20=20=20=20= (process-environment=20(cons=20"HGPLAIN=3D1"=20process-environment))=0A+=20= =20=20=20=20=20=20=20=20(branch=20(vc-read-revision=20"Revision=20to=20= merge:=20")))=0A+=20=20=20=20(apply=20'vc-do-async-command=20buffer=20= root=20vc-hg-program=0A+=20=20=20=20=20=20=20=20=20=20=20(append=20= '("--config"=20"ui.report_untrusted=3D0"=20"merge")=0A+=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20(unless=20(string=3D=20branch=20= "")=20(list=20branch))))=0A=20=20=20=20=20(with-current-buffer=20buffer=20= (vc-run-delayed=20(vc-compilation-mode=20'hg)))=0A=20=20=20=20=20= (vc-set-async-update=20buffer)))=0A=20=0A--=20=0A2.15.1=0A=0A= --Apple-Mail=_71E7F6DC-1404-4129-AE51-4FC397CEED9C-- From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 25 17:58:10 2019 Received: (at 22860) by debbugs.gnu.org; 25 Nov 2019 22:58:10 +0000 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 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 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) 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) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge To: Andrii Kolomoiets 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> From: Dmitry Gutov Message-ID: <0cd1b663-0abc-256f-790e-2bc6af79992a@yandex.ru> Date: Tue, 26 Nov 2019 00:57:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) 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". From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 26 13:16:21 2019 Received: (at 22860) by debbugs.gnu.org; 26 Nov 2019 18:16:21 +0000 Received: from localhost ([127.0.0.1]:52903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZfNs-0006rY-Ux for submit@debbugs.gnu.org; Tue, 26 Nov 2019 13:16:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZfNq-0006rJ-QF for 22860@debbugs.gnu.org; Tue, 26 Nov 2019 13:16:19 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iZfNj-000471-A9; Tue, 26 Nov 2019 13:16:11 -0500 Received: from [176.228.60.248] (port=2260 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iZfNi-0005xg-QW; Tue, 26 Nov 2019 13:16:11 -0500 Date: Tue, 26 Nov 2019 20:16:17 +0200 Message-Id: <837e3msdu6.fsf@gnu.org> From: Eli Zaretskii To: Andrii Kolomoiets In-reply-to: (message from Andrii Kolomoiets on Mon, 25 Nov 2019 23:55:16 +0200) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org, dgutov@yandex.ru X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Andrii Kolomoiets > Date: Mon, 25 Nov 2019 23:55:16 +0200 > Cc: Eli Zaretskii , > 22860@debbugs.gnu.org > > --- a/doc/emacs/maintaining.texi > +++ b/doc/emacs/maintaining.texi > @@ -1427,7 +1427,9 @@ Switching Branches > working tree to match the branch you switch to. Bazaar also supports > co-located branches, in which case the @command{bzr switch} command > will switch branches in the current directory. With Subversion, you > -switch to another branch using the @command{svn switch} command. > +switch to another branch using the @command{svn switch} command. On > +Mercurial, command @command{hg update} is used to swith to another > +branch. I suggest "with Mercurial", not "on Mercurial". > @@ -1542,8 +1544,9 @@ Merging > the exact arguments to pass to @command{bzr merge}, offering a > sensible default if possible. On Git, this prompts for the name of a > branch to merge from, with completion (based on the branch names known > -to the current repository). The output from running the merge command > -is shown in a separate buffer. > +to the current repository). On Mercurial, this prompts for argument to Likewise here. (Yes, the Git sentence is also wrong.) > +pass to @command{hg merge}. The output from running the merge command is ^^ Two spaces between sentences, please. > +*** The Hg (Mercurial) back-end now prompts for revision to merge on > +'C-x v m' ('vc-merge'). ^^ ^^^^^^^^ "when you invoke 'C-x v m'" > +*** The Hg (Mercurial) back-end now use tags, branches and bookmarks > +instead of revision numbers as completion candidates on reading revision. ^^^^^^^^^^^^^^^^^^^ "when it prompts for a revision" Thanks. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 26 13:19:47 2019 Received: (at 22860) by debbugs.gnu.org; 26 Nov 2019 18:19:47 +0000 Received: from localhost ([127.0.0.1]:52907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZfRC-0006we-Tc for submit@debbugs.gnu.org; Tue, 26 Nov 2019 13:19:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZfRA-0006wQ-Jh for 22860@debbugs.gnu.org; Tue, 26 Nov 2019 13:19:45 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33675) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iZfR5-0005MN-Fx; Tue, 26 Nov 2019 13:19:39 -0500 Received: from [176.228.60.248] (port=2470 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iZfR4-000669-V1; Tue, 26 Nov 2019 13:19:39 -0500 Date: Tue, 26 Nov 2019 20:19:46 +0200 Message-Id: <835zj6sdod.fsf@gnu.org> From: Eli Zaretskii To: Dmitry Gutov In-reply-to: <0cd1b663-0abc-256f-790e-2bc6af79992a@yandex.ru> (message from Dmitry Gutov on Tue, 26 Nov 2019 00:57:59 +0200) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge 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> <0cd1b663-0abc-256f-790e-2bc6af79992a@yandex.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org, andreyk.mad@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Dmitry Gutov > Date: Tue, 26 Nov 2019 00:57:59 +0200 > Cc: 22860@debbugs.gnu.org > > >>> +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. If it's important to mention completion, we should do that for all back-ends that support this command. Right now, the text mentions the default offered by the prompt for Bazaar, but with Git and Mercurial it mentions completion. Don't the latter two offer sensible defaults as well? If they do, let's mention them; if they don't, perhaps its better to say something like Git and Mercurial don't offer a default revision, but they provide completion to help you specify the revision. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 26 14:28:51 2019 Received: (at 22860) by debbugs.gnu.org; 26 Nov 2019 19:28:51 +0000 Received: from localhost ([127.0.0.1]:52960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZgW3-0000Ea-II for submit@debbugs.gnu.org; Tue, 26 Nov 2019 14:28:51 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:53941) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iZgW1-0000EN-Fb for 22860@debbugs.gnu.org; Tue, 26 Nov 2019 14:28:50 -0500 Received: by mail-wm1-f67.google.com with SMTP id u18so4481368wmc.3 for <22860@debbugs.gnu.org>; Tue, 26 Nov 2019 11:28:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:mime-version:subject:date:in-reply-to:cc:to :references; bh=0LGk6IZHGSgDHwxhOCMnrLyH/xkRGKKqbiV2rU6YN2k=; b=NVeuEvkailTGR/+4ITdBtC7j2Jk/nzPNG0tQsvdJy6nEwlbPm359FRNQDIMwqeyWwF RzQBDETCxiBkYAGMt7WPxGrUyjBfUojfwU0y/pL0RbJcVCBpHoYkDALpOo6CqvZ5+ADm ZL5wjdBNseMkXVQ9WvXyVQGb9qWRrELYsMRN+9MDHt4HVJfE9fOsvofBA54L+v5fI/Ye L1VHf5jzybyI6j+bMQTJ/vd7Ujn6XpmSGqDM1mfINHJXhJDTmXBiUeoDuMb/l9o0JUJ1 FM8TT/gbKqA/r04s8RpSSLjNCs3AuSN5ksVGzcIlTx1MJnYMkOPiY/RaDwKFHmGTduls LtmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=0LGk6IZHGSgDHwxhOCMnrLyH/xkRGKKqbiV2rU6YN2k=; b=AjQqJv7FTnytqV0bYRXzNkg4kPyPORjsr1dTHQWue3AhmuW7zNMj70Q3FqOhuNK6c9 fddKEa1YT6JLxcX6Cj/zLDIwP2PetyWEybUP55mA50CURBRvyj/xWSPJF0cID2Fi4put tLZcy6eBl7J09CHKaWheO3wkstHC8zdlZqNWpApjnGHwtQkRNbH60ExgIu1X/4KpCy6X nCUkYblk/hUg+h6/Dvkj9p7PhPLpiEQQQ4P1+EwFpt07bnBvMbv9u4FH/HSaEkcTSib5 FpIK3vaYGkhl+LBgYJpHPjF+zPwDAsUyznC2/4Bzvjo1tY5FMu7F1QvVRxw/SmFBaGXI jg3g== X-Gm-Message-State: APjAAAWl1WJoi0BP7vApndr8KzNGzjM/FMasMhdMs6/7mR3Sn/nt3ha1 tqw0mKtzbApxpvDQt91esxg= X-Google-Smtp-Source: APXvYqz01NXN9BLKrLy8Pzi+KeMJAMjPaeWKpwB1Tl+KxVa37BtHc0+yKnZD4oZ93vVUxNX9Flb39w== X-Received: by 2002:a1c:2048:: with SMTP id g69mr618019wmg.121.1574796523555; Tue, 26 Nov 2019 11:28:43 -0800 (PST) Received: from [192.168.0.104] ([91.206.110.132]) by smtp.gmail.com with ESMTPSA id y15sm15321277wrh.94.2019.11.26.11.28.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Nov 2019 11:28:42 -0800 (PST) From: Andrii Kolomoiets Message-Id: <45701FDF-A1B9-420D-A723-BE7776BFEE84@gmail.com> Content-Type: multipart/mixed; boundary="Apple-Mail=_4423872C-2E1A-4C65-9BB8-F8996D6FBE07" Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3601.0.10\)) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge Date: Tue, 26 Nov 2019 21:28:41 +0200 In-Reply-To: <837e3msdu6.fsf@gnu.org> To: Eli Zaretskii 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> <837e3msdu6.fsf@gnu.org> X-Mailer: Apple Mail (2.3601.0.10) X-Spam-Score: 3.6 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On 26 Nov 2019, at 20:16, Eli Zaretskii wrote: > > I suggest "with Mercurial", not "on Mercurial". > > Two spaces between sentences, please. > > "when you invoke 'C-x v m'" > > "when it prompts for [...] Content analysis details: (3.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [91.206.110.132 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (andreyk.mad[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.67 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.67 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 22860 Cc: 22860@debbugs.gnu.org, Dmitry Gutov X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.6 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On 26 Nov 2019, at 20:16, Eli Zaretskii wrote: > > I suggest "with Mercurial", not "on Mercurial". > > Two spaces between sentences, please. > > "when you invoke 'C-x v m'" > > "when it prompts for [...] Content analysis details: (2.6 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: gnu.org] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.67 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.67 listed in wl.mailspike.net] 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [91.206.110.132 listed in zen.spamhaus.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (andreyk.mad[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --Apple-Mail=_4423872C-2E1A-4C65-9BB8-F8996D6FBE07 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 26 Nov 2019, at 20:16, Eli Zaretskii wrote: > > I suggest "with Mercurial", not "on Mercurial". > > Two spaces between sentences, please. > > "when you invoke 'C-x v m'" > > "when it prompts for a revision" All issues are fixed. Please see updated patch. --Apple-Mail=_4423872C-2E1A-4C65-9BB8-F8996D6FBE07 Content-Disposition: attachment; filename=0001-vc-hg-prompt-for-branch-to-merge.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="0001-vc-hg-prompt-for-branch-to-merge.patch" Content-Transfer-Encoding: quoted-printable =46rom=2050c9bb40f1fb859cded12eaccf56835f3a90eea3=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Andrii=20Kolomoiets=20=0A= Date:=20Sat,=2023=20Nov=202019=2018:43:47=20+0200=0ASubject:=20[PATCH]=20= vc-hg:=20prompt=20for=20branch=20to=20merge=0A=0A*=20lisp/vc/vc-hg.el=20= (vc-hg-merge-branch):=20Prompt=20for=20revision=20to=20merge.=0A= (vc-hg-revision-table):=20Use=20branches,=20tags=20and=20bookmarks=20as=20= competion=0Acandidates.=0A=0A*=20etc/NEWS:=20Mention=20changes=20of=20= vc-hg.el=0A=0A*=20doc/emacs/maintaining.texi=20(Switching=20Branches):=20= Mention=20'hg=20update'=0Acommand.=0A(Merging):=20Mention=20'hg=20merge'=20= command.=0A=0AThis=20fixes=20bug#22860=0A---=0A=20= doc/emacs/maintaining.texi=20|=20=209=20++++++---=0A=20etc/NEWS=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=209=20+++++++++=0A=20= lisp/vc/vc-hg.el=20=20=20=20=20=20=20=20=20=20=20|=2013=20+++++++++----=0A= =203=20files=20changed,=2024=20insertions(+),=207=20deletions(-)=0A=0A= diff=20--git=20a/doc/emacs/maintaining.texi=20= b/doc/emacs/maintaining.texi=0Aindex=2033a1ec0be0..f48173ae91=20100644=0A= ---=20a/doc/emacs/maintaining.texi=0A+++=20b/doc/emacs/maintaining.texi=0A= @@=20-1427,7=20+1427,9=20@@=20Switching=20Branches=0A=20working=20tree=20= to=20match=20the=20branch=20you=20switch=20to.=20=20Bazaar=20also=20= supports=0A=20co-located=20branches,=20in=20which=20case=20the=20= @command{bzr=20switch}=20command=0A=20will=20switch=20branches=20in=20= the=20current=20directory.=20=20With=20Subversion,=20you=0A-switch=20to=20= another=20branch=20using=20the=20@command{svn=20switch}=20command.=0A= +switch=20to=20another=20branch=20using=20the=20@command{svn=20switch}=20= command.=20=20With=0A+Mercurial,=20command=20@command{hg=20update}=20is=20= used=20to=20swith=20to=20another=0A+branch.=0A=20=0A=20=20=20The=20VC=20= command=20to=20switch=20to=20another=20branch=20in=20the=20current=20= directory=0A=20is=20@kbd{C-x=20v=20r=20@var{branch-name}=20@key{RET}}=20= (@code{vc-retrieve-tag}).=0A@@=20-1542,8=20+1544,9=20@@=20Merging=0A=20= the=20exact=20arguments=20to=20pass=20to=20@command{bzr=20merge},=20= offering=20a=0A=20sensible=20default=20if=20possible.=20=20On=20Git,=20= this=20prompts=20for=20the=20name=20of=20a=0A=20branch=20to=20merge=20= from,=20with=20completion=20(based=20on=20the=20branch=20names=20known=0A= -to=20the=20current=20repository).=20=20The=20output=20from=20running=20= the=20merge=20command=0A-is=20shown=20in=20a=20separate=20buffer.=0A+to=20= the=20current=20repository).=20=20With=20Mercurial,=20this=20prompts=20= for=20argument=0A+to=20pass=20to=20@command{hg=20merge}.=20=20The=20= output=20from=20running=20the=20merge=0A+command=20is=20shown=20in=20a=20= separate=20buffer.=0A=20=0A=20=20=20On=20a=20centralized=20version=20= control=20system=20like=20CVS,=20@kbd{C-x=20v=20m}=0A=20prompts=20for=20= a=20branch=20ID,=20or=20a=20pair=20of=20revision=20IDs=20= (@pxref{Switching=0Adiff=20--git=20a/etc/NEWS=20b/etc/NEWS=0Aindex=20= ad349b1613..bb5c54dabe=20100644=0A---=20a/etc/NEWS=0A+++=20b/etc/NEWS=0A= @@=20-933,6=20+933,15=20@@=20values.=0A=20The=20'C-x=20v=20h'=20command=20= now=20works=20in=20buffers=20that=20visit=20files=20controlled=0A=20by=20= Hg.=0A=20=0A++++=0A+***=20The=20Hg=20(Mercurial)=20back-end=20now=20= prompts=20for=20revision=20to=20merge=20when=0A+you=20invoke=20'C-x=20v=20= m'=20('vc-merge').=0A+=0A+---=0A+***=20The=20Hg=20(Mercurial)=20back-end=20= now=20use=20tags,=20branches=20and=20bookmarks=0A+instead=20of=20= revision=20numbers=20as=20completion=20candidates=20when=20it=20prompts=0A= +for=20a=20revision.=0A+=0A=20+++=0A=20***=20'C-u=20C-x=20v=20D'=20= ('vc-root-version-diff')=20prompts=20for=20two=20revisions=0A=20and=20= compares=20their=20entire=20trees.=0Adiff=20--git=20a/lisp/vc/vc-hg.el=20= b/lisp/vc/vc-hg.el=0Aindex=2017d38fa400..4d45ea1ccc=20100644=0A---=20= a/lisp/vc/vc-hg.el=0A+++=20b/lisp/vc/vc-hg.el=0A@@=20-564,7=20+564,9=20= @@=20vc-hg-expanded-log-entry=0A=20(defun=20vc-hg-revision-table=20= (files)=0A=20=20=20(let=20((default-directory=20(file-name-directory=20= (car=20files))))=0A=20=20=20=20=20(with-temp-buffer=0A-=20=20=20=20=20=20= (vc-hg-command=20t=20nil=20files=20"log"=20"--template"=20"{rev}=20")=0A= +=20=20=20=20=20=20(vc-hg-command=20t=20nil=20nil=20"branches"=20"-q")=0A= +=20=20=20=20=20=20(vc-hg-command=20t=20nil=20nil=20"bookmarks"=20"-q")=0A= +=20=20=20=20=20=20(vc-hg-command=20t=20nil=20nil=20"tags"=20"-q")=0A=20=20= =20=20=20=20=20(split-string=0A=20=20=20=20=20=20=20=20= (buffer-substring-no-properties=20(point-min)=20(point-max))))))=0A=20=0A= @@=20-1483,13=20+1485,16=20@@=20vc-hg-push=0A=20=20=20(vc-hg--pushpull=20= "push"=20prompt=20nil=20(called-interactively-p=20'interactive)))=0A=20=0A= =20(defun=20vc-hg-merge-branch=20()=0A-=20=20"Merge=20incoming=20changes=20= into=20the=20current=20working=20directory.=0A+=20=20"Prompt=20for=20= revision=20and=20merge=20it=20into=20working=20directory.=0A=20This=20= runs=20the=20command=20\"hg=20merge\"."=0A=20=20=20(let*=20((root=20= (vc-hg-root=20default-directory))=0A=20=09=20(buffer=20(format=20"*vc-hg=20= :=20%s*"=20(expand-file-name=20root)))=0A=20=20=20=20=20=20=20=20=20=20= ;;=20Disable=20pager.=0A-=20=20=20=20=20=20=20=20=20(process-environment=20= (cons=20"HGPLAIN=3D1"=20process-environment)))=0A-=20=20=20=20(apply=20= 'vc-do-async-command=20buffer=20root=20vc-hg-program=20'("--config"=20= "ui.report_untrusted=3D0"=20"merge"))=0A+=20=20=20=20=20=20=20=20=20= (process-environment=20(cons=20"HGPLAIN=3D1"=20process-environment))=0A+=20= =20=20=20=20=20=20=20=20(branch=20(vc-read-revision=20"Revision=20to=20= merge:=20")))=0A+=20=20=20=20(apply=20'vc-do-async-command=20buffer=20= root=20vc-hg-program=0A+=20=20=20=20=20=20=20=20=20=20=20(append=20= '("--config"=20"ui.report_untrusted=3D0"=20"merge")=0A+=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20(unless=20(string=3D=20branch=20= "")=20(list=20branch))))=0A=20=20=20=20=20(with-current-buffer=20buffer=20= (vc-run-delayed=20(vc-compilation-mode=20'hg)))=0A=20=20=20=20=20= (vc-set-async-update=20buffer)))=0A=20=0A--=20=0A2.15.1=0A=0A= --Apple-Mail=_4423872C-2E1A-4C65-9BB8-F8996D6FBE07-- From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 30 07:02:30 2019 Received: (at 22860-done) by debbugs.gnu.org; 30 Nov 2019 12:02:30 +0000 Received: from localhost ([127.0.0.1]:33809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ib1SI-0004JN-Hf for submit@debbugs.gnu.org; Sat, 30 Nov 2019 07:02:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ib1SG-0004JA-Qs for 22860-done@debbugs.gnu.org; Sat, 30 Nov 2019 07:02:29 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ib1SB-0000VD-Mg; Sat, 30 Nov 2019 07:02:23 -0500 Received: from [176.228.60.248] (port=3858 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ib1SB-0002Mn-1s; Sat, 30 Nov 2019 07:02:23 -0500 Date: Sat, 30 Nov 2019 14:02:10 +0200 Message-Id: <838snxo9ml.fsf@gnu.org> From: Eli Zaretskii To: Andrii Kolomoiets In-reply-to: <45701FDF-A1B9-420D-A723-BE7776BFEE84@gmail.com> (message from Andrii Kolomoiets on Tue, 26 Nov 2019 21:28:41 +0200) Subject: Re: bug#22860: [PATCH] vc-hg: prompt for branch to merge 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> <837e3msdu6.fsf@gnu.org> <45701FDF-A1B9-420D-A723-BE7776BFEE84@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 22860-done Cc: 22860-done@debbugs.gnu.org, dgutov@yandex.ru X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) > From: Andrii Kolomoiets > Date: Tue, 26 Nov 2019 21:28:41 +0200 > Cc: Dmitry Gutov , > 22860@debbugs.gnu.org > > All issues are fixed. Please see updated patch. Thanks, installed. From unknown Thu Sep 11 11:56:19 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 28 Dec 2019 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator