[PATCH] mq: prevent the creation of a queue whose name is already taken
Cédric Duval
cedricduval at free.fr
Thu Jun 3 13:43:08 CDT 2010
# HG changeset patch
# User Cédric Duval <cedricduval at free.fr>
# Date 1275590423 -7200
# Node ID d1aca0863a9d5ee0575b95602f4d5989e08b03a9
# Parent 457813cb30245902ea49f999f6045c21ab87b4d5
mq: prevent the creation of a queue whose name is already taken
Each check is moved under the code handling the relevant option, and
a new one is added for --create. This fixes duplicated entries being
added to the queues list.
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -2633,17 +2633,17 @@
existing = _getqueues()
- if name not in existing and opts.get('delete'):
- raise util.Abort(_('cannot delete queue that does not exist'))
- elif name not in existing and not opts.get('create'):
- raise util.Abort(_('use --create to create a new queue'))
-
if opts.get('create'):
+ if name in existing:
+ raise util.Abort(_('queue "%s" already exists') % name)
if _noqueues():
_addqueue(_defaultqueue)
_addqueue(name)
_setactive(name)
elif opts.get('delete'):
+ if name not in existing:
+ raise util.Abort(_('cannot delete queue that does not exist'))
+
current = _getcurrent()
if name == current:
@@ -2657,6 +2657,8 @@
fh.close()
util.rename(repo.join('patches.queues.new'), repo.join(_allqueues))
else:
+ if name not in existing:
+ raise util.Abort(_('use --create to create a new queue'))
_setactive(name)
def reposetup(ui, repo):
diff --git a/tests/test-mq-qqueue b/tests/test-mq-qqueue
--- a/tests/test-mq-qqueue
+++ b/tests/test-mq-qqueue
@@ -28,6 +28,10 @@
hg qqueue foo
hg qqueue
+echo %% fail creating queue with already existing name
+hg qqueue --create foo
+hg qqueue
+
echo %% unapplied patches
hg qun
echo c > a
diff --git a/tests/test-mq-qqueue.out b/tests/test-mq-qqueue.out
--- a/tests/test-mq-qqueue.out
+++ b/tests/test-mq-qqueue.out
@@ -12,6 +12,10 @@
%% switch queue
foo (active)
patches
+%% fail creating queue with already existing name
+abort: queue "foo" already exists
+foo (active)
+patches
%% unapplied patches
%% fail switching back
abort: patches applied - cannot set new queue active
More information about the Mercurial-devel
mailing list