##// END OF EJS Templates
mergestate: add `allextras()` to get all extras...
Pulkit Goyal -
r46307:0428978b default
parent child Browse files
Show More
@@ -155,7 +155,7 b' def _get_salvaged(repo, ms, ctx):'
155 copy_sd = repo.filecopiesmode == b'changeset-sidedata'
155 copy_sd = repo.filecopiesmode == b'changeset-sidedata'
156 if copy_sd and len(ctx.parents()) > 1:
156 if copy_sd and len(ctx.parents()) > 1:
157 if ms.active():
157 if ms.active():
158 for fname in sorted(ms._stateextras.keys()):
158 for fname in sorted(ms.allextras().keys()):
159 might_removed = ms.extras(fname).get(b'merge-removal-candidate')
159 might_removed = ms.extras(fname).get(b'merge-removal-candidate')
160 if might_removed == b'yes':
160 if might_removed == b'yes':
161 if fname in ctx:
161 if fname in ctx:
@@ -2107,7 +2107,7 b' def debugmergestate(ui, repo, *args, **o'
2107 fm_files.end()
2107 fm_files.end()
2108
2108
2109 fm_extras = fm.nested(b'extras')
2109 fm_extras = fm.nested(b'extras')
2110 for f, d in sorted(pycompat.iteritems(ms._stateextras)):
2110 for f, d in sorted(pycompat.iteritems(ms.allextras())):
2111 if f in ms:
2111 if f in ms:
2112 # If file is in mergestate, we have already processed it's extras
2112 # If file is in mergestate, we have already processed it's extras
2113 continue
2113 continue
@@ -306,7 +306,12 b' class _mergestate_base(object):'
306 ):
306 ):
307 yield f
307 yield f
308
308
309 def allextras(self):
310 """ return all extras information stored with the mergestate """
311 return self._stateextras
312
309 def extras(self, filename):
313 def extras(self, filename):
314 """ return extras stored with the mergestate for the given filename """
310 return self._stateextras[filename]
315 return self._stateextras[filename]
311
316
312 def _resolve(self, preresolve, dfile, wctx):
317 def _resolve(self, preresolve, dfile, wctx):
General Comments 0
You need to be logged in to leave comments. Login now