Patchwork [evolve-ext] inhibit: make bookmark -D work with a list of bookmarks

login
register
mail settings
Submitter Jeroen Vaelen
Date Jan. 22, 2016, 7:23 p.m.
Message ID <d9c07d2d3b930c3eafd7.1453490621@jeroenv-mba.local>
Download mbox | patch
Permalink /patch/12869/
State Accepted
Delegated to: Pierre-Yves David
Headers show

Comments

Jeroen Vaelen - Jan. 22, 2016, 7:23 p.m.
# HG changeset patch
# User Jeroen Vaelen <jeroen@fb.com>
# Date 1453490198 0
#      Fri Jan 22 19:16:38 2016 +0000
# Node ID d9c07d2d3b930c3eafd720ff3ed519bf355de18f
# Parent  ea7523380efa894213582ca1600dc472baa7b25e
inhibit: make bookmark -D work with a list of bookmarks

`hg bookmark -D` was not accepting a list of bookmarks. This behavior was
inconsistent with the behavior of `hg bookmark -d`, which does accept multiple
bookmarks.
Pierre-Yves David - Jan. 30, 2016, 3:20 p.m.
On 01/22/2016 08:23 PM, Jeroen Vaelen wrote:
> # HG changeset patch
> # User Jeroen Vaelen <jeroen@fb.com>
> # Date 1453490198 0
> #      Fri Jan 22 19:16:38 2016 +0000
> # Node ID d9c07d2d3b930c3eafd720ff3ed519bf355de18f
> # Parent  ea7523380efa894213582ca1600dc472baa7b25e
> inhibit: make bookmark -D work with a list of bookmarks

Pushed to main, thanks.

Patch

diff --git a/hgext/inhibit.py b/hgext/inhibit.py
--- a/hgext/inhibit.py
+++ b/hgext/inhibit.py
@@ -97,7 +97,7 @@ 
         'new': [],
         'succ': [],
         'rev': [],
-        'bookmark': [bookmarks[0]],
+        'bookmark': bookmarks,
         'keep': None,
         'biject': False,
     }
diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t
--- a/tests/test-inhibit.t
+++ b/tests/test-inhibit.t
@@ -815,3 +815,15 @@ 
   searching for changes
   no changes found
   adding remote bookmark foo
+
+Test that bookmark -D can take multiple branch names
+  $ cd ../inhibit
+  $ hg bookmark book2 book1 book3
+  $ touch foo && hg add foo && hg ci -m "add foo"
+  $ hg up book1
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  (activating bookmark book1)
+  $ hg bookmark -D book2 book3
+  bookmark 'book2' deleted
+  bookmark 'book3' deleted
+  1 changesets pruned