Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mercurial
hg-git
Commits
9d2a06c95a2c
Commit
9d2a06c9
authored
Jan 29, 2022
by
Dan Villiom Podlaski Christiansen
Browse files
branch_bookmark_suffix: change default from None, so that we needn't check
parent
4399eeb7ffc7
Pipeline
#46928
passed with stages
in 14 minutes and 36 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
hggit/config.py
View file @
9d2a06c9
...
...
@@ -7,7 +7,7 @@
CONFIG_DEFAULTS
=
{
b
'git'
:
{
b
'authors'
:
None
,
b
'branch_bookmark_suffix'
:
None
,
b
'branch_bookmark_suffix'
:
b
''
,
b
'debugextrainmessage'
:
False
,
# test only -- do not document this!
b
'findcopiesharder'
:
False
,
b
'intree'
:
None
,
...
...
hggit/git_handler.py
View file @
9d2a06c9
...
...
@@ -423,7 +423,7 @@
activate
=
None
if
activate
is
not
None
:
activate
+=
self
.
branch_bookmark_suffix
or
b
''
activate
+=
self
.
branch_bookmark_suffix
if
activate
in
self
.
repo
.
_bookmarks
:
bookmarks
.
activate
(
self
.
repo
,
activate
)
...
...
@@ -1864,7 +1864,7 @@
for
ref_name
,
wanted_node
in
self
.
_get_ref_nodes
(
remote_names
,
refs
).
items
():
bm
=
ref_name
+
(
self
.
branch_bookmark_suffix
or
b
''
)
bm
=
ref_name
+
self
.
branch_bookmark_suffix
current_node
=
bms
.
get
(
bm
)
if
current_node
is
not
None
and
current_node
==
wanted_node
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment