From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Andrii Kolomoiets Newsgroups: gmane.emacs.bugs Subject: bug#22860: [PATCH] vc-hg: prompt for branch to merge Date: Tue, 26 Nov 2019 21:28:41 +0200 Message-ID: <45701FDF-A1B9-420D-A723-BE7776BFEE84@gmail.com> 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> Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3601.0.10\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_4423872C-2E1A-4C65-9BB8-F8996D6FBE07" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="20458"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 22860@debbugs.gnu.org, Dmitry Gutov To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Nov 26 20:30:08 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iZgXH-00059g-8z for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Nov 2019 20:30:07 +0100 Original-Received: from localhost ([::1]:58306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZgXG-0004tU-10 for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Nov 2019 14:30:06 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35361) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZgWG-0004rJ-7i for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 14:29:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZgWD-0005By-V0 for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 14:29:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46987) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iZgWD-0005Bs-RB for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 14:29:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iZgWD-0000Ey-N8 for bug-gnu-emacs@gnu.org; Tue, 26 Nov 2019 14:29:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Andrii Kolomoiets Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 26 Nov 2019 19:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22860 X-GNU-PR-Package: emacs Original-Received: via spool by 22860-submit@debbugs.gnu.org id=B22860.1574796531908 (code B ref 22860); Tue, 26 Nov 2019 19:29:01 +0000 Original-Received: (at 22860) by debbugs.gnu.org; 26 Nov 2019 19:28:51 +0000 Original-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 Original-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 Original-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) Original-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) In-Reply-To: <837e3msdu6.fsf@gnu.org> X-Mailer: Apple Mail (2.3601.0.10) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:172471 Archived-At: --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--