Mercurial > hgsubversion

comparison push_cmd.py @ 6:1a5bb173170b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes for win32 compatibility. Changes suggested by Shun-ichi GOTO, with some alterations by me.
author Augie Fackler <durin42@gmail.com>
date Thu, 02 Oct 2008 09:13:08 -0500
parents f2636cfed115
children 9eb6bf2be1e7
comparison
equal deleted inserted replaced
5:0548662e2f34 6:1a5bb173170b
92 base_data = parent.filectx(file).data() 92 base_data = parent.filectx(file).data()
93 action = 'delete' 93 action = 'delete'
94 file_data[file] = base_data, new_data, action 94 file_data[file] = base_data, new_data, action
95 95
96 # TODO check for directory deletes here 96 # TODO check for directory deletes here
97 svn = svnwrap.SubversionRepo(svn_url) 97 svn = svnwrap.SubversionRepo(svn_url, username=merc_util.getuser())
98 parent_branch = rev_ctx.parents()[0].branch() 98 parent_branch = rev_ctx.parents()[0].branch()
99 branch_path = 'trunk' 99 branch_path = 'trunk'
100 if parent_branch and parent_branch != 'default': 100 if parent_branch and parent_branch != 'default':
101 branch_path = 'branches/%s' % parent_branch 101 branch_path = 'branches/%s' % parent_branch
102 new_target_files = ['%s/%s' % (branch_path, f) for f in target_files] 102 new_target_files = ['%s/%s' % (branch_path, f) for f in target_files]