Mercurial > hgsubversion

comparison push_cmd.py @ 62:cc5ebdb1e8d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push_cmd: Further simplified some logic thanks to an improved test.
author Augie Fackler <durin42@gmail.com>
date Thu, 06 Nov 2008 09:24:33 -0600
parents 41dc00c7aef1
children b33940d54fe2
comparison
equal deleted inserted replaced
61:243c88c47d89 62:cc5ebdb1e8d4
105 except core.SubversionException, e: 105 except core.SubversionException, e:
106 # dir must not exist 106 # dir must not exist
107 added_dirs.append(dirname[:-1]) 107 added_dirs.append(dirname[:-1])
108 else: 108 else:
109 base_data = parent.filectx(file).data() 109 base_data = parent.filectx(file).data()
110 if 'x' in parent.filectx(file).flags(): 110 if ('x' in parent.filectx(file).flags()
111 if 'svn:executable' in props.setdefault(file, {}): 111 and 'x' not in rev_ctx.filectx(file).flags()):
112 del props[file]['svn:executable'] 112 props.setdefault(file, {})['svn:executable'] = None
113 else:
114 props.setdefault(file, {})['svn:executable'] = None
115 if ('l' in parent.filectx(file).flags() 113 if ('l' in parent.filectx(file).flags()
116 and 'l' not in rev_ctx.filectx(file).flags()): 114 and 'l' not in rev_ctx.filectx(file).flags()):
117 props.setdefault(file, {})['svn:special'] = None 115 props.setdefault(file, {})['svn:special'] = None
118 action = 'modify' 116 action = 'modify'
119 else: 117 else: