Patchwork D6211: branch: return early if we find an open named branch apart from default

login
register
mail settings
Submitter phabricator
Date April 15, 2019, 4:15 p.m.
Message ID <bdf6acafc5ecb6aac6fe4f3cc137ffec@localhost.localdomain>
Download mbox | patch
Permalink /patch/39612/
State Not Applicable
Headers show

Comments

phabricator - April 15, 2019, 4:15 p.m.
pulkit updated this revision to Diff 14742.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6211?vs=14680&id=14742

REVISION DETAIL
  https://phab.mercurial-scm.org/D6211

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1125,11 +1125,11 @@ 
             ui.status(_('marked working directory as branch %s\n') % label)
 
             # find any open named branches aside from default
-            others = [n for n, h, t, c in repo.branchmap().iterbranches()
-                      if n != "default" and not c]
-            if not others:
-                ui.status(_('(branches are permanent and global, '
-                            'did you want a bookmark?)\n'))
+            for n, h, t, c in repo.branchmap().iterbranches():
+                if n != "default" and not c:
+                    return 0
+            ui.status(_('(branches are permanent and global, '
+                        'did you want a bookmark?)\n'))
 
 @command('branches',
     [('a', 'active', False,