Show More
@@ -762,7 +762,7 b' def querydrev(repo, spec):' | |||||
762 | """ |
|
762 | """ | |
763 | def fetch(params): |
|
763 | def fetch(params): | |
764 | """params -> single drev or None""" |
|
764 | """params -> single drev or None""" | |
765 |
key = (params.get( |
|
765 | key = (params.get(b'ids') or params.get(b'phids') or [None])[0] | |
766 | if key in prefetched: |
|
766 | if key in prefetched: | |
767 | return prefetched[key] |
|
767 | return prefetched[key] | |
768 | drevs = callconduit(repo, b'differential.query', params) |
|
768 | drevs = callconduit(repo, b'differential.query', params) | |
@@ -779,7 +779,7 b' def querydrev(repo, spec):' | |||||
779 | """given a top, get a stack from the bottom, [id] -> [id]""" |
|
779 | """given a top, get a stack from the bottom, [id] -> [id]""" | |
780 | visited = set() |
|
780 | visited = set() | |
781 | result = [] |
|
781 | result = [] | |
782 |
queue = [{ |
|
782 | queue = [{b'ids': [i]} for i in topdrevids] | |
783 | while queue: |
|
783 | while queue: | |
784 | params = queue.pop() |
|
784 | params = queue.pop() | |
785 | drev = fetch(params) |
|
785 | drev = fetch(params) | |
@@ -923,7 +923,7 b' def readpatch(repo, drevs, write):' | |||||
923 | # Try to preserve metadata from hg:meta property. Write hg patch |
|
923 | # Try to preserve metadata from hg:meta property. Write hg patch | |
924 | # headers that can be read by the "import" command. See patchheadermap |
|
924 | # headers that can be read by the "import" command. See patchheadermap | |
925 | # and extract in mercurial/patch.py for supported headers. |
|
925 | # and extract in mercurial/patch.py for supported headers. | |
926 |
meta = getdiffmeta(diffs[ |
|
926 | meta = getdiffmeta(diffs[b'%d' % diffid]) | |
927 | for k in _metanamemap.keys(): |
|
927 | for k in _metanamemap.keys(): | |
928 | if k in meta: |
|
928 | if k in meta: | |
929 | header += b'# %s %s\n' % (_metanamemap[k], meta[k]) |
|
929 | header += b'# %s %s\n' % (_metanamemap[k], meta[k]) |
General Comments 0
You need to be logged in to leave comments.
Login now