| dsp |
| Restricted Project |
Previous code looked for "text+x" type from 'p4 fstat' output. This was
insufficient, because files may have types like "text+Fx" or "text+wx".
Based on the information at
https://www.perforce.com/perforce/r16.2/manuals/cmdref/file.types.html,
the executable bit is now properly handled in all cases.
The unnecessary regexp matching for the +k (keyword) file attribute is now
removed as well.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
When files are affected, the repo needs to be reimported. Since the commit hashes change (to include the previously omitted exec bits), all users must be informed to reclone as well...
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext3rd/p4fastimport/p4.py (44 lines) | |||
| M | tests/test-p4fastimport-import-lfs-sqlite.t (3 lines) | |||
| M | tests/test-p4fastimport-import-lfs.t (2 lines) | |||
| M | tests/test-p4fastimport-import-modes.t (29 lines) |
| except Exception: | except Exception: | ||||
| raise P4Exception(stdout) | raise P4Exception(stdout) | ||||
| class P4Filelog(object): | class P4Filelog(object): | ||||
| def __init__(self, depotfile, data): | def __init__(self, depotfile, data): | ||||
| self._data = data | self._data = data | ||||
| self._depotfile = depotfile | self._depotfile = depotfile | ||||
| # used in Perforce prior to 99.1 | |||||
| self._keyword_to_typemod = { | |||||
| 'text': ('text', ''), | |||||
| 'xtext': ('text', 'x'), | |||||
| 'ktext': ('text', 'k'), | |||||
| 'kxtext': ('text', 'kx'), | |||||
| 'binary': ('binary', ''), | |||||
| 'xbinary': ('binary', 'x'), | |||||
| 'ctext': ('text', 'C'), | |||||
| 'cxtext': ('text', 'Cx'), | |||||
| 'symlink': ('symlink', ''), | |||||
| 'resource': ('resource', ''), | |||||
| 'uresource': ('resource', 'F'), | |||||
| 'ltext': ('text', 'F'), | |||||
| 'xltext': ('text', 'Fx'), | |||||
| 'ubinary': ('binary', 'F'), | |||||
| 'uxbinary': ('binary', 'Fx'), | |||||
| 'tempobj': ('binary', 'FSw'), | |||||
| 'ctempobj': ('binary', 'Sw'), | |||||
| 'xtempobj': ('binary', 'FSwx'), | |||||
| 'xunicode': ('unicode', 'x'), | |||||
| 'xutf16': ('utf16', 'x'), | |||||
| } | |||||
| # @property | # @property | ||||
| # def branchcl(self): | # def branchcl(self): | ||||
| # return self._parsed[1] | # return self._parsed[1] | ||||
| # | # | ||||
| # @property | # @property | ||||
| # def branchsource(self): | # def branchsource(self): | ||||
| # if self.branchcl: | # if self.branchcl: | ||||
| # return self.parsed[self.branchcl]['from'] | # return self.parsed[self.branchcl]['from'] | ||||
| @property | @property | ||||
| def depotfile(self): | def depotfile(self): | ||||
| return self._depotfile | return self._depotfile | ||||
| @property | @property | ||||
| def revisions(self): | def revisions(self): | ||||
| return sorted(self._data.keys()) | return sorted(self._data.keys()) | ||||
| def _get_type_modifiers(self, filetype): | |||||
| try: | |||||
| filetype, modifiers = self._keyword_to_typemod[filetype] | |||||
| except KeyError: | |||||
| filetype, plus, modifiers = filetype.partition('+') | |||||
| return filetype, modifiers | |||||
| def _get_type(self, filetype): | |||||
| return self._get_type_modifiers(filetype)[0] | |||||
| def _get_modifiers(self, filetype): | |||||
| return self._get_type_modifiers(filetype)[1] | |||||
| def isdeleted(self, clnum): | def isdeleted(self, clnum): | ||||
| return self._data[clnum]['action'] in ['move/delete', 'delete'] | return self._data[clnum]['action'] in ['move/delete', 'delete'] | ||||
| def isexec(self, clnum): | def isexec(self, clnum): | ||||
| t = self._data[clnum]['type'] | t = self._data[clnum]['type'] | ||||
| return 'xtext' == t or '+x' in t | return 'x' in self._get_modifiers(t) | ||||
| def issymlink(self, clnum): | def issymlink(self, clnum): | ||||
| t = self._data[clnum]['type'] | t = self._data[clnum]['type'] | ||||
| return 'symlink' in t | return 'symlink' == self._get_type(t) | ||||
| def iskeyworded(self, clnum): | def iskeyworded(self, clnum): | ||||
| t = self._data[clnum]['type'] | t = self._data[clnum]['type'] | ||||
| return (re.compile('kx?text').match(t) or | return 'k' in self._get_modifiers(t) | ||||
| re.compile('\+kx?').search(t)) is not None | |||||
| ACTION_EDIT = ['edit', 'integrate'] | ACTION_EDIT = ['edit', 'integrate'] | ||||
| ACTION_ADD = ['add', 'branch', 'move/add'] | ACTION_ADD = ['add', 'branch', 'move/add'] | ||||
| ACTION_DELETE = ['delete', 'move/delete'] | ACTION_DELETE = ['delete', 'move/delete'] | ||||
| ACTION_ARCHIVE = ['archive'] | ACTION_ARCHIVE = ['archive'] | ||||
| SUPPORTED_ACTIONS = ACTION_EDIT + ACTION_ADD + ACTION_DELETE | SUPPORTED_ACTIONS = ACTION_EDIT + ACTION_ADD + ACTION_DELETE | ||||
| class P4Changelist(object): | class P4Changelist(object): | ||||
| edit //depot/Main/largefile#2 | edit //depot/Main/largefile#2 | ||||
| Change 2 submitted. | Change 2 submitted. | ||||
| Simple import | Simple import | ||||
| $ cd $hgwd | $ cd $hgwd | ||||
| $ hg init --config 'format.usefncache=False' | $ hg init --config 'format.usefncache=False' | ||||
| $ hg p4fastimport --debug -P $P4ROOT hg-p4-import | $ hg p4fastimport --debug -P $P4ROOT hg-p4-import | ||||
| updating the branch cache (?) | |||||
| loading changelist numbers. | loading changelist numbers. | ||||
| 2 changelists to import. | 2 changelists to import. | ||||
| loading list of files. | loading list of files. | ||||
| 3 files to import. | 3 files to import. | ||||
| reading filelog * (glob) | reading filelog * (glob) | ||||
| reading filelog * (glob) | reading filelog * (glob) | ||||
| reading filelog * (glob) | reading filelog * (glob) | ||||
| importing repository. | importing repository. | ||||
| writing filelog: b789fdd96dc2, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/a (glob) | writing filelog: b789fdd96dc2, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/a (glob) | ||||
| writing filelog: a80d06849b33, p1 b789fdd96dc2, linkrev 1, 4 bytes, src: *, path: Main/a (glob) | writing filelog: a80d06849b33, p1 b789fdd96dc2, linkrev 1, 4 bytes, src: *, path: Main/a (glob) | ||||
| writing filelog: 149da44f2a4e, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/b/c (glob) | writing filelog: 149da44f2a4e, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/b/c (glob) | ||||
| writing filelog: b11e10a88bfa, p1 149da44f2a4e, linkrev 1, 4 bytes, src: *, path: Main/b/c (glob) | writing filelog: b11e10a88bfa, p1 149da44f2a4e, linkrev 1, 4 bytes, src: *, path: Main/b/c (glob) | ||||
| writing filelog: b3a729dd094e, p1 000000000000, linkrev 0, 44 bytes, src: *, path: Main/largefile (glob) | writing filelog: b3a729dd094e, p1 000000000000, linkrev 0, 44 bytes, src: *, path: Main/largefile (glob) | ||||
| largefile: Main/largefile, oid: 37a7b43abd9e105a0e6b22088b140735a02f288767fe7a6f4f436cb46b064ca9 | largefile: Main/largefile, oid: 37a7b43abd9e105a0e6b22088b140735a02f288767fe7a6f4f436cb46b064ca9 | ||||
| writing filelog: 9f14f96519e1, p1 b3a729dd094e, linkrev 1, 88 bytes, src: *, path: Main/largefile (glob) | writing filelog: 9f14f96519e1, p1 b3a729dd094e, linkrev 1, 88 bytes, src: *, path: Main/largefile (glob) | ||||
| largefile: Main/largefile, oid: b0d5c1968efbabbff9d94160f284cd7b52686ca3c46cfffdd351de07384fce9c | largefile: Main/largefile, oid: b0d5c1968efbabbff9d94160f284cd7b52686ca3c46cfffdd351de07384fce9c | ||||
| changelist 1: writing manifest. node: 0637b0361958 p1: 000000000000 p2: 000000000000 linkrev: 0 | changelist 1: writing manifest. node: 0637b0361958 p1: 000000000000 p2: 000000000000 linkrev: 0 | ||||
| changelist 1: writing changelog: initial | changelist 1: writing changelog: initial | ||||
| changelist 2: writing manifest. node: 31c95d82cc49 p1: 0637b0361958 p2: 000000000000 linkrev: 1 | changelist 2: writing manifest. node: 31c95d82cc49 p1: 0637b0361958 p2: 000000000000 linkrev: 1 | ||||
| changelist 2: writing changelog: second | changelist 2: writing changelog: second | ||||
| writing lfs metadata to sqlite | writing lfs metadata to sqlite | ||||
| updating the branch cache (?) | updating the branch cache | ||||
| 2 revision(s), 3 file(s) imported. | 2 revision(s), 3 file(s) imported. | ||||
| Verify | Verify | ||||
| (waiting for https://patchwork.mercurial-scm.org/patch/20582/) | (waiting for https://patchwork.mercurial-scm.org/patch/20582/) | ||||
| $ hg --debug verify --config verify.skipflags=8192 | $ hg --debug verify --config verify.skipflags=8192 | ||||
| repository uses revlog format 1 | repository uses revlog format 1 | ||||
| checking changesets | checking changesets | ||||
| edit //depot/Main/largefile#2 | edit //depot/Main/largefile#2 | ||||
| Change 2 submitted. | Change 2 submitted. | ||||
| Simple import | Simple import | ||||
| $ cd $hgwd | $ cd $hgwd | ||||
| $ hg init --config 'format.usefncache=False' | $ hg init --config 'format.usefncache=False' | ||||
| $ hg p4fastimport --debug -P $P4ROOT hg-p4-import | $ hg p4fastimport --debug -P $P4ROOT hg-p4-import | ||||
| updating the branch cache (?) | |||||
| loading changelist numbers. | loading changelist numbers. | ||||
| 2 changelists to import. | 2 changelists to import. | ||||
| loading list of files. | loading list of files. | ||||
| 3 files to import. | 3 files to import. | ||||
| reading filelog * (glob) | reading filelog * (glob) | ||||
| reading filelog * (glob) | reading filelog * (glob) | ||||
| reading filelog * (glob) | reading filelog * (glob) | ||||
| importing repository. | importing repository. | ||||
| writing filelog: b789fdd96dc2, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/a (glob) | writing filelog: b789fdd96dc2, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/a (glob) | ||||
| writing filelog: a80d06849b33, p1 b789fdd96dc2, linkrev 1, 4 bytes, src: *, path: Main/a (glob) | writing filelog: a80d06849b33, p1 b789fdd96dc2, linkrev 1, 4 bytes, src: *, path: Main/a (glob) | ||||
| writing filelog: 149da44f2a4e, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/b/c (glob) | writing filelog: 149da44f2a4e, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/b/c (glob) | ||||
| writing filelog: b11e10a88bfa, p1 149da44f2a4e, linkrev 1, 4 bytes, src: *, path: Main/b/c (glob) | writing filelog: b11e10a88bfa, p1 149da44f2a4e, linkrev 1, 4 bytes, src: *, path: Main/b/c (glob) | ||||
| updating the branch cache (?) | |||||
| writing filelog: ee08366a1a83, p1 000000000000, linkrev 0, 44 bytes, src: rcs, path: Main/largefile | writing filelog: ee08366a1a83, p1 000000000000, linkrev 0, 44 bytes, src: rcs, path: Main/largefile | ||||
| largefile: Main/largefile, oid: dde0d1d11f099d6572fa47fcbd1cae324aeaad7409cb107461b09ba4eb2177ac | largefile: Main/largefile, oid: dde0d1d11f099d6572fa47fcbd1cae324aeaad7409cb107461b09ba4eb2177ac | ||||
| writing filelog: a33f052256c3, p1 ee08366a1a83, linkrev 1, 88 bytes, src: rcs, path: Main/largefile | writing filelog: a33f052256c3, p1 ee08366a1a83, linkrev 1, 88 bytes, src: rcs, path: Main/largefile | ||||
| largefile: Main/largefile, oid: 595efb640da040786d840fbae4675925fd4621f3498b849744ce0d4446674e3f | largefile: Main/largefile, oid: 595efb640da040786d840fbae4675925fd4621f3498b849744ce0d4446674e3f | ||||
| changelist 1: writing manifest. node: e970866c1151 p1: 000000000000 p2: 000000000000 linkrev: 0 | changelist 1: writing manifest. node: e970866c1151 p1: 000000000000 p2: 000000000000 linkrev: 0 | ||||
| changelist 1: writing changelog: initial | changelist 1: writing changelog: initial | ||||
| changelist 2: writing manifest. node: 628c61b1c54a p1: e970866c1151 p2: 000000000000 linkrev: 1 | changelist 2: writing manifest. node: 628c61b1c54a p1: e970866c1151 p2: 000000000000 linkrev: 1 | ||||
| changelist 2: writing changelog: second | changelist 2: writing changelog: second | ||||
| $ echo d > Main/b/c | $ echo d > Main/b/c | ||||
| $ p4 submit -d second | $ p4 submit -d second | ||||
| Submitting change 2. | Submitting change 2. | ||||
| Locking 3 files ... | Locking 3 files ... | ||||
| edit //depot/Main/a#2 | edit //depot/Main/a#2 | ||||
| edit //depot/Main/b/c#2 | edit //depot/Main/b/c#2 | ||||
| edit //depot/Main/d#2 | edit //depot/Main/d#2 | ||||
| Change 2 submitted. | Change 2 submitted. | ||||
| $ echo "full-exec" > Main/full-exec | |||||
| $ p4 add -t text+Fx Main/full-exec | |||||
| //depot/Main/full-exec#1 - opened for add | |||||
| $ p4 submit -d third | |||||
| Submitting change 3. | |||||
| Locking 1 files ... | |||||
| add //depot/Main/full-exec#1 | |||||
| Change 3 submitted. | |||||
| Simple import | Simple import | ||||
| $ cd $hgwd | $ cd $hgwd | ||||
| $ hg init --config 'format.usefncache=False' | $ hg init --config 'format.usefncache=False' | ||||
| $ hg p4fastimport --debug -P $P4ROOT hg-p4-import | $ hg p4fastimport --debug -P $P4ROOT hg-p4-import | ||||
| loading changelist numbers. | loading changelist numbers. | ||||
| 2 changelists to import. | updating the branch cache (?) | ||||
| updating the branch cache (?) | |||||
| 3 changelists to import. | |||||
| loading list of files. | loading list of files. | ||||
| 3 files to import. | 4 files to import. | ||||
| reading filelog * (glob) | |||||
| reading filelog * (glob) | reading filelog * (glob) | ||||
| reading filelog * (glob) | reading filelog * (glob) | ||||
| reading filelog * (glob) | reading filelog * (glob) | ||||
| importing repository. | importing repository. | ||||
| writing filelog: b789fdd96dc2, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/a (glob) | writing filelog: b789fdd96dc2, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/a (glob) | ||||
| writing filelog: a80d06849b33, p1 b789fdd96dc2, linkrev 1, 4 bytes, src: *, path: Main/a (glob) | writing filelog: a80d06849b33, p1 b789fdd96dc2, linkrev 1, 4 bytes, src: *, path: Main/a (glob) | ||||
| updating the branch cache (?) | |||||
| writing filelog: 1f6b5bb93f1d, p1 000000000000, linkrev 0, 4 bytes, src: *, path: Main/b/c (glob) | writing filelog: 1f6b5bb93f1d, p1 000000000000, linkrev 0, 4 bytes, src: *, path: Main/b/c (glob) | ||||
| writing filelog: c29ae1cbd245, p1 1f6b5bb93f1d, linkrev 1, 2 bytes, src: *, path: Main/b/c (glob) | writing filelog: c29ae1cbd245, p1 1f6b5bb93f1d, linkrev 1, 2 bytes, src: *, path: Main/b/c (glob) | ||||
| writing filelog: a9092a3d84a3, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/d (glob) | writing filelog: a9092a3d84a3, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/d (glob) | ||||
| writing filelog: f83f0637e55e, p1 a9092a3d84a3, linkrev 1, 4 bytes, src: *, path: Main/d (glob) | writing filelog: f83f0637e55e, p1 a9092a3d84a3, linkrev 1, 4 bytes, src: *, path: Main/d (glob) | ||||
| writing filelog: f011293652b8, p1 000000000000, linkrev 2, 10 bytes, src: *, path: Main/full-exec (glob) | |||||
| changelist 1: writing manifest. node: 05414d16d473 p1: 000000000000 p2: 000000000000 linkrev: 0 | changelist 1: writing manifest. node: 05414d16d473 p1: 000000000000 p2: 000000000000 linkrev: 0 | ||||
| changelist 1: writing changelog: initial | changelist 1: writing changelog: initial | ||||
| changelist 2: writing manifest. node: 9408cdd6d4f7 p1: 05414d16d473 p2: 000000000000 linkrev: 1 | changelist 2: writing manifest. node: 9408cdd6d4f7 p1: 05414d16d473 p2: 000000000000 linkrev: 1 | ||||
| changelist 2: writing changelog: second | changelist 2: writing changelog: second | ||||
| updating the branch cache (?) | changelist 3: writing manifest. node: c3be37ee7f64 p1: 9408cdd6d4f7 p2: 000000000000 linkrev: 2 | ||||
| 2 revision(s), 3 file(s) imported. | changelist 3: writing changelog: third | ||||
| updating the branch cache | |||||
| 3 revision(s), 4 file(s) imported. | |||||
| Verify | Verify | ||||
| $ hg verify | $ hg verify | ||||
| checking changesets | checking changesets | ||||
| checking manifests | checking manifests | ||||
| crosschecking files in changesets and manifests | crosschecking files in changesets and manifests | ||||
| checking files | checking files | ||||
| 3 files, 2 changesets, 6 total revisions | 4 files, 3 changesets, 7 total revisions | ||||
| $ hg update 0 | $ hg update 0 | ||||
| 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| # Ensure that the file is a symlink (-L) and is valid (-f) this ensures | # Ensure that the file is a symlink (-L) and is valid (-f) this ensures | ||||
| # we correctly handle symlinks. | # we correctly handle symlinks. | ||||
| $ test -L Main/b/c | $ test -L Main/b/c | ||||
| $ test -f Main/b/c | $ test -f Main/b/c | ||||
| $ hg --debug manifest -r 0 | $ hg --debug manifest -r 0 | ||||
| b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 Main/a | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 Main/a | ||||
| 1f6b5bb93f1da278ef1fead1e4740a03d8802e9f 644 @ Main/b/c | 1f6b5bb93f1da278ef1fead1e4740a03d8802e9f 644 @ Main/b/c | ||||
| a9092a3d84a37b9993b5c73576f6de29b7ea50f6 755 * Main/d | a9092a3d84a37b9993b5c73576f6de29b7ea50f6 755 * Main/d | ||||
| $ hg --debug manifest -r 1 | $ hg --debug manifest -r 1 | ||||
| a80d06849b333b8a3d5c445f8ba3142010dcdc9e 644 Main/a | a80d06849b333b8a3d5c445f8ba3142010dcdc9e 644 Main/a | ||||
| c29ae1cbd245c01122ab671684e87b26183de12b 644 Main/b/c | c29ae1cbd245c01122ab671684e87b26183de12b 644 Main/b/c | ||||
| f83f0637e55e3c48e9922f14a016761626d79d3d 755 * Main/d | f83f0637e55e3c48e9922f14a016761626d79d3d 755 * Main/d | ||||
| $ hg update tip | |||||
| 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||||
| $ test -x Main/full-exec | |||||
| End Test | End Test | ||||
| stopping the p4 server | stopping the p4 server | ||||