hgext/infinitepush/__init__.py
changeset 49825 6f89a1d74511
parent 49816 a7985c822c09
child 49846 4dfcdb20ffc7
equal deleted inserted replaced
49824:905eb32fdf4e 49825:6f89a1d74511
   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)