Show More
@@ -3023,6 +3023,7 def identify(ui, repo, source=None, rev= | |||||
3023 | output = [hexrev] |
|
3023 | output = [hexrev] | |
3024 | fm.data(id=hexrev) |
|
3024 | fm.data(id=hexrev) | |
3025 |
|
3025 | |||
|
3026 | @util.cachefunc | |||
3026 | def getbms(): |
|
3027 | def getbms(): | |
3027 | bms = [] |
|
3028 | bms = [] | |
3028 |
|
3029 | |||
@@ -3033,17 +3034,17 def identify(ui, repo, source=None, rev= | |||||
3033 |
|
3034 | |||
3034 | return sorted(bms) |
|
3035 | return sorted(bms) | |
3035 |
|
3036 | |||
3036 | bms = getbms() |
|
|||
3037 | if bookmarks: |
|
3037 | if bookmarks: | |
3038 | output.extend(bms) |
|
3038 | output.extend(getbms()) | |
3039 | elif default and not ui.quiet: |
|
3039 | elif default and not ui.quiet: | |
3040 | # multiple bookmarks for a single parent separated by '/' |
|
3040 | # multiple bookmarks for a single parent separated by '/' | |
3041 | bm = '/'.join(bms) |
|
3041 | bm = '/'.join(getbms()) | |
3042 | if bm: |
|
3042 | if bm: | |
3043 | output.append(bm) |
|
3043 | output.append(bm) | |
3044 |
|
3044 | |||
3045 | fm.data(node=hex(remoterev)) |
|
3045 | fm.data(node=hex(remoterev)) | |
3046 | fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) |
|
3046 | if 'bookmarks' in fm.datahint(): | |
|
3047 | fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark')) | |||
3047 | else: |
|
3048 | else: | |
3048 | if rev: |
|
3049 | if rev: | |
3049 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
3050 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
General Comments 0
You need to be logged in to leave comments.
Login now