diff options
author | Tristan Seligmann <mithrandi@debian.org> | 2017-08-11 11:50:14 +0200 |
---|---|---|
committer | Tristan Seligmann <mithrandi@debian.org> | 2017-08-11 11:50:14 +0200 |
commit | f505a84d33c238a892064774ca31854d3b5b1df2 (patch) | |
tree | a67f8519abfc6a529260814e24809d62356fc46a /hgsubversion/stupid.py | |
parent | ef9caf1c5d12cf3a5886c1eb3ff5bb956fdf482f (diff) |
Upstream snapsnot 1.8.7+1517-b3e41b0d50a2
Diffstat (limited to 'hgsubversion/stupid.py')
-rw-r--r-- | hgsubversion/stupid.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hgsubversion/stupid.py b/hgsubversion/stupid.py index abb38e7..9c004c0 100644 --- a/hgsubversion/stupid.py +++ b/hgsubversion/stupid.py @@ -568,7 +568,7 @@ def fetch_branchrev(svn, meta, branch, branchpath, r, parentctx): return files, filectxfn def checkbranch(meta, r, branch): - branchedits = meta.revmap.branchedits(branch, r) + branchedits = meta.revmap.branchedits(branch, r.revnum) if not branchedits: return None branchtip = branchedits[0][1] @@ -689,6 +689,10 @@ def convert_rev(ui, meta, svn, r, tbdelta, firstrun): date = meta.fixdate(r.date) check_deleted_branches = set(tbdelta['branches'][1]) for b in branches: + + if meta.skipbranch(b): + continue + parentctx = meta.repo[meta.get_parent_revision(r.revnum, b)] tag = meta.get_path_tag(meta.remotename(b)) kind = svn.checkpath(branches[b], r.revnum) @@ -704,7 +708,7 @@ def convert_rev(ui, meta, svn, r, tbdelta, firstrun): # path does not support this case with svn >= 1.7. We can fix # it, or we can force the existing fetch_branchrev() path. Do # the latter for now. - incremental = (meta.firstpulled > 0 and + incremental = (meta.revmap.firstpulled > 0 and parentctx.rev() != node.nullrev and not firstrun) |