| dsp |
| Restricted Project |
The P4 repository can erroneously consider a file to be "inside" a symlink to a
directory. 'p4 sync' (the client) reports an error if it encounters this
situation, but 'hg update' aborts.
Work around the problem by discarding such files. In the testcase, we can't
accept changelist #2, because we have no changelist that deletes the symlink,
so instead we have to ignore the new file.
| Lint Skipped |
| Unit Tests Skipped |
| tests/test-p4fastimport-import-badsymlink.t | ||
|---|---|---|
| 26 | what happens if we mkdir Main/d/d and then generate Main/d/d/d, does Main/d still show up as a symlink? | |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext3rd/p4fastimport/importer.py (38 lines) | |||
| A | M | tests/test-p4fastimport-import-badsymlink.t (82 lines) |
| changed.add(localname) | changed.add(localname) | ||||
| del mf[localname] | del mf[localname] | ||||
| for depotname in added + modified: | for depotname in added + modified: | ||||
| if depotname not in self._importset.filelist: | if depotname not in self._importset.filelist: | ||||
| continue | continue | ||||
| info = fileinfo[depotname] | info = fileinfo[depotname] | ||||
| localname, baserev = info['localname'], info['baserev'] | localname, baserev = info['localname'], info['baserev'] | ||||
| # Under rare situations, when a symlink points to a directory, | |||||
| # the P4 server can report a file "under" it (as if it really | |||||
| # were a directory). 'p4 sync' reports this as an error and | |||||
| # continues, but 'hg update' will abort if it encounters this. | |||||
| # We need to keep such damage out of the hg repository. | |||||
| depotparentname = os.path.dirname(depotname) | |||||
| # The manifest's flags for the parent haven't been updated to | |||||
| # reflect this changelist yet. If the parent's flags are | |||||
| # changing right now, use them. Otherwise, use the manifest's | |||||
| # flags. | |||||
| parentflags = None | |||||
| parentinfo = fileinfo.get(depotparentname, None) | |||||
| if parentinfo: | |||||
| parentflags = parentinfo['flags'].get(change.cl, None) | |||||
| localparentname = localname | |||||
| while parentflags == None: | |||||
| # This P4 commit didn't change parent's flags at all. | |||||
| # Therefore, we can consult the Hg metadata. | |||||
| localparentname = os.path.dirname(localparentname) | |||||
| if localparentname == '': | |||||
| # There was no parent file above localname; only | |||||
| # directories. That's good/expected. | |||||
| parentflags = '' | |||||
| break | |||||
| parentflags = mf.flags(localparentname, None) | |||||
| if 'l' in parentflags: | |||||
| # It turns out that some parent is a symlink, so this file | |||||
| # can't exist. However, we already wrote the filelog! Oh | |||||
| # well. Just don't reference it in the manifest. | |||||
| # TODO: hgfilelog.strip()? | |||||
| self._ui.warn("warning: ignoring {} because it's under a " | |||||
| "symlink ({})\n".format(localname, localparentname)) | |||||
| continue | |||||
| hgfilelog = self._repo.file(localname) | hgfilelog = self._repo.file(localname) | ||||
| try: | try: | ||||
| mf[localname] = hgfilelog.node(baserev) | mf[localname] = hgfilelog.node(baserev) | ||||
| except (error.LookupError, IndexError): | except (error.LookupError, IndexError): | ||||
| raise error.Abort("can't find rev %d for %s cl %d" % ( | raise error.Abort("can't find rev %d for %s cl %d" % ( | ||||
| baserev, localname, change.cl)) | baserev, localname, change.cl)) | ||||
| changed.add(localname) | changed.add(localname) | ||||
| if change.cl in info['flags']: | if change.cl in info['flags']: | ||||
what happens if we mkdir Main/d/d and then generate Main/d/d/d, does Main/d still show up as a symlink?