Mercurial > hgsubversion

comparison push_cmd.py @ 57:c3c5546eefb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't try and add a directory more than once.
author Augie Fackler <durin42@gmail.com>
date Mon, 03 Nov 2008 14:24:18 -0600
parents 0be16f306a42
children 41dc00c7aef1
comparison
equal deleted inserted replaced
56:0be16f306a42 57:c3c5546eefb1
134 if merc_util.binary(file_data[ntf][1]): 134 if merc_util.binary(file_data[ntf][1]):
135 props.setdefault(ntf, {}).update(props.get(ntf, {})) 135 props.setdefault(ntf, {}).update(props.get(ntf, {}))
136 props.setdefault(ntf, {})['svn:mime-type'] = 'application/octet-stream' 136 props.setdefault(ntf, {})['svn:mime-type'] = 'application/octet-stream'
137 del file_data[tf] 137 del file_data[tf]
138 added_dirs = ['%s/%s' % (branch_path, f) for f in added_dirs] 138 added_dirs = ['%s/%s' % (branch_path, f) for f in added_dirs]
139 added_dirs = set(added_dirs)
139 new_target_files += added_dirs 140 new_target_files += added_dirs
140 try: 141 try:
141 svn.commit(new_target_files, rev_ctx.description(), file_data, 142 svn.commit(new_target_files, rev_ctx.description(), file_data,
142 base_revision, set(added_dirs), props) 143 base_revision, set(added_dirs), props)
143 except core.SubversionException, e: 144 except core.SubversionException, e: