equal
deleted
inserted
replaced
854 # know about them. Let's save it before push and restore after |
854 # know about them. Let's save it before push and restore after |
855 remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, destpath) |
855 remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, destpath) |
856 result = orig(ui, repo, *dests, **pycompat.strkwargs(opts)) |
856 result = orig(ui, repo, *dests, **pycompat.strkwargs(opts)) |
857 if common.isremotebooksenabled(ui): |
857 if common.isremotebooksenabled(ui): |
858 if bookmark and scratchpush: |
858 if bookmark and scratchpush: |
859 other = hg.peer(repo, opts, destpath) |
859 other = hg.peer(repo, opts, path) |
860 try: |
860 try: |
861 fetchedbookmarks = other.listkeyspatterns( |
861 fetchedbookmarks = other.listkeyspatterns( |
862 b'bookmarks', patterns=[bookmark] |
862 b'bookmarks', patterns=[bookmark] |
863 ) |
863 ) |
864 remotescratchbookmarks.update(fetchedbookmarks) |
864 remotescratchbookmarks.update(fetchedbookmarks) |