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: Sat, 23 Nov 2019 22:15:07 +0200 Message-ID: References: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> <14D12E8F-EFDE-4C94-8C95-9440F56D3633@gmail.com> <83lfs6tpb1.fsf@gnu.org> <1C27CCD0-2335-4EE2-B815-3D85F4B84D85@gmail.com> <83ftieto20.fsf@gnu.org> Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3601.0.10\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_46BFE37E-C141-4235-A2C3-2433569C5EB2" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="163120"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 22860@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Nov 23 21:16:15 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 1iYbpG-000gEm-CA for geb-bug-gnu-emacs@m.gmane.org; Sat, 23 Nov 2019 21:16:14 +0100 Original-Received: from localhost ([::1]:60854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iYbpE-0004KZ-Ef for geb-bug-gnu-emacs@m.gmane.org; Sat, 23 Nov 2019 15:16:12 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51108) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iYbp5-0004KF-V6 for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2019 15:16:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iYbp4-0003ho-Ef for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2019 15:16:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49058) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iYbp4-0003hi-BK for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2019 15:16:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iYbp4-00039N-3x for bug-gnu-emacs@gnu.org; Sat, 23 Nov 2019 15:16:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Andrii Kolomoiets Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 23 Nov 2019 20:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22860 X-GNU-PR-Package: emacs Original-Received: via spool by 22860-submit@debbugs.gnu.org id=B22860.157454011912060 (code B ref 22860); Sat, 23 Nov 2019 20:16:02 +0000 Original-Received: (at 22860) by debbugs.gnu.org; 23 Nov 2019 20:15:19 +0000 Original-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 Original-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 Original-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) Original-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) In-Reply-To: <83ftieto20.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:172345 Archived-At: --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--