##// END OF EJS Templates
subrepo: run the repo decoders when archiving...
subrepo: run the repo decoders when archiving The decoders were already run by default for the main repo, so this seemed like an oversight. The extdiff extension has been using 'archive' since 68822b7cdd01 to support -S, and a colleague noticed that after diffing, making changes, and closing it, the line endings were wrong for the diff-tool modified files in the subrepository. (Files in the parent repo were correct, with the same .hgeol settings.) The editor (Visual Studio in this case) reloads the file, but doesn't notice the EOL change. It still adds new lines with the original EOL setting, and the file ends up inconsistent. Without this change, the first file `cat`d in the test prints '\r (esc)' EOL, but the second doesn't on Windows or Linux.

File last commit:

r25969:7b200566 default
r31099:b44ab288 default
Show More
pushkey.py
61 lines | 1.7 KiB | text/x-python | PythonLexer
Matt Mackall
pushkey: add pushkey core
r11367 # pushkey.py - dispatching for pushing and pulling keys
#
# Copyright 2010 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Gregory Szorc
pushkey: use absolute_import
r25969 from __future__ import absolute_import
from . import (
bookmarks,
encoding,
obsolete,
phases,
)
Matt Mackall
bookmarks: move pushkey functions into core
r13353
Matt Mackall
pushkey: add pushkey core
r11367 def _nslist(repo):
n = {}
for k in _namespaces:
n[k] = ""
Durham Goode
obsolete: add exchange option...
r22953 if not obsolete.isenabled(repo, obsolete.exchangeopt):
Pierre-Yves David
pushkey: do not exchange obsole markers if feature is disabled...
r17298 n.pop('obsolete')
Matt Mackall
pushkey: add pushkey core
r11367 return n
Matt Mackall
bookmarks: move pushkey functions into core
r13353 _namespaces = {"namespaces": (lambda *x: False, _nslist),
Pierre-Yves David
phases: add basic pushkey support
r15648 "bookmarks": (bookmarks.pushbookmark, bookmarks.listbookmarks),
"phases": (phases.pushphase, phases.listphases),
Pierre-Yves.David@ens-lyon.org
obsolete: exchange obsolete marker over pushkey...
r17075 "obsolete": (obsolete.pushmarker, obsolete.listmarkers),
Pierre-Yves David
phases: add basic pushkey support
r15648 }
Matt Mackall
pushkey: add pushkey core
r11367
def register(namespace, pushkey, listkeys):
_namespaces[namespace] = (pushkey, listkeys)
def _get(namespace):
return _namespaces.get(namespace, (lambda *x: False, lambda *x: {}))
def push(repo, namespace, key, old, new):
'''should succeed iff value was old'''
pk = _get(namespace)[0]
return pk(repo, key, old, new)
def list(repo, namespace):
'''return a dict'''
lk = _get(namespace)[1]
return lk(repo)
Pierre-Yves David
pushkey: add an ``encode`` function...
r21661 encode = encoding.fromlocal
Pierre-Yves David
pushkey: add a ``decode`` function...
r21659 decode = encoding.tolocal
Pierre-Yves David
pushkey: introduce an ``encodekeys`` function...
r21650 def encodekeys(keys):
"""encode the content of a pushkey namespace for exchange over the wire"""
Pierre-Yves David
pushkey: add an ``encode`` function...
r21661 return '\n'.join(['%s\t%s' % (encode(k), encode(v)) for k, v in keys])
Pierre-Yves David
pushkey: introduce an ``decodekeys`` function...
r21652
def decodekeys(data):
"""decode the content of a pushkey namespace from exchange over the wire"""
result = {}
for l in data.splitlines():
k, v = l.split('\t')
Pierre-Yves David
pushkey: add a ``decode`` function...
r21659 result[decode(k)] = decode(v)
Pierre-Yves David
pushkey: introduce an ``decodekeys`` function...
r21652 return result