| krbullock |
| hg-reviewers |
If experimental.remotenames is set to True, we store the remotenames in case
of hg pull. This patch adds that support to clone command also.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| exchange, | exchange, | ||||
| extensions, | extensions, | ||||
| httppeer, | httppeer, | ||||
| localrepo, | localrepo, | ||||
| lock, | lock, | ||||
| merge as mergemod, | merge as mergemod, | ||||
| node, | node, | ||||
| phases, | phases, | ||||
| remotenames, | |||||
| repoview, | repoview, | ||||
| scmutil, | scmutil, | ||||
| sshpeer, | sshpeer, | ||||
| statichttprepo, | statichttprepo, | ||||
| ui as uimod, | ui as uimod, | ||||
| unionrepo, | unionrepo, | ||||
| url, | url, | ||||
| util, | util, | ||||
| u = util.url(abspath) | u = util.url(abspath) | ||||
| u.passwd = None | u.passwd = None | ||||
| defaulturl = bytes(u) | defaulturl = bytes(u) | ||||
| fp.write(util.tonativeeol(template % defaulturl)) | fp.write(util.tonativeeol(template % defaulturl)) | ||||
| fp.close() | fp.close() | ||||
| destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone') | destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone') | ||||
| if ui.configbool('experimental', 'remotenames'): | |||||
| remotenames.pullremotenames(destrepo, srcpeer) | |||||
| if update: | if update: | ||||
| if update is not True: | if update is not True: | ||||
| checkout = srcpeer.lookup(update) | checkout = srcpeer.lookup(update) | ||||
| uprev = None | uprev = None | ||||
| status = None | status = None | ||||
| if checkout is not None: | if checkout is not None: | ||||
| try: | try: | ||||
| uprev = destrepo.lookup(checkout) | uprev = destrepo.lookup(checkout) | ||||
| Testing the functionality to pull remotenames | Testing the functionality to pull remotenames | ||||
| ============================================= | ============================================= | ||||
| $ cat >> $HGRCPATH << EOF | $ cat >> $HGRCPATH << EOF | ||||
| > [alias] | > [alias] | ||||
| > glog = log -G -T '{rev}:{node|short} {desc}' | > glog = log -G -T '{rev}:{node|short} {desc}' | ||||
| > [experimental] | |||||
| > remotenames = True | |||||
| > EOF | > EOF | ||||
| Making a server repo | Making a server repo | ||||
| -------------------- | -------------------- | ||||
| $ hg init server | $ hg init server | ||||
| $ cd server | $ cd server | ||||
| $ for ch in a b c d e f g h; do | $ for ch in a b c d e f g h; do | ||||
| (branches are permanent and global, did you want a bookmark?) | (branches are permanent and global, did you want a bookmark?) | ||||
| $ echo foo >> bar | $ echo foo >> bar | ||||
| $ hg ci -Aqm "added bar" | $ hg ci -Aqm "added bar" | ||||
| Making a client repo | Making a client repo | ||||
| -------------------- | -------------------- | ||||
| $ cd .. | $ cd .. | ||||
| $ hg init client | |||||
| $ cd client | |||||
| $ cat >> .hg/hgrc << EOF | |||||
| > [experimental] | |||||
| > remotenames = True | |||||
| > EOF | |||||
| $ hg pull ../server/ | $ hg clone server client | ||||
| pulling from ../server/ | updating to branch default | ||||
| requesting all changes | 8 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| adding changesets | |||||
| adding manifests | |||||
| adding file changes | |||||
| added 9 changesets with 9 changes to 9 files (+1 heads) | |||||
| adding remote bookmark bar | |||||
| adding remote bookmark foo | |||||
| new changesets 18d04c59bb5d:3e1487808078 | |||||
| (run 'hg heads' to see heads) | |||||
| $ cd client | |||||
| $ cat .hg/remotenames/bookmarks | $ cat .hg/remotenames/bookmarks | ||||
| 0 | 0 | ||||
| 87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc) | 87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc) | ||||
| 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc) | 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc) | ||||
| $ cat .hg/remotenames/branches | $ cat .hg/remotenames/branches | ||||
| 0 | 0 | ||||