annotate mercurial/logexchange.py @ 40479:197f092b2cd9 stable 4.8.2

server: always close http socket if responding with an error (issue6033) It's possible for hgweb to respond _very_ early with an error if we're catching certain types of errors. When we do, we need to tell the client the socket is toast when there's a POST involved because otherwise there can be lingering POST data on the socket that will confuse any future requests on the socket. This manifested as a flaky failure on Linux in an lfs extension test and a reliable failure on FreeBSD. With this patch applied, test-lfs-serve-access.t now passes for me on FreeBSD. Differential Revision: https://phab.mercurial-scm.org/D5498
author Augie Fackler <raf@durin42.com>
date Sun, 06 Jan 2019 14:58:54 -0500
parents 94c0421d67a0
children 876494fd967d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
35356
a29fe459fc49 remotenames: rename related file and storage dir to logexchange
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35249
diff changeset
1 # logexchange.py
35245
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
2 #
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
3 # Copyright 2017 Augie Fackler <raf@durin42.com>
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
4 # Copyright 2017 Sean Farley <sean@farley.io>
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
5 #
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
6 # This software may be used and distributed according to the terms of the
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
7 # GNU General Public License version 2 or any later version.
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
8
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
9 from __future__ import absolute_import
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
10
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
11 from .node import hex
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
12
35246
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
13 from . import (
36097
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
14 util,
35246
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
15 vfs as vfsmod,
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
16 )
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
17
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
18 # directory name in .hg/ in which remotenames files will be present
35356
a29fe459fc49 remotenames: rename related file and storage dir to logexchange
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35249
diff changeset
19 remotenamedir = 'logexchange'
35246
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
20
35248
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
21 def readremotenamefile(repo, filename):
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
22 """
35356
a29fe459fc49 remotenames: rename related file and storage dir to logexchange
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35249
diff changeset
23 reads a file from .hg/logexchange/ directory and yields it's content
35248
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
24 filename: the file to be read
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
25 yield a tuple (node, remotepath, name)
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
26 """
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
27
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
28 vfs = vfsmod.vfs(repo.vfs.join(remotenamedir))
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
29 if not vfs.exists(filename):
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
30 return
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
31 f = vfs(filename)
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
32 lineno = 0
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
33 for line in f:
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
34 line = line.strip()
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
35 if not line:
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
36 continue
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
37 # contains the version number
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
38 if lineno == 0:
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
39 lineno += 1
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
40 try:
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
41 node, remote, rname = line.split('\0')
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
42 yield node, remote, rname
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
43 except ValueError:
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
44 pass
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
45
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
46 f.close()
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
47
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
48 def readremotenames(repo):
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
49 """
35356
a29fe459fc49 remotenames: rename related file and storage dir to logexchange
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35249
diff changeset
50 read the details about the remotenames stored in .hg/logexchange/ and
35248
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
51 yields a tuple (node, remotepath, name). It does not yields information
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
52 about whether an entry yielded is branch or bookmark. To get that
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
53 information, call the respective functions.
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
54 """
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
55
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
56 for bmentry in readremotenamefile(repo, 'bookmarks'):
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
57 yield bmentry
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
58 for branchentry in readremotenamefile(repo, 'branches'):
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
59 yield branchentry
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35246
diff changeset
60
35246
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
61 def writeremotenamefile(repo, remotepath, names, nametype):
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
62 vfs = vfsmod.vfs(repo.vfs.join(remotenamedir))
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
63 f = vfs(nametype, 'w', atomictemp=True)
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
64 # write the storage version info on top of file
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
65 # version '0' represents the very initial version of the storage format
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
66 f.write('0\n\n')
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
67
35249
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35248
diff changeset
68 olddata = set(readremotenamefile(repo, nametype))
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35248
diff changeset
69 # re-save the data from a different remote than this one.
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35248
diff changeset
70 for node, oldpath, rname in sorted(olddata):
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35248
diff changeset
71 if oldpath != remotepath:
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35248
diff changeset
72 f.write('%s\0%s\0%s\n' % (node, oldpath, rname))
2ea6e42ed15e remotenames: consider existing data while storing newer data
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35248
diff changeset
73
35246
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
74 for name, node in sorted(names.iteritems()):
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
75 if nametype == "branches":
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
76 for n in node:
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
77 f.write('%s\0%s\0%s\n' % (n, remotepath, name))
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
78 elif nametype == "bookmarks":
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
79 if node:
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
80 f.write('%s\0%s\0%s\n' % (node, remotepath, name))
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
81
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
82 f.close()
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
83
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
84 def saveremotenames(repo, remotepath, branches=None, bookmarks=None):
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
85 """
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
86 save remotenames i.e. remotebookmarks and remotebranches in their
35356
a29fe459fc49 remotenames: rename related file and storage dir to logexchange
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35249
diff changeset
87 respective files under ".hg/logexchange/" directory.
35246
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
88 """
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
89 wlock = repo.wlock()
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
90 try:
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
91 if bookmarks:
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
92 writeremotenamefile(repo, remotepath, bookmarks, 'bookmarks')
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
93 if branches:
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
94 writeremotenamefile(repo, remotepath, branches, 'branches')
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
95 finally:
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
96 wlock.release()
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
97
36097
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
98 def activepath(repo, remote):
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
99 """returns remote path"""
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
100 local = None
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
101 # is the remote a local peer
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
102 local = remote.local()
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
103
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
104 # determine the remote path from the repo, if possible; else just
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
105 # use the string given to us
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
106 rpath = remote
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
107 if local:
40411
94c0421d67a0 logexchange: convert paths to unix when detecting the active path
Matt Harbison <matt_harbison@yahoo.com>
parents: 38024
diff changeset
108 rpath = util.pconvert(remote._repo.root)
37365
1ccd75027abb py3: use bytes instead of str in instance()
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36097
diff changeset
109 elif not isinstance(remote, bytes):
36097
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
110 rpath = remote._url
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
111
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
112 # represent the remotepath with user defined path name if exists
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
113 for path, url in repo.ui.configitems('paths'):
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
114 # remove auth info from user defined url
38024
bbdc1bc56e58 remotenames: check the remotepath with url containing user information too
Pulkit Goyal <7895pulkit@gmail.com>
parents: 37639
diff changeset
115 noauthurl = util.removeauth(url)
40411
94c0421d67a0 logexchange: convert paths to unix when detecting the active path
Matt Harbison <matt_harbison@yahoo.com>
parents: 38024
diff changeset
116
94c0421d67a0 logexchange: convert paths to unix when detecting the active path
Matt Harbison <matt_harbison@yahoo.com>
parents: 38024
diff changeset
117 # Standardize on unix style paths, otherwise some {remotenames} end up
94c0421d67a0 logexchange: convert paths to unix when detecting the active path
Matt Harbison <matt_harbison@yahoo.com>
parents: 38024
diff changeset
118 # being an absolute path on Windows.
94c0421d67a0 logexchange: convert paths to unix when detecting the active path
Matt Harbison <matt_harbison@yahoo.com>
parents: 38024
diff changeset
119 url = util.pconvert(bytes(url))
94c0421d67a0 logexchange: convert paths to unix when detecting the active path
Matt Harbison <matt_harbison@yahoo.com>
parents: 38024
diff changeset
120 noauthurl = util.pconvert(noauthurl)
38024
bbdc1bc56e58 remotenames: check the remotepath with url containing user information too
Pulkit Goyal <7895pulkit@gmail.com>
parents: 37639
diff changeset
121 if url == rpath or noauthurl == rpath:
36097
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
122 rpath = path
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
123 break
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
124
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
125 return rpath
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
126
35245
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
127 def pullremotenames(localrepo, remoterepo):
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
128 """
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
129 pulls bookmarks and branches information of the remote repo during a
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
130 pull or clone operation.
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
131 localrepo is our local repository
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
132 remoterepo is the peer instance
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
133 """
36097
62a428bf6359 logexchange: introduce helper function to get remote path name
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35356
diff changeset
134 remotepath = activepath(localrepo, remoterepo)
37639
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
135
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
136 with remoterepo.commandexecutor() as e:
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
137 bookmarks = e.callcommand('listkeys', {
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
138 'namespace': 'bookmarks',
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
139 }).result()
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
140
35245
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
141 # on a push, we don't want to keep obsolete heads since
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
142 # they won't show up as heads on the next pull, so we
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
143 # remove them here otherwise we would require the user
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
144 # to issue a pull to refresh the storage
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
145 bmap = {}
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
146 repo = localrepo.unfiltered()
37639
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
147
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
148 with remoterepo.commandexecutor() as e:
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
149 branchmap = e.callcommand('branchmap', {}).result()
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
150
0e50dda7e9c1 logexchange: use command executor for wire protocol commands
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37365
diff changeset
151 for branch, nodes in branchmap.iteritems():
35245
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
152 bmap[branch] = []
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
153 for node in nodes:
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
154 if node in repo and not repo[node].obsolete():
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
155 bmap[branch].append(hex(node))
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
156
35246
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35245
diff changeset
157 saveremotenames(localrepo, remotepath, bmap, bookmarks)