Mercurial > hgsubversion

comparison wrappers.py @ 271:5278817fe8a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add newlines to ui.status calls where needed
author Daniel Tang <dytang@cs.purdue.edu>
date Tue, 21 Apr 2009 18:31:17 -0400
parents 14914dbd8a4a
children b45bae16be32
comparison
equal deleted inserted replaced
270:2848d17eae71 271:5278817fe8a1
101 hge.revmap.iterkeys())) 101 hge.revmap.iterkeys()))
102 user, passwd = util.getuserpass(opts) 102 user, passwd = util.getuserpass(opts)
103 # Strategy: 103 # Strategy:
104 # 1. Find all outgoing commits from this head 104 # 1. Find all outgoing commits from this head
105 if len(repo.parents()) != 1: 105 if len(repo.parents()) != 1:
106 ui.status('Cowardly refusing to push branch merge') 106 ui.status('Cowardly refusing to push branch merge\n')
107 return 1 107 return 1
108 workingrev = repo.parents()[0] 108 workingrev = repo.parents()[0]
109 ui.status('searching for changes\n') 109 ui.status('searching for changes\n')
110 outgoing = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes, workingrev.node()) 110 outgoing = util.outgoing_revisions(ui, repo, hge, svn_commit_hashes, workingrev.node())
111 if not (outgoing and len(outgoing)): 111 if not (outgoing and len(outgoing)):
114 while outgoing: 114 while outgoing:
115 oldest = outgoing.pop(-1) 115 oldest = outgoing.pop(-1)
116 old_ctx = repo[oldest] 116 old_ctx = repo[oldest]
117 if len(old_ctx.parents()) != 1: 117 if len(old_ctx.parents()) != 1:
118 ui.status('Found a branch merge, this needs discussion and ' 118 ui.status('Found a branch merge, this needs discussion and '
119 'implementation.') 119 'implementation.\n')
120 return 1 120 return 1
121 base_n = old_ctx.parents()[0].node() 121 base_n = old_ctx.parents()[0].node()
122 old_children = repo[base_n].children() 122 old_children = repo[base_n].children()
123 svnbranch = repo[base_n].branch() 123 svnbranch = repo[base_n].branch()
124 oldtip = base_n 124 oldtip = base_n