From dacb0b2f814684ce2acec658168403af5b0d29ff Mon Sep 17 00:00:00 2001 From: Martijn Pieters Date: Fri, 1 Jul 2016 12:57:06 +0100 Subject: [PATCH] remotenames: recorded journal entries should be shared like bookmarks When a repository is shared between working copies, treat remote names just like bookmarks as far as sharing journal entries are concerned. --- remotenames.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/remotenames.py b/remotenames.py index b572ec9750..f92273ea1c 100644 --- a/remotenames.py +++ b/remotenames.py @@ -569,6 +569,16 @@ def extsetup(ui): # histedit isn't on pass + def hasjournal(loaded): + if not loaded: + return + # register our namespace as 'shared' when bookmarks are shared + journal = extensions.find('journal') + journal.sharednamespaces[journalremotebookmarktype] = ( + hg.sharedbookmarks) + + extensions.afterloaded('journal', hasjournal) + bookcmd = extensions.wrapcommand(commands.table, 'bookmarks', exbookmarks) branchcmd = extensions.wrapcommand(commands.table, 'branches', exbranches) pushcmd = extensions.wrapcommand(commands.table, 'push', expushcmd)