equal
deleted
inserted
replaced
1570 UPDATECHECK_LINEAR, |
1570 UPDATECHECK_LINEAR, |
1571 UPDATECHECK_NO_CONFLICT, |
1571 UPDATECHECK_NO_CONFLICT, |
1572 ), |
1572 ), |
1573 ) |
1573 ) |
1574 ) |
1574 ) |
1575 with repo.wlock(): |
1575 if wc is not None and wc.isinmemory(): |
|
1576 maybe_wlock = util.nullcontextmanager() |
|
1577 else: |
|
1578 maybe_wlock = repo.wlock() |
|
1579 with maybe_wlock: |
1576 if wc is None: |
1580 if wc is None: |
1577 wc = repo[None] |
1581 wc = repo[None] |
1578 pl = wc.parents() |
1582 pl = wc.parents() |
1579 p1 = pl[0] |
1583 p1 = pl[0] |
1580 p2 = repo[node] |
1584 p2 = repo[node] |