Show More
@@ -123,6 +123,7 b' from mercurial import (' | |||
|
123 | 123 | peer, |
|
124 | 124 | phases, |
|
125 | 125 | pushkey, |
|
126 | pycompat, | |
|
126 | 127 | registrar, |
|
127 | 128 | util, |
|
128 | 129 | wireproto, |
@@ -579,6 +580,7 b' def _lookupwrap(orig):' | |||
|
579 | 580 | return _lookup |
|
580 | 581 | |
|
581 | 582 | def _pull(orig, ui, repo, source="default", **opts): |
|
583 | opts = pycompat.byteskwargs(opts) | |
|
582 | 584 | # Copy paste from `pull` command |
|
583 | 585 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
584 | 586 | |
@@ -620,7 +622,7 b' def _pull(orig, ui, repo, source="defaul' | |||
|
620 | 622 | # Remote scratch bookmarks will be deleted because remotenames doesn't |
|
621 | 623 | # know about them. Let's save it before pull and restore after |
|
622 | 624 | remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, source) |
|
623 | result = orig(ui, repo, source, **opts) | |
|
625 | result = orig(ui, repo, source, **pycompat.strkwargs(opts)) | |
|
624 | 626 | # TODO(stash): race condition is possible |
|
625 | 627 | # if scratch bookmarks was updated right after orig. |
|
626 | 628 | # But that's unlikely and shouldn't be harmful. |
General Comments 0
You need to be logged in to leave comments.
Login now