Mercurial > hgsubversion

comparison hgsubversion/pushmod.py @ 1231:5c2917375961

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable.
author Augie Fackler <raf@durin42.com>
date Tue, 12 Aug 2014 11:08:41 -0400
parents 46523cdfd3b0
children cff81f35b31e
comparison
equal deleted inserted replaced
1228:9490a3052935 1231:5c2917375961
131 if renamed: 131 if renamed:
132 # TODO current model (and perhaps svn model) does not support 132 # TODO current model (and perhaps svn model) does not support
133 # this kind of renames: a -> b, b -> c 133 # this kind of renames: a -> b, b -> c
134 copies[file] = renamed[0] 134 copies[file] = renamed[0]
135 base_data = parent[renamed[0]].data() 135 base_data = parent[renamed[0]].data()
136 if 'l' in parent[renamed[0]].flags():
137 base_data = 'link ' + base_data
136 else: 138 else:
137 autoprops = svn.autoprops_config.properties(file) 139 autoprops = svn.autoprops_config.properties(file)
138 if autoprops: 140 if autoprops:
139 props.setdefault(file, {}).update(autoprops) 141 props.setdefault(file, {}).update(autoprops)
140 142
143 else: 145 else:
144 base_data = parent.filectx(file).data() 146 base_data = parent.filectx(file).data()
145 if ('x' in parent.filectx(file).flags() 147 if ('x' in parent.filectx(file).flags()
146 and 'x' not in rev_ctx.filectx(file).flags()): 148 and 'x' not in rev_ctx.filectx(file).flags()):
147 props.setdefault(file, {})['svn:executable'] = None 149 props.setdefault(file, {})['svn:executable'] = None
148 if ('l' in parent.filectx(file).flags() 150 if 'l' in parent.filectx(file).flags():
149 and 'l' not in rev_ctx.filectx(file).flags()): 151 base_data = 'link ' + base_data
150 props.setdefault(file, {})['svn:special'] = None 152 if 'l' not in rev_ctx.filectx(file).flags():
153 props.setdefault(file, {})['svn:special'] = None
151 if hgutil.binary(base_data) and not isbinary: 154 if hgutil.binary(base_data) and not isbinary:
152 props.setdefault(file, {})['svn:mime-type'] = None 155 props.setdefault(file, {})['svn:mime-type'] = None
153 action = 'modify' 156 action = 'modify'
154 else: 157 else:
155 pos = file.rfind('/') 158 pos = file.rfind('/')