Skip to content
Snippets Groups Projects
Commit 3ceacdd2 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

hg2git: add 'new' prefix to _handle_subrepos variables

An upcoming patch will introduce similar variables for self._ctx. This helps
disambiguate.
parent ab2be1d9
No related branches found
No related tags found
No related merge requests found
......@@ -261,7 +261,7 @@
# trees, this should hold true.
parent_tree[os.path.basename(d)] = (stat.S_IFDIR, tree.id)
def _handle_subrepos(self, ctx, dirty_trees):
def _handle_subrepos(self, newctx, dirty_trees):
def parse_subrepos(ctx):
sub = util.OrderedDict()
if '.hgsub' in ctx:
......@@ -272,5 +272,5 @@
ctx['.hgsubstate'].data().splitlines())
return sub, substate
sub, substate = parse_subrepos(ctx)
newsub, newsubstate = parse_subrepos(newctx)
......@@ -276,3 +276,3 @@
for path, sha in substate.iteritems():
for path, sha in newsubstate.iteritems():
# Ignore non-Git repositories keeping state in .hgsubstate.
......@@ -278,5 +278,5 @@
# Ignore non-Git repositories keeping state in .hgsubstate.
if path in sub and not sub[path].startswith('[git]'):
if path in newsub and not newsub[path].startswith('[git]'):
continue
d = os.path.dirname(path)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment