| hg-reviewers |
This is similar to remotefilelog's 'getlocalkey' method, which must be overridden by systems which rely on full path names for access control purposes.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (23 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Daniel Ploch | Jan 8 2019, 5:19 PM |
| for key, data in records: | for key, data in records: | ||||
| assert len(key) == 1 | assert len(key) == 1 | ||||
| if key not in allowlist: | if key not in allowlist: | ||||
| key, data = RECORD_OVERRIDE, '%s%s' % (key, data) | key, data = RECORD_OVERRIDE, '%s%s' % (key, data) | ||||
| format = '>sI%is' % len(data) | format = '>sI%is' % len(data) | ||||
| f.write(_pack(format, key, len(data), data)) | f.write(_pack(format, key, len(data), data)) | ||||
| f.close() | f.close() | ||||
| @staticmethod | |||||
| def getlocalkey(path): | |||||
| """hash the path of a local file context for storage in the .hg/merge | |||||
| directory.""" | |||||
| return hex(hashlib.sha1(path).digest()) | |||||
| def add(self, fcl, fco, fca, fd): | def add(self, fcl, fco, fca, fd): | ||||
| """add a new (potentially?) conflicting file the merge state | """add a new (potentially?) conflicting file the merge state | ||||
| fcl: file context for local, | fcl: file context for local, | ||||
| fco: file context for remote, | fco: file context for remote, | ||||
| fca: file context for ancestors, | fca: file context for ancestors, | ||||
| fd: file path of the resulting merge. | fd: file path of the resulting merge. | ||||
| note: also write the local version to the `.hg/merge` directory. | note: also write the local version to the `.hg/merge` directory. | ||||
| """ | """ | ||||
| if fcl.isabsent(): | if fcl.isabsent(): | ||||
| hash = nullhex | localkey = nullhex | ||||
| else: | else: | ||||
| hash = hex(hashlib.sha1(fcl.path()).digest()) | localkey = mergestate.getlocalkey(fcl.path()) | ||||
| self._repo.vfs.write('merge/' + hash, fcl.data()) | self._repo.vfs.write('merge/' + localkey, fcl.data()) | ||||
| self._state[fd] = [MERGE_RECORD_UNRESOLVED, hash, fcl.path(), | self._state[fd] = [MERGE_RECORD_UNRESOLVED, localkey, fcl.path(), | ||||
| fca.path(), hex(fca.filenode()), | fca.path(), hex(fca.filenode()), | ||||
| fco.path(), hex(fco.filenode()), | fco.path(), hex(fco.filenode()), | ||||
| fcl.flags()] | fcl.flags()] | ||||
| self._stateextras[fd] = {'ancestorlinknode': hex(fca.node())} | self._stateextras[fd] = {'ancestorlinknode': hex(fca.node())} | ||||
| self._dirty = True | self._dirty = True | ||||
| def addpath(self, path, frename, forigin): | def addpath(self, path, frename, forigin): | ||||
| """add a new conflicting path to the merge state | """add a new conflicting path to the merge state | ||||
| return self._stateextras.setdefault(filename, {}) | return self._stateextras.setdefault(filename, {}) | ||||
| def _resolve(self, preresolve, dfile, wctx): | def _resolve(self, preresolve, dfile, wctx): | ||||
| """rerun merge process for file path `dfile`""" | """rerun merge process for file path `dfile`""" | ||||
| if self[dfile] in (MERGE_RECORD_RESOLVED, | if self[dfile] in (MERGE_RECORD_RESOLVED, | ||||
| MERGE_RECORD_DRIVER_RESOLVED): | MERGE_RECORD_DRIVER_RESOLVED): | ||||
| return True, 0 | return True, 0 | ||||
| stateentry = self._state[dfile] | stateentry = self._state[dfile] | ||||
| state, hash, lfile, afile, anode, ofile, onode, flags = stateentry | state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry | ||||
| octx = self._repo[self._other] | octx = self._repo[self._other] | ||||
| extras = self.extras(dfile) | extras = self.extras(dfile) | ||||
| anccommitnode = extras.get('ancestorlinknode') | anccommitnode = extras.get('ancestorlinknode') | ||||
| if anccommitnode: | if anccommitnode: | ||||
| actx = self._repo[anccommitnode] | actx = self._repo[anccommitnode] | ||||
| else: | else: | ||||
| actx = None | actx = None | ||||
| fcd = self._filectxorabsent(hash, wctx, dfile) | fcd = self._filectxorabsent(localkey, wctx, dfile) | ||||
| fco = self._filectxorabsent(onode, octx, ofile) | fco = self._filectxorabsent(onode, octx, ofile) | ||||
| # TODO: move this to filectxorabsent | # TODO: move this to filectxorabsent | ||||
| fca = self._repo.filectx(afile, fileid=anode, changectx=actx) | fca = self._repo.filectx(afile, fileid=anode, changectx=actx) | ||||
| # "premerge" x flags | # "premerge" x flags | ||||
| flo = fco.flags() | flo = fco.flags() | ||||
| fla = fca.flags() | fla = fca.flags() | ||||
| if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: | if 'x' in flags + flo + fla and 'l' not in flags + flo + fla: | ||||
| if fca.node() == nullid and flags != flo: | if fca.node() == nullid and flags != flo: | ||||
| if preresolve: | if preresolve: | ||||
| self._repo.ui.warn( | self._repo.ui.warn( | ||||
| _('warning: cannot merge flags for %s ' | _('warning: cannot merge flags for %s ' | ||||
| 'without common ancestor - keeping local flags\n') | 'without common ancestor - keeping local flags\n') | ||||
| % afile) | % afile) | ||||
| elif flags == fla: | elif flags == fla: | ||||
| flags = flo | flags = flo | ||||
| if preresolve: | if preresolve: | ||||
| # restore local | # restore local | ||||
| if hash != nullhex: | if localkey != nullhex: | ||||
| f = self._repo.vfs('merge/' + hash) | f = self._repo.vfs('merge/' + localkey) | ||||
| wctx[dfile].write(f.read(), flags) | wctx[dfile].write(f.read(), flags) | ||||
| f.close() | f.close() | ||||
| else: | else: | ||||
| wctx[dfile].remove(ignoremissing=True) | wctx[dfile].remove(ignoremissing=True) | ||||
| complete, r, deleted = filemerge.premerge(self._repo, wctx, | complete, r, deleted = filemerge.premerge(self._repo, wctx, | ||||
| self._local, lfile, fcd, | self._local, lfile, fcd, | ||||
| fco, fca, | fco, fca, | ||||
| labels=self._labels) | labels=self._labels) | ||||