Mercurial > hg

comparison hgext/rebase.py @ 38671:99ed6e2f6606

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: reduce scope of a variable Differential Revision: https://phab.mercurial-scm.org/D3940
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 11 Jul 2018 15:03:39 -0700
parents 572dff5c946e
children 0f8599afb92f
comparison
equal deleted inserted replaced
38670:fbec9c0b32d3 38671:99ed6e2f6606
1856 cl = repo.changelog 1856 cl = repo.changelog
1857 nodemap = cl.nodemap 1857 nodemap = cl.nodemap
1858 extinctnodes = set(cl.node(r) for r in repo.revs('extinct()')) 1858 extinctnodes = set(cl.node(r) for r in repo.revs('extinct()'))
1859 for srcrev in rebaseobsrevs: 1859 for srcrev in rebaseobsrevs:
1860 srcnode = cl.node(srcrev) 1860 srcnode = cl.node(srcrev)
1861 destnode = cl.node(destmap[srcrev])
1862 # XXX: more advanced APIs are required to handle split correctly 1861 # XXX: more advanced APIs are required to handle split correctly
1863 successors = set(obsutil.allsuccessors(repo.obsstore, [srcnode])) 1862 successors = set(obsutil.allsuccessors(repo.obsstore, [srcnode]))
1864 # obsutil.allsuccessors includes node itself 1863 # obsutil.allsuccessors includes node itself
1865 successors.remove(srcnode) 1864 successors.remove(srcnode)
1866 if successors.issubset(extinctnodes): 1865 if successors.issubset(extinctnodes):
1868 obsoleteextinctsuccessors.add(srcrev) 1867 obsoleteextinctsuccessors.add(srcrev)
1869 if not successors: 1868 if not successors:
1870 # no successor 1869 # no successor
1871 obsoletenotrebased[srcrev] = None 1870 obsoletenotrebased[srcrev] = None
1872 else: 1871 else:
1872 destnode = cl.node(destmap[srcrev])
1873 for succnode in successors: 1873 for succnode in successors:
1874 if succnode not in nodemap: 1874 if succnode not in nodemap:
1875 continue 1875 continue
1876 if cl.isancestor(succnode, destnode): 1876 if cl.isancestor(succnode, destnode):
1877 obsoletenotrebased[srcrev] = nodemap[succnode] 1877 obsoletenotrebased[srcrev] = nodemap[succnode]