##// END OF EJS Templates
mq: rename check_substate to checksubstate
Adrian Buehlmann -
r14582:a6467dfb default
parent child Browse files
Show More
@@ -833,7 +833,7 b' class queue(object):'
833 return top, patch
833 return top, patch
834 return None, None
834 return None, None
835
835
836 def check_substate(self, repo):
836 def checksubstate(self, repo):
837 '''return list of subrepos at a different revision than substate.
837 '''return list of subrepos at a different revision than substate.
838 Abort if any subrepos have uncommitted changes.'''
838 Abort if any subrepos have uncommitted changes.'''
839 inclsubs = []
839 inclsubs = []
@@ -893,7 +893,7 b' class queue(object):'
893 diffopts = self.diffopts({'git': opts.get('git')})
893 diffopts = self.diffopts({'git': opts.get('git')})
894 if opts.get('checkname', True):
894 if opts.get('checkname', True):
895 self.checkpatchname(patchfn)
895 self.checkpatchname(patchfn)
896 inclsubs = self.check_substate(repo)
896 inclsubs = self.checksubstate(repo)
897 if inclsubs:
897 if inclsubs:
898 inclsubs.append('.hgsubstate')
898 inclsubs.append('.hgsubstate')
899 if opts.get('include') or opts.get('exclude') or pats:
899 if opts.get('include') or opts.get('exclude') or pats:
@@ -1348,7 +1348,7 b' class queue(object):'
1348 if repo.changelog.heads(top) != [top]:
1348 if repo.changelog.heads(top) != [top]:
1349 raise util.Abort(_("cannot refresh a revision with children"))
1349 raise util.Abort(_("cannot refresh a revision with children"))
1350
1350
1351 inclsubs = self.check_substate(repo)
1351 inclsubs = self.checksubstate(repo)
1352
1352
1353 cparents = repo.changelog.parents(top)
1353 cparents = repo.changelog.parents(top)
1354 patchparent = self.qparents(repo, top)
1354 patchparent = self.qparents(repo, top)
General Comments 0
You need to be logged in to leave comments. Login now