| ryanmce | |
| simonfar |
| Restricted Project |
This happens in case of "pull --rebase" if the source is ancestor of destination
see the new test, it's making hg crash without this change
| Lint OK |
| Unit Tests OK |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext3rd/perftweaks.py (2 lines) | |||
| M | tests/test-perftweaks-remotenames.t (12 lines) |
| Commit | Local | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 33fbadf5f43b | 3773 | 618ee1a1547a | Mateusz Kwapich | perftweaks: don't crash if the rebase dest is None (Show More…) | Aug 17 2017, 3:12 PM |
| repo.ui.log('update_size', '', update_distance=distance) | repo.ui.log('update_size', '', update_distance=distance) | ||||
| stats = orig(repo, node, branchmerge, *args, **kwargs) | stats = orig(repo, node, branchmerge, *args, **kwargs) | ||||
| repo.ui.log('update_size', '', update_filecount=sum(stats)) | repo.ui.log('update_size', '', update_filecount=sum(stats)) | ||||
| return stats | return stats | ||||
| def _trackrebasesize(orig, self, dest, rebaseset): | def _trackrebasesize(orig, self, dest, rebaseset): | ||||
| result = orig(self, dest, rebaseset) | result = orig(self, dest, rebaseset) | ||||
| if dest is None: | |||||
| return result | |||||
| # The code assumes the rebase source is roughly a linear stack within a | # The code assumes the rebase source is roughly a linear stack within a | ||||
| # single feature branch, and there is only one destination. If that is not | # single feature branch, and there is only one destination. If that is not | ||||
| # the case, the distance might be not accurate. | # the case, the distance might be not accurate. | ||||
| repo = self.repo | repo = self.repo | ||||
| destrev = dest.rev() | destrev = dest.rev() | ||||
| commitcount = len(rebaseset) | commitcount = len(rebaseset) | ||||
| distance = len(repo.revs('(%ld %% %d) + (%d %% %ld)', | distance = len(repo.revs('(%ld %% %d) + (%d %% %ld)', | ||||
| rebaseset, destrev, destrev, rebaseset)) | rebaseset, destrev, destrev, rebaseset)) | ||||
| # 'distance' includes the commits being rebased, so subtract them to get the | # 'distance' includes the commits being rebased, so subtract them to get the | ||||
| # actual distance being traveled. Even though we log update_distance above, | # actual distance being traveled. Even though we log update_distance above, | ||||
| # a rebase may run multiple updates, so that value might be not be accurate. | # a rebase may run multiple updates, so that value might be not be accurate. | ||||
| repo.ui.log('rebase_size', '', rebase_commitcount=commitcount, | repo.ui.log('rebase_size', '', rebase_commitcount=commitcount, | ||||
| rebase_distance=distance - commitcount) | rebase_distance=distance - commitcount) | ||||
| return result | return result | ||||
| $ . $TESTDIR/require-ext.sh remotenames | $ . $TESTDIR/require-ext.sh remotenames | ||||
| $ cat >> $HGRCPATH << EOF | $ cat >> $HGRCPATH << EOF | ||||
| > [ui] | > [ui] | ||||
| > ssh=python "$TESTDIR/dummyssh" | > ssh=python "$TESTDIR/dummyssh" | ||||
| > [extensions] | > [extensions] | ||||
| > perftweaks=$TESTDIR/../hgext3rd/perftweaks.py | > perftweaks=$TESTDIR/../hgext3rd/perftweaks.py | ||||
| > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py | |||||
| > remotenames= | > remotenames= | ||||
| > rebase= | |||||
| > EOF | > EOF | ||||
| $ hg init master | $ hg init master | ||||
| $ cd master | $ cd master | ||||
| $ echo a >> a && hg ci -Aqm a | $ echo a >> a && hg ci -Aqm a | ||||
| $ hg book master | $ hg book master | ||||
| $ hg book -i | $ hg book -i | ||||
| $ echo b >> b && hg ci -Aqm b | $ echo b >> b && hg ci -Aqm b | ||||
| $ cd client | $ cd client | ||||
| $ hg pull -r 0 | $ hg pull -r 0 | ||||
| pulling from ssh://user@dummy/master | pulling from ssh://user@dummy/master | ||||
| no changes found | no changes found | ||||
| $ hg book --remote | $ hg book --remote | ||||
| default/master 0:cb9a9f314b8b | default/master 0:cb9a9f314b8b | ||||
| $ cat .hg/remotenames | $ cat .hg/remotenames | ||||
| cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b bookmarks default/master | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b bookmarks default/master | ||||
| $ hg pull --rebase -d master | |||||
| pulling from ssh://user@dummy/master | |||||
| searching for changes | |||||
| adding changesets | |||||
| adding manifests | |||||
| adding file changes | |||||
| added 1 changesets with 1 changes to 1 files | |||||
| (run 'hg update' to get a working copy) | |||||
| nothing to rebase - working directory parent is also destination | |||||