| ryanmce |
| Restricted Project |
There was a report from an infinitepush user who complained about
hg update remote/scratch/book failing to pull the bookmark, while
hg update scratch/book pulling fine. It confuses users because they see
remote/scratch/book in smartlog.
On the other hand let's not allow hg pull -B remote/scratch/book to stay
consistent with remotenames.
Slowly run tests
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| def _getloglevel(ui): | def _getloglevel(ui): | ||||
| loglevel = ui.config('infinitepush', 'loglevel', 'DEBUG') | loglevel = ui.config('infinitepush', 'loglevel', 'DEBUG') | ||||
| numeric_loglevel = getattr(logging, loglevel.upper(), None) | numeric_loglevel = getattr(logging, loglevel.upper(), None) | ||||
| if not isinstance(numeric_loglevel, int): | if not isinstance(numeric_loglevel, int): | ||||
| raise error.Abort(_('invalid log level %s') % loglevel) | raise error.Abort(_('invalid log level %s') % loglevel) | ||||
| return numeric_loglevel | return numeric_loglevel | ||||
| def _tryhoist(ui, remotebookmark): | |||||
| '''returns a bookmarks with hoisted part removed | |||||
| Remotenames extension has a 'hoist' config that allows to use remote | |||||
| bookmarks without specifying remote path. For example, 'hg update master' | |||||
| works as well as 'hg update remote/master'. We want to allow the same in | |||||
| infinitepush. | |||||
| ''' | |||||
| if common.isremotebooksenabled(ui): | |||||
| hoist = ui.config('remotenames', 'hoist', 'default') + '/' | |||||
| if remotebookmark.startswith(hoist): | |||||
| return remotebookmark[len(hoist):] | |||||
| return remotebookmark | |||||
| class bundlestore(object): | class bundlestore(object): | ||||
| def __init__(self, repo): | def __init__(self, repo): | ||||
| self._repo = repo | self._repo = repo | ||||
| storetype = self._repo.ui.config('infinitepush', 'storetype', '') | storetype = self._repo.ui.config('infinitepush', 'storetype', '') | ||||
| if storetype == 'disk': | if storetype == 'disk': | ||||
| from . import store | from . import store | ||||
| self.store = store.filebundlestore(self._repo.ui, self._repo) | self.store = store.filebundlestore(self._repo.ui, self._repo) | ||||
| elif storetype == 'external': | elif storetype == 'external': | ||||
| return result | return result | ||||
| def _update(orig, ui, repo, node=None, rev=None, **opts): | def _update(orig, ui, repo, node=None, rev=None, **opts): | ||||
| if rev and node: | if rev and node: | ||||
| raise error.Abort(_("please specify just one revision")) | raise error.Abort(_("please specify just one revision")) | ||||
| if not opts.get('date') and (rev or node) not in repo: | if not opts.get('date') and (rev or node) not in repo: | ||||
| mayberemote = rev or node | mayberemote = rev or node | ||||
| mayberemote = _tryhoist(ui, mayberemote) | |||||
| dopull = False | dopull = False | ||||
| kwargs = {} | kwargs = {} | ||||
| if _scratchbranchmatcher(mayberemote): | if _scratchbranchmatcher(mayberemote): | ||||
| dopull = True | dopull = True | ||||
| kwargs['bookmark'] = [mayberemote] | kwargs['bookmark'] = [mayberemote] | ||||
| elif len(mayberemote) == 40 and _maybehash(mayberemote): | elif len(mayberemote) == 40 and _maybehash(mayberemote): | ||||
| dopull = True | dopull = True | ||||
| kwargs['rev'] = [mayberemote] | kwargs['rev'] = [mayberemote] | ||||
| if dopull: | if dopull: | ||||
| ui.warn( | ui.warn( | ||||
| _("'%s' does not exist locally - looking for it " + | _("'%s' does not exist locally - looking for it " + | ||||
| "remotely...\n") % mayberemote) | "remotely...\n") % mayberemote) | ||||
| # Try pulling node from remote repo | # Try pulling node from remote repo | ||||
| try: | try: | ||||
| cmdname = '^pull' | cmdname = '^pull' | ||||
| pullcmd = commands.table[cmdname][0] | pullcmd = commands.table[cmdname][0] | ||||
| pullopts = dict(opt[1:3] for opt in commands.table[cmdname][1]) | pullopts = dict(opt[1:3] for opt in commands.table[cmdname][1]) | ||||
| pullopts.update(kwargs) | pullopts.update(kwargs) | ||||
| pullcmd(ui, repo, **pullopts) | pullcmd(ui, repo, **pullopts) | ||||
| except Exception: | except Exception: | ||||
| Try to push with remotebookmarks disabled | Try to push with remotebookmarks disabled | ||||
| $ hg push --config remotenames.bookmarks=False -r . --to scratch/secondbranch | $ hg push --config remotenames.bookmarks=False -r . --to scratch/secondbranch | ||||
| pushing to ssh://user@dummy/repo | pushing to ssh://user@dummy/repo | ||||
| searching for changes | searching for changes | ||||
| remote: pushing 1 commit: | remote: pushing 1 commit: | ||||
| remote: 36667a3f76e4 newscratch | remote: 36667a3f76e4 newscratch | ||||
| $ hg book | $ hg book | ||||
| scratch/secondbranch 2:36667a3f76e4 | scratch/secondbranch 2:36667a3f76e4 | ||||
| Create new bookmark and try to pull it | |||||
| $ mkcommit newcommittoupdate1 | |||||
| $ hg push -q -r . --to scratch/branchtoupdateto1 --create | |||||
| $ hg up -q ".^" | |||||
| $ mkcommit newcommittoupdate2 | |||||
| created new head | |||||
| $ hg push -q -r . --to scratch/branchtoupdateto2 --create | |||||
| $ hg up -q ".^" | |||||
| $ mkcommit newcommittopull | |||||
| created new head | |||||
| $ hg push -q -r . --to scratch/branchtopull --create | |||||
| $ cd ../client | |||||
| $ hg up default/scratch/branchtoupdateto1 | |||||
| 'scratch/branchtoupdateto1' does not exist locally - looking for it remotely... | |||||
| pulling from ssh://user@dummy/repo | |||||
| searching for changes | |||||
| adding changesets | |||||
| adding manifests | |||||
| adding file changes | |||||
| added 2 changesets with 2 changes to 2 files (+1 heads) | |||||
| (run 'hg heads .' to see heads, 'hg merge' to merge) | |||||
| 'scratch/branchtoupdateto1' found remotely | |||||
| 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||||
| $ cat >> $HGRCPATH << EOF | |||||
| > [remotenames] | |||||
| > hoist=remote | |||||
| > rename.default=remote | |||||
| > EOF | |||||
| $ hg up remote/scratch/branchtoupdateto2 | |||||
| 'scratch/branchtoupdateto2' does not exist locally - looking for it remotely... | |||||
| pulling from ssh://user@dummy/repo | |||||
| searching for changes | |||||
| adding changesets | |||||
| adding manifests | |||||
| adding file changes | |||||
| added 1 changesets with 1 changes to 2 files (+1 heads) | |||||
| (run 'hg heads .' to see heads, 'hg merge' to merge) | |||||
| 'scratch/branchtoupdateto2' found remotely | |||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||||