Mercurial > evolve
changeset 4415:29733c2b0fd3
evolve: rename npublicdiv to publicnode
In next patches it would make more sense to use publicnode
instead of npublicdiv.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Thu, 28 Feb 2019 02:08:58 +0530 |
| parents | 29645d5ba3d9 |
| children | b2a8e67b0933 |
| files | hgext3rd/evolve/evolvecmd.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Thu Feb 28 02:02:18 2019 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Thu Feb 28 02:08:58 2019 +0530 @@ -568,8 +568,8 @@ haspubdiv = False if evolvestate.get('public-divergent'): haspubdiv = True - npublicdiv = evolvestate['public-divergent'] - publicdiv = repo[npublicdiv] + publicnode = evolvestate['public-divergent'] + publicdiv = repo[publicnode] try: with repo.dirstate.parentchange(): repo.dirstate.setparents(resparent, nodemod.nullid) @@ -1899,14 +1899,14 @@ origdivergent = evolvestate['orig-divergent'] evolvestate['replacements'][origdivergent] = ret[1] # logic to continue the public content-divergent - publicdiv = evolvestate.get('public-divergent') - if publicdiv: + publicnode = evolvestate.get('public-divergent') + if publicnode: res, newnode = ret if not res: # no need to proceed for phase divergence resolution step pass else: - prec = repo[publicdiv] + prec = repo[publicnode] bumped = repo[newnode] ret = _resolvephasedivergent(ui, repo, prec=prec, bumped=bumped, tmpctx=bumped)