| pulkit |
| hg-reviewers |
"%s" % None does not work on py3. I've extracted a little function
for producing a formatted message given the filter name.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/branchmap.py (23 lines) | |||
| M | tests/test-blackbox.t (12 lines) | |||
| M | tests/test-branch-change.t (2 lines) | |||
| M | tests/test-rebase-conflicts.t (4 lines) | |||
| M | tests/test-strip.t (2 lines) |
| def clear(self): | def clear(self): | ||||
| self._per_filter.clear() | self._per_filter.clear() | ||||
| def _unknownnode(node): | def _unknownnode(node): | ||||
| """ raises ValueError when branchcache found a node which does not exists | """ raises ValueError when branchcache found a node which does not exists | ||||
| """ | """ | ||||
| raise ValueError(r'node %s does not exist' % pycompat.sysstr(hex(node))) | raise ValueError(r'node %s does not exist' % pycompat.sysstr(hex(node))) | ||||
| def _branchcachedesc(repo): | |||||
| if repo.filtername is not None: | |||||
| return 'branch cache (%s)' % repo.filtername | |||||
| else: | |||||
| return 'branch cache' | |||||
| class branchcache(object): | class branchcache(object): | ||||
| """A dict like object that hold branches heads cache. | """A dict like object that hold branches heads cache. | ||||
| This cache is used to avoid costly computations to determine all the | This cache is used to avoid costly computations to determine all the | ||||
| branch heads of a repo. | branch heads of a repo. | ||||
| The cache is serialized on disk in the following format: | The cache is serialized on disk in the following format: | ||||
| # invalidate the cache | # invalidate the cache | ||||
| raise ValueError(r'tip differs') | raise ValueError(r'tip differs') | ||||
| bcache.load(repo, lineiter) | bcache.load(repo, lineiter) | ||||
| except (IOError, OSError): | except (IOError, OSError): | ||||
| return None | return None | ||||
| except Exception as inst: | except Exception as inst: | ||||
| if repo.ui.debugflag: | if repo.ui.debugflag: | ||||
| msg = 'invalid branchheads cache' | msg = 'invalid %s: %s\n' | ||||
| if repo.filtername is not None: | repo.ui.debug(msg % (_branchcachedesc(repo), | ||||
| msg += ' (%s)' % repo.filtername | pycompat.bytestr(inst))) | ||||
| msg += ': %s\n' | |||||
| repo.ui.debug(msg % pycompat.bytestr(inst)) | |||||
| bcache = None | bcache = None | ||||
| finally: | finally: | ||||
| if f: | if f: | ||||
| f.close() | f.close() | ||||
| return bcache | return bcache | ||||
| for node in nodes: | for node in nodes: | ||||
| nodecount += 1 | nodecount += 1 | ||||
| if node in self._closednodes: | if node in self._closednodes: | ||||
| state = 'c' | state = 'c' | ||||
| else: | else: | ||||
| state = 'o' | state = 'o' | ||||
| f.write("%s %s %s\n" % (hex(node), state, label)) | f.write("%s %s %s\n" % (hex(node), state, label)) | ||||
| f.close() | f.close() | ||||
| repo.ui.log('branchcache', | repo.ui.log('branchcache', 'wrote %s with %d labels and %d nodes\n', | ||||
| 'wrote %s branch cache with %d labels and %d nodes\n', | _branchcachedesc(repo), len(self._entries), nodecount) | ||||
| repo.filtername, len(self._entries), nodecount) | |||||
| except (IOError, OSError, error.Abort) as inst: | except (IOError, OSError, error.Abort) as inst: | ||||
| # Abort may be raised by read only opener, so log and continue | # Abort may be raised by read only opener, so log and continue | ||||
| repo.ui.debug("couldn't write branch cache: %s\n" % | repo.ui.debug("couldn't write branch cache: %s\n" % | ||||
| stringutil.forcebytestr(inst)) | stringutil.forcebytestr(inst)) | ||||
| def update(self, repo, revgen): | def update(self, repo, revgen): | ||||
| """Given a branchhead cache, self, that may have extra nodes or be | """Given a branchhead cache, self, that may have extra nodes or be | ||||
| missing heads, and a generator of nodes that are strictly a superset of | missing heads, and a generator of nodes that are strictly a superset of | ||||
| for heads in self.iterheads(): | for heads in self.iterheads(): | ||||
| tiprev = max(cl.rev(node) for node in heads) | tiprev = max(cl.rev(node) for node in heads) | ||||
| if tiprev > self.tiprev: | if tiprev > self.tiprev: | ||||
| self.tipnode = cl.node(tiprev) | self.tipnode = cl.node(tiprev) | ||||
| self.tiprev = tiprev | self.tiprev = tiprev | ||||
| self.filteredhash = scmutil.filteredhash(repo, self.tiprev) | self.filteredhash = scmutil.filteredhash(repo, self.tiprev) | ||||
| duration = util.timer() - starttime | duration = util.timer() - starttime | ||||
| repo.ui.log('branchcache', 'updated %s branch cache in %.4f seconds\n', | repo.ui.log('branchcache', 'updated %s in %.4f seconds\n', | ||||
| repo.filtername or b'None', duration) | _branchcachedesc(repo), duration) | ||||
| self.write(repo) | self.write(repo) | ||||
| class remotebranchcache(branchcache): | class remotebranchcache(branchcache): | ||||
| """Branchmap info for a remote connection, should not write locally""" | """Branchmap info for a remote connection, should not write locally""" | ||||
| def write(self, repo): | def write(self, repo): | ||||
| pass | pass | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 1 changesets with 1 changes to 1 files | added 1 changesets with 1 changes to 1 files | ||||
| new changesets d02f48003e62 | new changesets d02f48003e62 | ||||
| (run 'hg update' to get a working copy) | (run 'hg update' to get a working copy) | ||||
| $ hg blackbox -l 6 | $ hg blackbox -l 6 | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated served branch cache in * seconds (glob) | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated branch cache (served) in * seconds (glob) | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote served branch cache with 1 labels and 2 nodes | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote branch cache (served) with 1 labels and 2 nodes | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> 1 incoming changes - new heads: d02f48003e62 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> 1 incoming changes - new heads: d02f48003e62 | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull exited 0 after * seconds (glob) | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> pull exited 0 after * seconds (glob) | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 | ||||
| we must not cause a failure if we cannot write to the log | we must not cause a failure if we cannot write to the log | ||||
| $ hg rollback | $ hg rollback | ||||
| repository tip rolled back to revision 1 (undo pull) | repository tip rolled back to revision 1 (undo pull) | ||||
| adding d | adding d | ||||
| created new head | created new head | ||||
| $ hg strip tip | $ hg strip tip | ||||
| 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob) | saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/*-backup.hg (glob) | ||||
| $ hg blackbox -l 6 | $ hg blackbox -l 6 | ||||
| 1970/01/01 00:00:00 bob @73f6ee326b27d820b0472f1a825e3a50f3dc489b (5000)> strip tip | 1970/01/01 00:00:00 bob @73f6ee326b27d820b0472f1a825e3a50f3dc489b (5000)> strip tip | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> saved backup bundle to $TESTTMP/blackboxtest2/.hg/strip-backup/73f6ee326b27-7612e004-backup.hg | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated base branch cache in * seconds (glob) | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> updated branch cache (base) in * seconds (glob) | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote base branch cache with 1 labels and 2 nodes | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> wrote branch cache (base) with 1 labels and 2 nodes | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> strip tip exited 0 after * seconds (glob) | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> strip tip exited 0 after * seconds (glob) | ||||
| 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 | 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> blackbox -l 6 | ||||
| extension and python hooks - use the eol extension for a pythonhook | extension and python hooks - use the eol extension for a pythonhook | ||||
| $ echo '[extensions]' >> .hg/hgrc | $ echo '[extensions]' >> .hg/hgrc | ||||
| $ echo 'eol=' >> .hg/hgrc | $ echo 'eol=' >> .hg/hgrc | ||||
| $ echo '[hooks]' >> .hg/hgrc | $ echo '[hooks]' >> .hg/hgrc | ||||
| extra: branch=default | extra: branch=default | ||||
| description: | description: | ||||
| commit2 | commit2 | ||||
| result: 0 | result: 0 | ||||
| $ hg blackbox | $ hg blackbox | ||||
| 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> updating the branch cache | 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> updating the branch cache | ||||
| 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> updated served branch cache in * seconds (glob) | 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> updated branch cache (served) in * seconds (glob) | ||||
| 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> wrote served branch cache with 1 labels and 1 nodes | 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> wrote branch cache (served) with 1 labels and 1 nodes | ||||
| 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug commit -m commit2 -d 2000-01-02 foo exited 0 after *.?? seconds (glob) | 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug commit -m commit2 -d 2000-01-02 foo exited 0 after *.?? seconds (glob) | ||||
| 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 | 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 | ||||
| 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> writing .hg/cache/tags2-visible with 0 tags | 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> writing .hg/cache/tags2-visible with 0 tags | ||||
| 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 exited 0 after *.?? seconds (glob) | 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r 0 exited 0 after *.?? seconds (glob) | ||||
| 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip | 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip | ||||
| 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip exited 0 after *.?? seconds (glob) | 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> --debug log -r tip exited 0 after *.?? seconds (glob) | ||||
| 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> blackbox | 1970/01/01 00:00:00 bob @45589e459b2edfbf3dbde7e01f611d2c1e7453d7 (5000)> blackbox | ||||
| new node id is de1404b45a69f8cc6437d7679033ee33e9efb4ba | new node id is de1404b45a69f8cc6437d7679033ee33e9efb4ba | ||||
| moving bookmarks ['b1'] from 7c19914648869f5b02fc7fed31ddee9783fdd680 to de1404b45a69f8cc6437d7679033ee33e9efb4ba | moving bookmarks ['b1'] from 7c19914648869f5b02fc7fed31ddee9783fdd680 to de1404b45a69f8cc6437d7679033ee33e9efb4ba | ||||
| resolving manifests | resolving manifests | ||||
| branchmerge: False, force: False, partial: False | branchmerge: False, force: False, partial: False | ||||
| ancestor: 7c1991464886, local: 7c1991464886+, remote: de1404b45a69 | ancestor: 7c1991464886, local: 7c1991464886+, remote: de1404b45a69 | ||||
| starting 4 threads for background file closing (?) | starting 4 threads for background file closing (?) | ||||
| changed branch on 2 changesets | changed branch on 2 changesets | ||||
| updating the branch cache | updating the branch cache | ||||
| invalid branchheads cache (served): tip differs | invalid branch cache (served): tip differs | ||||
| $ hg glog -r '(.^)::' | $ hg glog -r '(.^)::' | ||||
| @ 9:de1404b45a69 Added e | @ 9:de1404b45a69 Added e | ||||
| | wat (b1) | | wat (b1) | ||||
| * 8:343660ccab74 Added d | * 8:343660ccab74 Added d | ||||
| | wat () | | wat () | ||||
| ~ | ~ | ||||
| bundle2-input-part: total payload size 1686 | bundle2-input-part: total payload size 1686 | ||||
| bundle2-input-part: "cache:rev-branch-cache" (advisory) supported | bundle2-input-part: "cache:rev-branch-cache" (advisory) supported | ||||
| bundle2-input-part: total payload size 74 | bundle2-input-part: total payload size 74 | ||||
| truncating cache/rbc-revs-v1 to 56 | truncating cache/rbc-revs-v1 to 56 | ||||
| bundle2-input-part: "phase-heads" supported | bundle2-input-part: "phase-heads" supported | ||||
| bundle2-input-part: total payload size 24 | bundle2-input-part: total payload size 24 | ||||
| bundle2-input-bundle: 2 parts total | bundle2-input-bundle: 2 parts total | ||||
| updating the branch cache | updating the branch cache | ||||
| invalid branchheads cache (served): tip differs | invalid branch cache (served): tip differs | ||||
| invalid branchheads cache (served.hidden): tip differs | invalid branch cache (served.hidden): tip differs | ||||
| rebase completed | rebase completed | ||||
| Test minimization of merge conflicts | Test minimization of merge conflicts | ||||
| $ hg up -q null | $ hg up -q null | ||||
| $ echo a > a | $ echo a > a | ||||
| $ hg add a | $ hg add a | ||||
| $ hg commit -q -m 'a' | $ hg commit -q -m 'a' | ||||
| $ echo b >> a | $ echo b >> a | ||||
| 6625a516847449b6f0fa3737b9ba56e9f0f3032c | 6625a516847449b6f0fa3737b9ba56e9f0f3032c | ||||
| d8db9d1372214336d2b5570f20ee468d2c72fa8b | d8db9d1372214336d2b5570f20ee468d2c72fa8b | ||||
| bundle2-output-bundle: "HG20", (1 params) 3 parts total | bundle2-output-bundle: "HG20", (1 params) 3 parts total | ||||
| bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload | bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload | ||||
| bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload | bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload | ||||
| bundle2-output-part: "phase-heads" 24 bytes payload | bundle2-output-part: "phase-heads" 24 bytes payload | ||||
| saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg | saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg | ||||
| updating the branch cache | updating the branch cache | ||||
| invalid branchheads cache (served): tip differs | invalid branch cache (served): tip differs | ||||
| $ hg log -G | $ hg log -G | ||||
| o changeset: 2:5c51d8d6557d | o changeset: 2:5c51d8d6557d | ||||
| | tag: tip | | tag: tip | ||||
| | user: test | | user: test | ||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | summary: commitC | | summary: commitC | ||||
| | | | | ||||
| @ changeset: 1:eca11cf91c71 | @ changeset: 1:eca11cf91c71 | ||||