mercurial-scm/hg-stable: mercurial/logexchange.py annotate

annotate mercurial/logexchange.py @ 52669:e627cc25b6f3

pyupgrade: rewrite `yield` statements in a loop to `yield from` This is the `legacy` fixer in `pyupgrade`, with the `yield` statement yielding loop commented back in. This seems to help pytype in some cases, and hurt it in others. But that can be manually fixed later. Note that it's possibly buggy in that it aggressively changed `import-checker.py` to `yield from 'fcntl', 'grp', 'pwd', 'select', 'termios': # Unix only`, which is invalid syntax. Possibly it needed help from the token fixer that I've disabled locally (because that wants to make a bunch of unrelated changes). Just change those few places to yield from a list, to avoid having to constantly revert that.

author	Matt Harbison <matt_harbison@yahoo.com>
date	Sun, 05 Jan 2025 22:26:16 -0500
parents	f4733654f144
children

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
51901 f4733654f144 typing: add `from __future__ import annotations` to most files Matt Harbison <matt_harbison@yahoo.com> parents: 49872 diff changeset	9 from __future__ import annotations
35245 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 )
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45957 diff changeset	17 from .utils import (
ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45957 diff changeset	18 urlutil,
ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45957 diff changeset	19 )
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	20
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	21 # directory name in .hg/ in which remotenames files will be present
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	22 remotenamedir = b'logexchange'
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	23
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41387 diff changeset	24
35248 744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	25 def readremotenamefile(repo, filename):
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	26 """
35356 a29fe459fc49 remotenames: rename related file and storage dir to logexchange Pulkit Goyal <7895pulkit@gmail.com> parents: 35249 diff changeset	27 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	28 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	29 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	30 """
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	31
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	32 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	33 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	34 return
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	35 f = vfs(filename)
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	36 lineno = 0
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	37 for line in f:
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	38 line = line.strip()
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	39 if not line:
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	40 continue
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	41 # contains the version number
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	42 if lineno == 0:
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	43 lineno += 1
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	44 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	45 node, remote, rname = line.split(b'\0')
35248 744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	46 yield node, remote, rname
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	47 except ValueError:
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	48 pass
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	49
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	50 f.close()
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	51
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41387 diff changeset	52
35248 744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	53 def readremotenames(repo):
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	54 """
35356 a29fe459fc49 remotenames: rename related file and storage dir to logexchange Pulkit Goyal <7895pulkit@gmail.com> parents: 35249 diff changeset	55 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	56 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	57 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	58 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	59 """
744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	60
52669 e627cc25b6f3 pyupgrade: rewrite `yield` statements in a loop to `yield from` Matt Harbison <matt_harbison@yahoo.com> parents: 51901 diff changeset	61 yield from readremotenamefile(repo, b'bookmarks')
e627cc25b6f3 pyupgrade: rewrite `yield` statements in a loop to `yield from` Matt Harbison <matt_harbison@yahoo.com> parents: 51901 diff changeset	62 yield from readremotenamefile(repo, b'branches')
35248 744d1c874a59 remotenames: add functions to read remotenames data from .hg/remotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35246 diff changeset	63
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41387 diff changeset	64
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	65 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	66 vfs = vfsmod.vfs(repo.vfs.join(remotenamedir))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	67 f = vfs(nametype, b'w', atomictemp=True)
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	68 # 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	69 # version '0' represents the very initial version of the storage format
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	70 f.write(b'0\n\n')
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	71
35249 2ea6e42ed15e remotenames: consider existing data while storing newer data Pulkit Goyal <7895pulkit@gmail.com> parents: 35248 diff changeset	72 olddata = set(readremotenamefile(repo, nametype))
2ea6e42ed15e remotenames: consider existing data while storing newer data Pulkit Goyal <7895pulkit@gmail.com> parents: 35248 diff changeset	73 # 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	74 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	75 if oldpath != remotepath:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	76 f.write(b'%s\0%s\0%s\n' % (node, oldpath, rname))
35249 2ea6e42ed15e remotenames: consider existing data while storing newer data Pulkit Goyal <7895pulkit@gmail.com> parents: 35248 diff changeset	77
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	78 for name, node in sorted(names.items()):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	79 if nametype == b"branches":
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	80 for n in node:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	81 f.write(b'%s\0%s\0%s\n' % (n, remotepath, name))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	82 elif nametype == b"bookmarks":
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	83 if node:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	84 f.write(b'%s\0%s\0%s\n' % (node, remotepath, name))
35246 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 f.close()
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	87
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41387 diff changeset	88
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	89 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	90 """
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	91 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	92 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	93 """
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	94 wlock = repo.wlock()
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	95 try:
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	96 if bookmarks:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	97 writeremotenamefile(repo, remotepath, bookmarks, b'bookmarks')
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	98 if branches:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	99 writeremotenamefile(repo, remotepath, branches, b'branches')
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	100 finally:
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	101 wlock.release()
8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	102
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41387 diff changeset	103
36097 62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	104 def activepath(repo, remote):
62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	105 """returns remote path"""
62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	106 # 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	107 local = remote.local()
62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	108
62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	109 # 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	110 # 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	111 rpath = remote
62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	112 if local:
40411 94c0421d67a0 logexchange: convert paths to unix when detecting the active path Matt Harbison <matt_harbison@yahoo.com> parents: 38024 diff changeset	113 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	114 elif not isinstance(remote, bytes):
49872 5bceea1a8234 logexchange: use the proper accessors to get the remote url Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49004 diff changeset	115 rpath = remote.url()
36097 62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	116
62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	117 # represent the remotepath with user defined path name if exists
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	118 for path, url in repo.ui.configitems(b'paths'):
36097 62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	119 # remove auth info from user defined url
46907 ffd3e823a7e5 urlutil: extract `url` related code from `util` into the new module Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45957 diff changeset	120 noauthurl = urlutil.removeauth(url)
40411 94c0421d67a0 logexchange: convert paths to unix when detecting the active path Matt Harbison <matt_harbison@yahoo.com> parents: 38024 diff changeset	121
94c0421d67a0 logexchange: convert paths to unix when detecting the active path Matt Harbison <matt_harbison@yahoo.com> parents: 38024 diff changeset	122 # 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	123 # 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	124 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	125 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	126 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	127 rpath = path
62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	128 break
62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	129
62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	130 return rpath
62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	131
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41387 diff changeset	132
35245 5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	133 def pullremotenames(localrepo, remoterepo):
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	134 """
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	135 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	136 pull or clone operation.
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	137 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	138 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	139 """
36097 62a428bf6359 logexchange: introduce helper function to get remote path name Pulkit Goyal <7895pulkit@gmail.com> parents: 35356 diff changeset	140 remotepath = activepath(localrepo, remoterepo)
37639 0e50dda7e9c1 logexchange: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37365 diff changeset	141
0e50dda7e9c1 logexchange: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37365 diff changeset	142 with remoterepo.commandexecutor() as e:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41387 diff changeset	143 bookmarks = e.callcommand(
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43106 diff changeset	144 b'listkeys',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43106 diff changeset	145 {
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43106 diff changeset	146 b'namespace': b'bookmarks',
89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 43106 diff changeset	147 },
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 41387 diff changeset	148 ).result()
37639 0e50dda7e9c1 logexchange: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37365 diff changeset	149
35245 5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	150 # 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	151 # 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	152 # 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	153 # 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	154 bmap = {}
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	155 repo = localrepo.unfiltered()
37639 0e50dda7e9c1 logexchange: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37365 diff changeset	156
0e50dda7e9c1 logexchange: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37365 diff changeset	157 with remoterepo.commandexecutor() as e:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	158 branchmap = e.callcommand(b'branchmap', {}).result()
37639 0e50dda7e9c1 logexchange: use command executor for wire protocol commands Gregory Szorc <gregory.szorc@gmail.com> parents: 37365 diff changeset	159
49004 f254fc73d956 global: bulk replace simple pycompat.iteritems(x) with x.items() Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	160 for branch, nodes in branchmap.items():
35245 5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	161 bmap[branch] = []
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	162 for node in nodes:
5a62910948d2 remotenames: move function to pull remotenames from the remoterepo to core Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	163 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	164 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	165
35246 8df8ce2cc5dd remotenames: add functionality to store remotenames under .hg/hgremotenames/ Pulkit Goyal <7895pulkit@gmail.com> parents: 35245 diff changeset	166 saveremotenames(localrepo, remotepath, bmap, bookmarks)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/logexchange.py @ 52669:e627cc25b6f3