[PATCH] bookmarks: deactivate current bookmark if no name is given

Kevin Bullock kbullock+mercurial at ringworld.org
Mon Oct 8 12:02:41 CDT 2012


On Oct 8, 2012, at 3:57 AM, Pierre-Yves David wrote:

> On Mon, Oct 08, 2012 at 12:24:08AM +0200, Idan Kamara wrote:
>> # HG changeset patch
>> # User Idan Kamara <idankk86 at gmail.com>
>> # Date 1349648370 -7200
>> # Branch stable
>> # Node ID 67f7906491d804423d16cb151e7add017ca1138d
>> # Parent  6647ac9b9044023b4947e890b07d6dfef30ea9b3
>> bookmarks: deactivate current bookmark if no name is given
>> 
>> f57f891eb88e added this help text to hg bookmark:
>> 
>>  If no NAME is given, the current active bookmark will be marked inactive.
>> 
>> But that never actually seemed to be the case.

Whoops, that behavior should've been implemented in 328422b0380d.

>> diff --git a/mercurial/commands.py b/mercurial/commands.py
>> --- a/mercurial/commands.py
>> +++ b/mercurial/commands.py
>> @@ -847,6 +847,12 @@
>>         if len(marks) == 0:
>>             ui.status(_("no bookmarks set\n"))
>>         else:
>> +            if inactive:
>> +                if not repo._bookmarkcurrent:
>> +                    raise util.Abort(_("no active bookmark to deactivate"))
>> +                bookmarks.setcurrent(repo, None)
>> +                return
>> +
> 
> I feel like the use of Abort here is a bit abusive.
> What about a simple ui.write_err call + a return <some-error> code.

I agree with this assessment. I'm working on a patch for this myself.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121008/285fd4bc/attachment.html>


More information about the Mercurial-devel mailing list