Details
Details
- Reviewers
indygreg - Group Reviewers
hg-reviewers - Commits
- rHG6e8582ccf76d: discovery: re-wrap expression to avoid a black bug
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
indygreg |
hg-reviewers |
Lint Skipped |
Unit Tests Skipped |
Path | Packages | |||
---|---|---|---|---|
M | mercurial/discovery.py (6 lines) |
Commit | Parents | Author | Summary | Date |
---|---|---|---|---|
d1c8c097d81b | 63ac8b0c153d | Augie Fackler | Oct 5 2019, 9:55 AM |
"not known locally: %s\n") % heads) | "not known locally: %s\n") % heads) | ||||
else: | else: | ||||
repo.ui.status(_("remote has heads on branch '%s' that are " | repo.ui.status(_("remote has heads on branch '%s' that are " | ||||
"not known locally: %s\n") % (branch, heads)) | "not known locally: %s\n") % (branch, heads)) | ||||
if remoteheads is None: | if remoteheads is None: | ||||
if len(newhs) > 1: | if len(newhs) > 1: | ||||
dhs = list(newhs) | dhs = list(newhs) | ||||
if errormsg is None: | if errormsg is None: | ||||
errormsg = (_("push creates new branch '%s' " | errormsg = ( | ||||
"with multiple heads") % (branch)) | _("push creates new branch '%s' with multiple heads") % | ||||
branch | |||||
) | |||||
hint = _("merge or" | hint = _("merge or" | ||||
" see 'hg help push' for details about" | " see 'hg help push' for details about" | ||||
" pushing new heads") | " pushing new heads") | ||||
elif len(newhs) > len(oldhs): | elif len(newhs) > len(oldhs): | ||||
# remove bookmarked or existing remote heads from the new heads list | # remove bookmarked or existing remote heads from the new heads list | ||||
dhs = sorted(newhs - nowarnheads - oldhs) | dhs = sorted(newhs - nowarnheads - oldhs) | ||||
if dhs: | if dhs: | ||||
if errormsg is None: | if errormsg is None: |