##// END OF EJS Templates
destutil: use cached branch information instead of query for efficiency...
FUJIWARA Katsunori -
r28236:e333cea7 default
parent child Browse files
Show More
@@ -92,12 +92,13 b' def _destupdatebranch(repo, clean, check'
92 wc = repo[None]
92 wc = repo[None]
93 movemark = node = None
93 movemark = node = None
94 currentbranch = wc.branch()
94 currentbranch = wc.branch()
95 try:
95 if currentbranch in repo.branchmap():
96 node = repo.revs('max(.::(head() and branch(%s)))'
96 heads = repo.branchheads(currentbranch, closed=True)
97 , currentbranch).first()
97 if heads:
98 node = repo.revs('max(.::(%ln))', heads).first()
98 if bookmarks.isactivewdirparent(repo):
99 if bookmarks.isactivewdirparent(repo):
99 movemark = repo['.'].node()
100 movemark = repo['.'].node()
100 except error.RepoLookupError:
101 else:
101 if currentbranch == 'default': # no default branch!
102 if currentbranch == 'default': # no default branch!
102 node = repo.lookup('tip') # update to tip
103 node = repo.lookup('tip') # update to tip
103 else:
104 else:
General Comments 0
You need to be logged in to leave comments. Login now