[PATCH] shelve: add --keep to list of allowables
# HG changeset patch
# User Jordi Gutiérrez Hermoso
# Date 1553472793 14400
# Sun Mar 24 20:13:13 2019 -0400
# Node ID 4b1cb76ab29461a0a4c5ff12bb364ea2bb5b1b89
# Parent 50d5e64ec561a8227ad32fe86c1811963e7664cd
shelve: add --keep to list of allowables
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -1120,6 +1120,7 @@ def shelvecmd(ui, repo, *pats, **opts):
# ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
('delete', {'delete'}),
('edit', {'create'}),
+('keep', {'create'}),
('list', {'list'}),
('message', {'create'}),
('name', {'create'}),
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -933,6 +933,15 @@ Test shelve --keep
$ hg unshelve
unshelving change 'default'
+ $ hg shelve --keep --list
+ abort: options '--list' and '--keep' may not be used together
+ [255]
+ $ hg shelve --keep --patch
+ abort: options '--patch' and '--keep' may not be used together
+ [255]
+ $ hg shelve --keep --delete
+ abort: options '--delete' and '--keep' may not be used together
+ [255]
$ hg shelve --keep
shelved as default
$ hg diff
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[PATCH] phabricator: better error message when phabread fails to get a differential
# HG changeset patch
# User Laurent Peuch
# Date 1553469818 14400
# Sun Mar 24 19:23:38 2019 -0400
# Node ID a39d18493bf66aa29f7d0dc1c5a4164b84507e1b
# Parent ba064f95175e6cb1467401a3a536d8c32229d4b1
phabricator: better error message when phabread fails to get a differential
diff --git a/hgext/phabricator.py b/hgext/phabricator.py
--- a/hgext/phabricator.py
+++ b/hgext/phabricator.py
@@ -783,8 +783,9 @@ def querydrev(repo, spec):
prefetched[drev[b'phid']] = drev
prefetched[int(drev[b'id'])] = drev
if key not in prefetched:
-raise error.Abort(_(b'cannot get Differential Revision %r')
- % params)
+raise error.Abort(_(b'cannot get Differential Revision %s using
the params %r.'
+ % (key, params)),
+ hint=_("check that the Differential Revision
exists and that you have access to it"))
return prefetched[key]
def getstack(topdrevids):
diff --git a/tests/test-phabricator.t b/tests/test-phabricator.t
--- a/tests/test-phabricator.t
+++ b/tests/test-phabricator.t
@@ -28,6 +28,9 @@ this test.
$ hg phabread --config auth.hgphab.phabtoken=cli-notavalidtoken \
> --test-vcr "$VCR/phabread-conduit-error.json" D4480 | head
abort: Conduit Error (ERR-INVALID-AUTH): API token "cli-notavalidtoken" has
the wrong length. API tokens should be 32 characters long.
+ $ hg phabread --test-vcr "$VCR/phabread-4480.json" D4481 | head
+ abort: cannot get Differential Revision 4481 using the params {'ids':
[4481]}.
+ (check that the Differential Revision exists and that you have access to it)
Basic phabread:
$ hg phabread --test-vcr "$VCR/phabread-4480.json" D4480 | head
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6027: mq: make unshelve to apply on modified mq patch (issue4318)
navaneeth.suresh added a comment. Gentle ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6027 To: navaneeth.suresh, martinvonz, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6056: patch: stop aborting when add/rename/copy files on --interactive (issue5727)
navaneeth.suresh added a comment. Gentle ping for review. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6056 To: navaneeth.suresh, #hg-reviewers Cc: pulkit, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
