Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 23116:2dc6b7917cdf stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clone: fix copying bookmarks in uncompressed clones (issue4430) ef62c66bee1b broke bookmarks getting copied during uncompressed clones. Since most of the pull logic has been moved into exchange.py, lets just call exchange.pull to fix up the repo with the latest bits after the streaming clone has bootstrapped the repo. This keeps us from having to duplicate the bookmark logic.
author Durham Goode <durham@fb.com>
date Fri, 31 Oct 2014 12:56:25 -0700
parents 90f86ad3d4ff
children 8b4a8a9176e2
comparison
equal deleted inserted replaced
23115:c23c03605c59 23116:2dc6b7917cdf
1722 stream = remote.capable('stream-preferred') 1722 stream = remote.capable('stream-preferred')
1723 1723
1724 if stream and not heads: 1724 if stream and not heads:
1725 # 'stream' means remote revlog format is revlogv1 only 1725 # 'stream' means remote revlog format is revlogv1 only
1726 if remote.capable('stream'): 1726 if remote.capable('stream'):
1727 return self.stream_in(remote, set(('revlogv1',))) 1727 self.stream_in(remote, set(('revlogv1',)))
1728 # otherwise, 'streamreqs' contains the remote revlog format 1728 else:
1729 streamreqs = remote.capable('streamreqs') 1729 # otherwise, 'streamreqs' contains the remote revlog format
1730 if streamreqs: 1730 streamreqs = remote.capable('streamreqs')
1731 streamreqs = set(streamreqs.split(',')) 1731 if streamreqs:
1732 # if we support it, stream in and adjust our requirements 1732 streamreqs = set(streamreqs.split(','))
1733 if not streamreqs - self.supportedformats: 1733 # if we support it, stream in and adjust our requirements
1734 return self.stream_in(remote, streamreqs) 1734 if not streamreqs - self.supportedformats:
1735 self.stream_in(remote, streamreqs)
1735 1736
1736 quiet = self.ui.backupconfig('ui', 'quietbookmarkmove') 1737 quiet = self.ui.backupconfig('ui', 'quietbookmarkmove')
1737 try: 1738 try:
1738 self.ui.setconfig('ui', 'quietbookmarkmove', True, 'clone') 1739 self.ui.setconfig('ui', 'quietbookmarkmove', True, 'clone')
1739 ret = exchange.pull(self, remote, heads).cgresult 1740 ret = exchange.pull(self, remote, heads).cgresult