Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0.1, 1.0.2, and 1.0.3

stable Handle output from modified p4pending in new perfarce

Changeset b97cef0af0f0…

Parent b6ea5dbecda0…

by Frank Kingswood

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

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
511
512
513
514
515
516
 
 
 
 
 
 
 
 
 
 
 
 
517
518
519
 
511
512
513
 
 
 
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
@@ -511,9 +511,18 @@
  try:   hashes = line.split(' ')   changelist = hashes.pop(0) - if changelist == 'submitted': - changelist = _('Submitted') + str(submitted) - submitted += 1 + if len(hashes)>1 and len(hashes[0])==1: + state = hashes.pop(0) + if state == 's': + changelist = _('%s (submitted)') % changelist + elif state == 'p': + changelist = _('%s (pending)') % changelist + else: + if changelist == 'submitted': + changelist = _('Submitted') + str(submitted) + submitted += 1 + else: + changelist = _('%s (pending)') % changelist   pending[changelist] = hashes   except (ValueError, IndexError):   text = _('Unable to parse p4pending output')