From: Andrii Kolomoiets <andreyk.mad@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 22860@debbugs.gnu.org
Subject: bug#22860: [PATCH] vc-hg: prompt for branch to merge
Date: Sat, 23 Nov 2019 22:15:07 +0200 [thread overview]
Message-ID: <E830CCE2-4CED-4884-BC21-D304EE1FF1B2@gmail.com> (raw)
In-Reply-To: <83ftieto20.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
On 23 Nov 2019, at 21:01, Eli Zaretskii <eliz@gnu.org> wrote:
>
>> From: Andrii Kolomoiets <andreyk.mad@gmail.com>
>> 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.
[-- Attachment #2: 0001-vc-hg-prompt-for-branch-to-merge.patch --]
[-- Type: application/octet-stream, Size: 4277 bytes --]
From 7fe0f7cb6cd15dfb307601eb126f1b1b72b073bd Mon Sep 17 00:00:00 2001
From: Andrii Kolomoiets <andreyk.mad@gmail.com>
Date: Sat, 23 Nov 2019 18:43:47 +0200
Subject: [PATCH] vc-hg: prompt for branch to merge
* lisp/vc/vc-hg.el (vc-hg-merge-branch): Prompt for branch to merge.
(vc-hg-revision-table): Use branches and tags as competion candidates.
* etc/NEWS Mention changes of vc-hg.el
* doc/emacs/maintaining.texi (Switching Branches): Mention 'hg update'
command.
(Merging): Mention 'hg merge' command.
This fixes bug#22860
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 33a1ec0be0..6e25461507 100644
--- 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.
The VC command to switch to another branch in the current directory
is @kbd{C-x v r @var{branch-name} @key{RET}} (@code{vc-retrieve-tag}).
@@ -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
+pass to @command{hg merge}, with branch and tag names completion. The
+output from running the merge command is shown in a separate buffer.
On a centralized version control system like CVS, @kbd{C-x v m}
prompts for a branch ID, or a pair of revision IDs (@pxref{Switching
diff --git a/etc/NEWS b/etc/NEWS
index ad349b1613..462b0ef6a2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -933,6 +933,12 @@ values.
The 'C-x v h' command now works in buffers that visit files controlled
by Hg.
+*** The Hg (Mercurial) back-end now prompts for revision to merge on
+'C-x v m' ('vc-merge').
+
+*** The Hg (Mercurial) back-end now use tag and branch names instead of
+revision numbers as completion candidates on reading revision.
+
+++
*** 'C-u C-x v D' ('vc-root-version-diff') prompts for two revisions
and compares their entire trees.
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 17d38fa400..3a52e699ec 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -564,7 +564,8 @@ vc-hg-expanded-log-entry
(defun vc-hg-revision-table (files)
(let ((default-directory (file-name-directory (car files))))
(with-temp-buffer
- (vc-hg-command t nil files "log" "--template" "{rev} ")
+ (vc-hg-command t nil nil "branches" "-q")
+ (vc-hg-command t nil nil "tags" "-q")
(split-string
(buffer-substring-no-properties (point-min) (point-max))))))
@@ -1483,13 +1484,16 @@ vc-hg-push
(vc-hg--pushpull "push" prompt nil (called-interactively-p 'interactive)))
(defun vc-hg-merge-branch ()
- "Merge incoming changes into the current working directory.
+ "Prompt for revision and merge it into working directory.
This runs the command \"hg merge\"."
(let* ((root (vc-hg-root default-directory))
(buffer (format "*vc-hg : %s*" (expand-file-name root)))
;; Disable pager.
- (process-environment (cons "HGPLAIN=1" process-environment)))
- (apply 'vc-do-async-command buffer root vc-hg-program '("--config" "ui.report_untrusted=0" "merge"))
+ (process-environment (cons "HGPLAIN=1" process-environment))
+ (branch (vc-read-revision "Merge from branch: ")))
+ (apply 'vc-do-async-command buffer root vc-hg-program
+ (append '("--config" "ui.report_untrusted=0" "merge")
+ (unless (string= branch "") (list branch))))
(with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'hg)))
(vc-set-async-update buffer)))
--
2.15.1
next prev parent reply other threads:[~2019-11-23 20:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 20:56 bug#22860: 24.3; hg merge not too functional Ross Boylan
2019-11-23 18:12 ` bug#22860: [PATCH] vc-hg: prompt for branch to merge Andrii Kolomoiets
2019-11-23 18:34 ` Eli Zaretskii
2019-11-23 18:46 ` Dmitry Gutov
2019-11-23 18:51 ` Eli Zaretskii
2019-11-23 18:53 ` Dmitry Gutov
2019-11-23 18:51 ` Andrii Kolomoiets
2019-11-23 19:01 ` Eli Zaretskii
2019-11-23 20:15 ` Andrii Kolomoiets [this message]
2019-11-25 14:41 ` Dmitry Gutov
2019-11-25 21:55 ` Andrii Kolomoiets
2019-11-25 22:57 ` Dmitry Gutov
2019-11-26 18:19 ` Eli Zaretskii
2019-11-26 18:16 ` Eli Zaretskii
2019-11-26 19:28 ` Andrii Kolomoiets
2019-11-30 12:02 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E830CCE2-4CED-4884-BC21-D304EE1FF1B2@gmail.com \
--to=andreyk.mad@gmail.com \
--cc=22860@debbugs.gnu.org \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).