Mercurial > hgsubversion
comparison hgsubversion/wrappers.py @ 999:3f45bd7b60cf
bundle: add 'portable' parameter to prevent error (issue383)
hgsubversion does not fully implement the -r/--rev flag for `hg bundle` so
would crash when passed this parameter since the wrapped findcommonoutgoing
did not match the parameter list hg expects. With this patch the portable
parameter is added to this function, but remains unused so that `hg bundle -r`
will properly generate a bundle, but up to tip (in essence ignoring -r
parameter).
author | Michael Connor <mconnor@fb.com> |
---|---|
date | Wed, 20 Mar 2013 17:22:29 -0700 |
parents | 110794582448 |
children | b2d89ba6b871 |
comparison
equal
deleted
inserted
replaced
997:c8cb06e1f323 | 999:3f45bd7b60cf |
---|---|
116 val = val.split('\n')[0] | 116 val = val.split('\n')[0] |
117 ui.status('%s%s\n' % (l1.ljust(13), val)) | 117 ui.status('%s%s\n' % (l1.ljust(13), val)) |
118 return ret | 118 return ret |
119 | 119 |
120 | 120 |
121 def findcommonoutgoing(repo, other, onlyheads=None, force=False, commoninc=None): | 121 def findcommonoutgoing(repo, other, onlyheads=None, force=False, |
122 commoninc=None, portable=False): | |
122 assert other.capable('subversion') | 123 assert other.capable('subversion') |
123 # split off #rev; TODO implement --revision/#rev support | 124 # split off #rev; TODO implement --revision/#rev support |
124 svn = other.svn | 125 svn = other.svn |
125 meta = repo.svnmeta(svn.uuid, svn.subdir) | 126 meta = repo.svnmeta(svn.uuid, svn.subdir) |
126 parent = repo.parents()[0].node() | 127 parent = repo.parents()[0].node() |