This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1073

commands: move a bunch of statements into if True for next patch
AbandonedPublic

Authored by pulkit on Oct 14 2017, 10:41 AM.

Details

Reviewers
dlax
Group Reviewers
hg-reviewers
Summary

This patch moves a bunch of statements under if True to reduce the noise for the
next patch.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 14 2017, 10:41 AM
dlax requested changes to this revision.Oct 15 2017, 4:40 AM
dlax added a subscriber: dlax.
dlax added inline comments.
mercurial/commands.py
1048

Instead of this, you could use an early return in the next patch as:

--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1045,6 +1045,10 @@ def branch(ui, repo, label=None, **opts)
                                      # i18n: "it" refers to an existing branch
                                      hint=_("use 'hg update' to switch to it"))
             scmutil.checknewlabel(repo, label, 'branch')
+
+            if revs:
+                return cmdutil.changebranch(ui, repo, revs, label)
+
             repo.dirstate.setbranch(label)
             ui.status(_('marked working directory as branch %s\n') % label)

and drop this one.

This revision now requires changes to proceed.Oct 15 2017, 4:40 AM
pulkit abandoned this revision.Oct 15 2017, 1:57 PM

Revision Contents
Changeset List

Diff 2735

mercurial/commands.py

elif label: elif label:
if not opts.get('force') and label in repo.branchmap(): if not opts.get('force') and label in repo.branchmap():
if label not in [p.branch() for p in repo[None].parents()]: if label not in [p.branch() for p in repo[None].parents()]:
raise error.Abort(_('a branch of the same name already' raise error.Abort(_('a branch of the same name already'
' exists'), ' exists'),
# i18n: "it" refers to an existing branch # i18n: "it" refers to an existing branch
hint=_("use 'hg update' to switch to it")) hint=_("use 'hg update' to switch to it"))
scmutil.checknewlabel(repo, label, 'branch') scmutil.checknewlabel(repo, label, 'branch')
if True:
dlaxUnsubmitted
Not Done

Instead of this, you could use an early return in the next patch as:

--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1045,6 +1045,10 @@ def branch(ui, repo, label=None, **opts)
                                      # i18n: "it" refers to an existing branch
                                      hint=_("use 'hg update' to switch to it"))
             scmutil.checknewlabel(repo, label, 'branch')
+
+            if revs:
+                return cmdutil.changebranch(ui, repo, revs, label)
+
             repo.dirstate.setbranch(label)
             ui.status(_('marked working directory as branch %s\n') % label)

and drop this one.

dlax: Instead of this, you could use an early `return` in the next patch as: ```…
repo.dirstate.setbranch(label) repo.dirstate.setbranch(label)
ui.status(_('marked working directory as branch %s\n') % label) ui.status(_('marked working directory as branch %s\n') % label)
# find any open named branches aside from default # find any open named branches aside from default
others = [n for n, h, t, c in repo.branchmap().iterbranches() others = [n for n, h, t, c in repo.branchmap().iterbranches()
if n != "default" and not c] if n != "default" and not c]
if not others: if not others:
ui.status(_('(branches are permanent and global, ' ui.status(_('(branches are permanent and global, '
'did you want a bookmark?)\n')) 'did you want a bookmark?)\n'))
@command('branches', @command('branches',
[('a', 'active', False, [('a', 'active', False,
_('show only branches that have unmerged heads (DEPRECATED)')), _('show only branches that have unmerged heads (DEPRECATED)')),
('c', 'closed', False, _('show normal and closed branches')), ('c', 'closed', False, _('show normal and closed branches')),
] + formatteropts, ] + formatteropts,
_('[-c]')) _('[-c]'))
def branches(ui, repo, active=False, closed=False, **opts): def branches(ui, repo, active=False, closed=False, **opts):