This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1755

logexchange: introduce helper function to get remote path name
ClosedPublic

Authored by pulkit on Dec 25 2017, 4:57 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG62a428bf6359: logexchange: introduce helper function to get remote path name
Summary

This patch moves chunk of activepath function from hgremotenames extension
(https://bitbucket.org/seanfarley/hgremotenames/) to core. Before moving
rest of the part, there needs to be some refactoring done to schemes which
will be done as a separate series.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Dec 25 2017, 4:57 AM
pulkit edited the summary of this revision. (Show Details)Dec 25 2017, 5:34 AM
durin42 requested changes to this revision.Jan 10 2018, 6:18 PM
durin42 added a subscriber: durin42.
durin42 added inline comments.
mercurial/logexchange.py
110

This should be cleaned up to not have all the getattr contortions that support old hg versions.

This revision now requires changes to proceed.Jan 10 2018, 6:18 PM
pulkit updated this revision to Diff 4794.Jan 11 2018, 5:33 AM
durin42 added inline comments.Jan 18 2018, 3:02 PM
mercurial/logexchange.py
103

what's the deal with this attributeerror business? merits a comment at least

114

is the attribute name here really still inconsistent in hg?

pulkit updated this revision to Diff 5144.Feb 2 2018, 2:47 AM
pulkit added a comment.Feb 12 2018, 4:57 AM

I will like to get this series review and iterated upon early in cycle so that we can ship remotenames in the next release.

durin42 accepted this revision.Feb 12 2018, 3:26 PM
This revision is now accepted and ready to land.Feb 12 2018, 3:26 PM
Closed by commit rHG62a428bf6359: logexchange: introduce helper function to get remote path name (authored by pulkit). · Explain WhyFeb 12 2018, 4:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/logexchange.py (27 lines)
Mtests/test-logexchange.t (24 lines)

Diff 5520

mercurial/logexchange.py

# logexchange.py # logexchange.py
# #
# Copyright 2017 Augie Fackler <raf@durin42.com> # Copyright 2017 Augie Fackler <raf@durin42.com>
# Copyright 2017 Sean Farley <sean@farley.io> # Copyright 2017 Sean Farley <sean@farley.io>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from .node import hex from .node import hex
from . import ( from . import (
util,
vfs as vfsmod, vfs as vfsmod,
) )
# directory name in .hg/ in which remotenames files will be present # directory name in .hg/ in which remotenames files will be present
remotenamedir = 'logexchange' remotenamedir = 'logexchange'
def readremotenamefile(repo, filename): def readremotenamefile(repo, filename):
""" """
try: try:
if bookmarks: if bookmarks:
writeremotenamefile(repo, remotepath, bookmarks, 'bookmarks') writeremotenamefile(repo, remotepath, bookmarks, 'bookmarks')
if branches: if branches:
writeremotenamefile(repo, remotepath, branches, 'branches') writeremotenamefile(repo, remotepath, branches, 'branches')
finally: finally:
wlock.release() wlock.release()
def activepath(repo, remote):
"""returns remote path"""
local = None
# is the remote a local peer
local = remote.local()
durin42Unsubmitted
Not Done

what's the deal with this attributeerror business? merits a comment at least

durin42: what's the deal with this attributeerror business? merits a comment at least
# determine the remote path from the repo, if possible; else just
# use the string given to us
rpath = remote
if local:
rpath = remote._repo.root
elif not isinstance(remote, str):
rpath = remote._url
durin42Unsubmitted
Not Done

This should be cleaned up to not have all the getattr contortions that support old hg versions.

durin42: This should be cleaned up to not have all the getattr contortions that support old hg versions.
# represent the remotepath with user defined path name if exists
for path, url in repo.ui.configitems('paths'):
# remove auth info from user defined url
durin42Unsubmitted
Not Done

is the attribute name here really still inconsistent in hg?

durin42: is the attribute name here really still inconsistent in hg?
url = util.removeauth(url)
if url == rpath:
rpath = path
break
return rpath
def pullremotenames(localrepo, remoterepo): def pullremotenames(localrepo, remoterepo):
""" """
pulls bookmarks and branches information of the remote repo during a pulls bookmarks and branches information of the remote repo during a
pull or clone operation. pull or clone operation.
localrepo is our local repository localrepo is our local repository
remoterepo is the peer instance remoterepo is the peer instance
""" """
remotepath = remoterepo.url() remotepath = activepath(localrepo, remoterepo)
bookmarks = remoterepo.listkeys('bookmarks') bookmarks = remoterepo.listkeys('bookmarks')
# on a push, we don't want to keep obsolete heads since # on a push, we don't want to keep obsolete heads since
# they won't show up as heads on the next pull, so we # they won't show up as heads on the next pull, so we
# remove them here otherwise we would require the user # remove them here otherwise we would require the user
# to issue a pull to refresh the storage # to issue a pull to refresh the storage
bmap = {} bmap = {}
repo = localrepo.unfiltered() repo = localrepo.unfiltered()
for branch, nodes in remoterepo.branchmap().iteritems(): for branch, nodes in remoterepo.branchmap().iteritems():
bmap[branch] = [] bmap[branch] = []
for node in nodes: for node in nodes:
if node in repo and not repo[node].obsolete(): if node in repo and not repo[node].obsolete():
bmap[branch].append(hex(node)) bmap[branch].append(hex(node))
saveremotenames(localrepo, remotepath, bmap, bookmarks) saveremotenames(localrepo, remotepath, bmap, bookmarks)

tests/test-logexchange.t

$ hg clone server client $ hg clone server client
updating to branch default updating to branch default
8 files updated, 0 files merged, 0 files removed, 0 files unresolved 8 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd client $ cd client
$ cat .hg/logexchange/bookmarks $ cat .hg/logexchange/bookmarks
0 0
87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc) 87d6d66763085b629e6d7ed56778c79827273022\x00default\x00bar (esc)
62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc) 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc)
$ cat .hg/logexchange/branches $ cat .hg/logexchange/branches
0 0
ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server\x00default (esc) ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc)
3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server\x00wat (esc) 3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc)
Making a new server Making a new server
------------------- -------------------
$ cd .. $ cd ..
$ hg init server2 $ hg init server2
$ cd server2 $ cd server2
$ hg pull ../server/ $ hg pull ../server/
$ cd ../client/ $ cd ../client/
$ hg pull ../server2/ $ hg pull ../server2/
pulling from ../server2/ pulling from ../server2/
searching for changes searching for changes
no changes found no changes found
$ cat .hg/logexchange/bookmarks $ cat .hg/logexchange/bookmarks
0 0
62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server\x00foo (esc) 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00default\x00foo (esc)
87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server\x00bar (esc) 87d6d66763085b629e6d7ed56778c79827273022\x00default\x00bar (esc)
87d6d66763085b629e6d7ed56778c79827273022\x00file:$TESTTMP/server2\x00bar (esc) 87d6d66763085b629e6d7ed56778c79827273022\x00$TESTTMP/server2\x00bar (esc)
62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00file:$TESTTMP/server2\x00foo (esc) 62615734edd52f06b6fb9c2beb429e4fe30d57b8\x00$TESTTMP/server2\x00foo (esc)
$ cat .hg/logexchange/branches $ cat .hg/logexchange/branches
0 0
3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server\x00wat (esc) 3e1487808078543b0af6d10dadf5d46943578db0\x00default\x00wat (esc)
ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server\x00default (esc) ec2426147f0e39dbc9cef599b066be6035ce691d\x00default\x00default (esc)
ec2426147f0e39dbc9cef599b066be6035ce691d\x00file:$TESTTMP/server2\x00default (esc) ec2426147f0e39dbc9cef599b066be6035ce691d\x00$TESTTMP/server2\x00default (esc)
3e1487808078543b0af6d10dadf5d46943578db0\x00file:$TESTTMP/server2\x00wat (esc) 3e1487808078543b0af6d10dadf5d46943578db0\x00$TESTTMP/server2\x00wat (esc)