Mercurial Mercurial > hg-stable / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/exchange.py
changeset 39645 a86d21e70b2b
parent 39569 130e5df346d5
child 39646 9c2c77c73f23
equal deleted inserted replaced
39644:a5de21c9e370 39645:a86d21e70b2b 
    24     bookmarks as bookmod,
 
    24     bookmarks as bookmod,
 
    25     bundle2,
 
    25     bundle2,
 
    26     changegroup,
 
    26     changegroup,
 
    27     discovery,
 
    27     discovery,
 
    28     error,
 
    28     error,
 
       
    29     exchangev2,
 
    29     lock as lockmod,
 
    30     lock as lockmod,
 
    30     logexchange,
 
    31     logexchange,
 
    31     narrowspec,
 
    32     narrowspec,
 
    32     obsolete,
 
    33     obsolete,
 
    33     phases,
 
    34     phases,
 
  1504                     " %s") % (', '.join(sorted(missing)))
 
  1505                     " %s") % (', '.join(sorted(missing)))
 
  1505             raise error.Abort(msg)
 
  1506             raise error.Abort(msg)
 
  1506 
  1507 
  1507     pullop.trmanager = transactionmanager(repo, 'pull', remote.url())
 
  1508     pullop.trmanager = transactionmanager(repo, 'pull', remote.url())
 
  1508     with repo.wlock(), repo.lock(), pullop.trmanager:
 
  1509     with repo.wlock(), repo.lock(), pullop.trmanager:
 
  1509         # This should ideally be in _pullbundle2(). However, it needs to run
 
  1510         # Use the modern wire protocol, if available.
 
  1510         # before discovery to avoid extra work.
 
  1511         if remote.capable('exchangev2'):
 
  1511         _maybeapplyclonebundle(pullop)
 
  1512             exchangev2.pull(pullop)
 
  1512         streamclone.maybeperformlegacystreamclone(pullop)
 
  1513         else:
 
  1513         _pulldiscovery(pullop)
 
  1514             # This should ideally be in _pullbundle2(). However, it needs to run
 
  1514         if pullop.canusebundle2:
 
  1515             # before discovery to avoid extra work.
 
  1515             _fullpullbundle2(repo, pullop)
 
  1516             _maybeapplyclonebundle(pullop)
 
  1516         _pullchangeset(pullop)
 
  1517             streamclone.maybeperformlegacystreamclone(pullop)
 
  1517         _pullphase(pullop)
 
  1518             _pulldiscovery(pullop)
 
  1518         _pullbookmarks(pullop)
 
  1519             if pullop.canusebundle2:
 
  1519         _pullobsolete(pullop)
 
  1520                 _fullpullbundle2(repo, pullop)
 
       
  1521             _pullchangeset(pullop)
 
       
  1522             _pullphase(pullop)
 
       
  1523             _pullbookmarks(pullop)
 
       
  1524             _pullobsolete(pullop)
 
  1520 
  1525 
  1521     # storing remotenames
 
  1526     # storing remotenames
 
  1522     if repo.ui.configbool('experimental', 'remotenames'):
 
  1527     if repo.ui.configbool('experimental', 'remotenames'):
 
  1523         logexchange.pullremotenames(repo, remote)
 
  1528         logexchange.pullremotenames(repo, remote)
 
  1524 
  1529
hg-stable