mercurial/localrepo.py
changeset 21591 660ef8ca8c3c
parent 21588 4944c488f738
child 21596 83bbfb23cb24
equal deleted inserted replaced
21590:e5deefcaa12b 21591:660ef8ca8c3c
  1530         if (not isinstance(ctx1, context.changectx)
  1530         if (not isinstance(ctx1, context.changectx)
  1531             and isinstance(ctx2, context.changectx)):
  1531             and isinstance(ctx2, context.changectx)):
  1532             reversed = True
  1532             reversed = True
  1533             ctx1, ctx2 = ctx2, ctx1
  1533             ctx1, ctx2 = ctx2, ctx1
  1534 
  1534 
  1535         working = ctx2.rev() is None
       
  1536         listignored, listclean, listunknown = ignored, clean, unknown
  1535         listignored, listclean, listunknown = ignored, clean, unknown
  1537 
       
  1538         # load earliest manifest first for caching reasons
       
  1539         if not working and ctx2.rev() < ctx1.rev():
       
  1540             ctx2.manifest()
       
  1541 
  1536 
  1542         r = [[], [], [], [], [], [], []]
  1537         r = [[], [], [], [], [], [], []]
  1543         match = ctx2._matchstatus(ctx1, r, match, listignored, listclean,
  1538         match = ctx2._matchstatus(ctx1, r, match, listignored, listclean,
  1544                                   listunknown)
  1539                                   listunknown)
  1545         r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown)
  1540         r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown)