facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

pull: correctly handle replacing the root of a branch with a non-copied directory

Browse Source 
Prior to this diff, we would either crash, or continue past the
replacement without actually recording the change.  This could lead to
later failing varify if the state before and after weren't identical.
This commit is contained in:
David Schleimer 2013-11-16 16:16:59 -08:00
parent b0b2ba3c57
commit fba6d35793
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hgsubversion/editor.py
View File

@ -401,6 +401,10 @@ class HgEditor(svnwrap.Editor):
br_path, branch = self.meta.split_branch_path(path)[:2]
if br_path is not None:
if not copyfrom_path and not br_path:
# This handles the case where a branch root is
# replaced without copy info. It will show up as a
# deletion and then an add.
self.meta.closebranches.discard(branch)
self.current.emptybranches[branch] = True
else:
self.current.emptybranches[branch] = False

12
hgsubversion/replay.py
View File

@ -97,6 +97,7 @@ def _convert_rev(ui, meta, svn, r, tbdelta, firstrun):
p, b = meta.split_branch_path(f)[:2]
if b not in branch_batches:
branch_batches[b] = []
if p:
branch_batches[b].append((p, f))
closebranches = {}
@ -193,13 +194,14 @@ def _convert_rev(ui, meta, svn, r, tbdelta, firstrun):
continue
parent_ctx = meta.repo.changectx(ha)
files = []
def del_all_files(*args):
raise IOError(errno.ENOENT, 'deleting all files')
# True here meant nuke all files, shouldn't happen with branch closing
if current.emptybranches[branch]: # pragma: no cover
raise hgutil.Abort('Empty commit to an open branch attempted. '
'Please report this issue.')
# True here means nuke all files. This happens when you
# replace a branch root with an empty directory
if current.emptybranches[branch]:
files = meta.repo[ha].files()
extra = meta.genextra(rev.revnum, branch)
meta.mapbranch(extra)
@ -207,7 +209,7 @@ def _convert_rev(ui, meta, svn, r, tbdelta, firstrun):
current_ctx = context.memctx(meta.repo,
(ha, node.nullid),
util.getmessage(ui, rev),
[],
files,
del_all_files,
meta.authors[rev.author],
date,

5
hgsubversion/svnmeta.py
View File

@ -490,8 +490,8 @@ class SVNMeta(object):
# action of 'D'. We mark the branch as deleted.
# 5. It's the parent directory of one or more
# already-known branches, so we mark them as deleted.
# 6. It's a branch being replaced by another branch - the
# action will be 'R'.
# 6. It's a branch being replaced by another branch or a new
# directory - the action will be 'R'.
fi, br = self.split_branch_path(p)[:2]
if fi is not None:
if fi == '':
@ -501,6 +501,7 @@ class SVNMeta(object):
# Check the replacing source is not an ancestor
# branch of the branch being replaced, this
# would just be a revert.
if paths[p].copyfrom_path:
cfi, cbr = self.split_branch_path(
paths[p].copyfrom_path, paths[p].copyfrom_rev)[:2]
if cfi == '':