Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

manifest: properly handle unmodified subrepo files

Changeset ee16bc50ca21…

Parent b3e39d7b0a64…

by Angel Ezquerra

Changes to one file · Browse files at ee16bc50ca21 Showing diff from parent b3e39d7b0a64 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
567
568
569
570
 
571
572
 
573
574
575
 
584
585
586
587
 
588
589
590
 
567
568
569
 
570
571
 
572
573
574
575
 
584
585
586
 
587
588
589
590
@@ -567,9 +567,9 @@
  Also return the corresponding subrepo context and the filename relative to   its containing subrepo   """ - if wfile in ctx.files(): + if wfile in ctx.manifest():   return '', wfile, ctx - for wsub in ctx.substate.keys(): + for wsub in ctx.substate:   if wfile.startswith(wsub):   srev = ctx.substate[wsub][1]   stype = ctx.substate[wsub][2] @@ -584,7 +584,7 @@
  # The selected revision does not exist in the working copy   continue   wfileinsub = wfile[len(wsub)+1:] - if wfileinsub in sctx.substate.keys() or wfileinsub in sctx.files(): + if wfileinsub in sctx.substate or wfileinsub in sctx.manifest():   return wsub, wfileinsub, sctx   else:   wsubsub, wfileinsub, sctx = \