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#38425: 27.0.50; [PATCH] vc-hg-create-tag: Possibility to create a branch Date: Fri, 29 Nov 2019 17:03:33 +0200 Message-ID: <3AFDE56F-43D3-47BC-BC1E-0A72D48D17F4@gmail.com> Mime-Version: 1.0 (Mac OS X Mail 13.0 \(3601.0.10\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_BDF3EE39-6898-4AD9-BF9B-47E8CE1A664F" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="136584"; mail-complaints-to="usenet@blaine.gmane.org" To: 38425@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Nov 29 16:04:41 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 1iahp0-000ZLc-NH for geb-bug-gnu-emacs@m.gmane.org; Fri, 29 Nov 2019 16:04:38 +0100 Original-Received: from localhost ([::1]:60046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iahoz-0006z0-Kh for geb-bug-gnu-emacs@m.gmane.org; Fri, 29 Nov 2019 10:04:37 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55204) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iahoU-0006xO-GR for bug-gnu-emacs@gnu.org; Fri, 29 Nov 2019 10:04:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iahoR-00079M-Ij for bug-gnu-emacs@gnu.org; Fri, 29 Nov 2019 10:04:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:55670) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iahoR-00078h-En for bug-gnu-emacs@gnu.org; Fri, 29 Nov 2019 10:04:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iahoQ-0002p3-8A for bug-gnu-emacs@gnu.org; Fri, 29 Nov 2019 10:04: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: Fri, 29 Nov 2019 15:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38425 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.157503983710836 (code B ref -1); Fri, 29 Nov 2019 15:04:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 29 Nov 2019 15:03:57 +0000 Original-Received: from localhost ([127.0.0.1]:33410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iahoK-0002oi-No for submit@debbugs.gnu.org; Fri, 29 Nov 2019 10:03:56 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:53457) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iahoI-0002oY-MW for submit@debbugs.gnu.org; Fri, 29 Nov 2019 10:03:55 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54705) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iahoE-0006sF-AS for bug-gnu-emacs@gnu.org; Fri, 29 Nov 2019 10:03:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaho5-00063h-A2 for bug-gnu-emacs@gnu.org; Fri, 29 Nov 2019 10:03:47 -0500 Original-Received: from mail-lf1-x12d.google.com ([2a00:1450:4864:20::12d]:41152) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iaho4-0005nl-Tr for bug-gnu-emacs@gnu.org; Fri, 29 Nov 2019 10:03:41 -0500 Original-Received: by mail-lf1-x12d.google.com with SMTP id m30so21023185lfp.8 for ; Fri, 29 Nov 2019 07:03:37 -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=ARP7z+SFnrIoxddKsXVcNtnNl1/Cq3CUuyEsZ7+Az04=; b=oUE3Av70uzYtrUmzc26xkJ8WbU6+14LdvGxSdg3ObWlg+72wBgH63cHaT8tYYvRQJh bucnZj27jkVg3jZbBbAsN9kpqMvV+eZegcu9zqPOppUFehWe0Q5ssgGe/ADTrOMpO0ie 1JUB00SzDEKRj4UId1Z2cbxOma59b4BZJEslDAvLa51qzH/xxlfRiqArCNwofOrzigE3 ygK6AOKW+FJ5PvVGdrOx86tsM4VBQHYoMeGjJ5LqY5X+F6OkNO6QiGjyuY0cmU2+VgvQ s5vVKo6vlBBv08JuC0hcw2MuNJBST8wvgn1jE8u5JqHlRWHqe3z+it6jnS7dMe8xXRUO /Ltw== 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=ARP7z+SFnrIoxddKsXVcNtnNl1/Cq3CUuyEsZ7+Az04=; b=KhIaNB9yEbJZ8s4Qp1f14dTHNnNFrsBjXJX0HYDZkgSwpOcs5vTt0FmbsB1k1tu/kD 4rWzeBRI0ofYVZ5AAAwBg/obgCfjORrSsBkn4XSOkuYe0GsptFZ7ohAiz5InVGBdd+LE Lk1bCBkmQ6OGHFRjZ3lTayV8gP1cekYXCdRnDWzPPxgl6Kh4PNCkShzoitzkESZqlU47 CcCMG7SycO9Ht1jWSFlfCJYGxR0eUgEgXzm3GbdJl9FCdDGsr+SGBUweRRoG4wNu2/cF 6l7BNW+NNNkJa5P4sNV1rITKLFTrDZAS1x2QflSsdfL/fjDBYwXwEDpWB/aOgieZfhbv QSuw== X-Gm-Message-State: APjAAAWr3N1RBvRqVN6wQBMnkigCP8tejEOe1F3ax14r8wdLtqP7/ug+ 8DNGONnO+atjpRQbe7/Ewc+h/RIE X-Google-Smtp-Source: APXvYqyZP/26oDtgJAcPW7RLYbfUJO0qdtjZ2H/WU+L1W3/7+YMGxEcZ4jQ1VYiYxQdkr71NkFc9tw== X-Received: by 2002:ac2:54b4:: with SMTP id w20mr26147281lfk.67.1575039815217; Fri, 29 Nov 2019 07:03:35 -0800 (PST) Original-Received: from [10.1.1.147] (188-42-207-82.ip.ukrtel.net. [82.207.42.188]) by smtp.gmail.com with ESMTPSA id h7sm9530425lfc.69.2019.11.29.07.03.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Nov 2019 07:03:34 -0800 (PST) X-Mailer: Apple Mail (2.3601.0.10) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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:172654 Archived-At: --Apple-Mail=_BDF3EE39-6898-4AD9-BF9B-47E8CE1A664F Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Hello. Mercurial supports two kind of branches: named branch and bookmark. vc-hg-create-tag can create only a bookmark (Bug#17586). This patch adds possibility to create a named branch. --Apple-Mail=_BDF3EE39-6898-4AD9-BF9B-47E8CE1A664F Content-Disposition: attachment; filename=0001-vc-hg-create-tag-Possibility-to-create-a-branch.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="0001-vc-hg-create-tag-Possibility-to-create-a-branch.patch" Content-Transfer-Encoding: quoted-printable =46rom=20db47e6703f098050467f589288dc002131bc34e0=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Andrii=20Kolomoiets=20=0A= Date:=20Fri,=2029=20Nov=202019=2016:55:27=20+0200=0ASubject:=20[PATCH]=20= vc-hg-create-tag:=20Possibility=20to=20create=20a=20branch=0A=0A*=20= lisp/vc/vc-hg.el=20(vc-hg-create-bookmark):=20New=20user=20option.=0A= (vc-hg-create-tag):=20Use=20it.=0A*=20etc/NEWS:=20Mention=20it.=0A---=0A=20= etc/NEWS=20=20=20=20=20=20=20=20=20|=20=203=20+++=0A=20lisp/vc/vc-hg.el=20= |=2024=20+++++++++++++++++++++---=0A=202=20files=20changed,=2024=20= insertions(+),=203=20deletions(-)=0A=0Adiff=20--git=20a/etc/NEWS=20= b/etc/NEWS=0Aindex=20cb73e46358..aa8101d69e=20100644=0A---=20a/etc/NEWS=0A= +++=20b/etc/NEWS=0A@@=20-979,6=20+979,9=20@@=20and=20compares=20their=20= entire=20trees.=0A=20***=20New=20user=20option=20'vc-hg-revert-switches'=20= specifies=20switches=20to=20pass=0A=20to=20Hg=20revert.=0A=20=0A+***=20= New=20user=20option=20'vc-hg-create-bookmark'=20controls=20whether=20a=20= bookmark=0A+or=20branch=20will=20be=20created=20when=20you=20invoke=20= 'C-u=20C-x=20v=20s'=20('vc-create-tag').=0A+=0A=20***=20'C-x=20v=20M=20= D'=20('vc-diff-mergebase')=20and=20'C-x=20v=20M=20L'=20= ('vc-log-mergebase')=0A=20print=20diffs=20and=20logs=20between=20the=20= merge=20base=20(common=20ancestor)=20of=20two=0A=20given=20revisions.=0A= diff=20--git=20a/lisp/vc/vc-hg.el=20b/lisp/vc/vc-hg.el=0Aindex=20= 5ff1a6204b..69f2b6d856=20100644=0A---=20a/lisp/vc/vc-hg.el=0A+++=20= b/lisp/vc/vc-hg.el=0A@@=20-184,6=20+184,16=20@@=20vc-hg-root-log-format=0A= =20=20=20:group=20'vc-hg=0A=20=20=20:version=20"24.5")=0A=20=0A= +(defcustom=20vc-hg-create-bookmark=20t=0A+=20=20"This=20controls=20= whether=20`vc-create-tag'=20will=20create=20a=20bookmark=20or=20branch.=0A= +If=20nil,=20named=20branch=20will=20be=20created.=0A+If=20t,=20bookmark=20= will=20be=20created.=0A+If=20`ask',=20you=20will=20be=20prompted=20for=20= a=20branch=20type."=0A+=20=20:type=20'(choice=20(const=20:tag=20"No"=20= nil)=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(const=20:tag=20= "Yes"=20t)=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(const=20= :tag=20"Ask"=20ask))=0A+=20=20:version=20"27.1")=0A+=0A=20=0C=0A=20;;=20= Clear=20up=20the=20cache=20to=20force=20vc-call=20to=20check=20again=20= and=20discover=0A=20;;=20new=20functions=20when=20we=20reload=20this=20= file.=0A@@=20-619,10=20+629,18=20@@=20= vc-hg-annotate-extract-revision-at-line=0A=20;;;=20Tag=20system=0A=20=0A=20= (defun=20vc-hg-create-tag=20(dir=20name=20branchp)=0A-=20=20"Attach=20= the=20tag=20NAME=20to=20the=20state=20of=20the=20working=20copy."=0A+=20=20= "Create=20tag=20NAME=20in=20repo=20in=20DIR.=20=20Create=20branch=20if=20= BRANCHP.=0A+Variable=20`vc-hg-create-bookmark'=20controls=20what=20kind=20= of=20branch=20will=20be=20created."=0A=20=20=20(let=20= ((default-directory=20dir))=0A-=20=20=20=20(and=20(vc-hg-command=20nil=20= 0=20nil=20"status")=0A-=20=20=20=20=20=20=20=20=20(vc-hg-command=20nil=20= 0=20nil=20(if=20branchp=20"bookmark"=20"tag")=20name))))=0A+=20=20=20=20= (vc-hg-command=20nil=200=20nil=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20(if=20branchp=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20(if=20(if=20(eq=20vc-hg-create-bookmark=20= 'ask)=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20(yes-or-no-p=20"Create=20bookmark=20instead=20= of=20branch?=20")=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20vc-hg-create-bookmark)=0A+=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= "bookmark"=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20"branch")=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20"tag")=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20name)))=0A=20=0A=20(defun=20vc-hg-retrieve-tag=20(dir=20name=20= _update)=0A=20=20=20"Retrieve=20the=20version=20tagged=20by=20NAME=20of=20= all=20registered=20files=20at=20or=20below=20DIR."=0A--=20=0A2.15.1=0A=0A= --Apple-Mail=_BDF3EE39-6898-4AD9-BF9B-47E8CE1A664F--