~qbzr-dev/qbzr/show-merge-depth

« back to all changes in this revision

Viewing changes to lib/log.py

  • Committer: Gary van der Merwe
  • Date: 2009-08-19 12:41:14 UTC
  • mfrom: (677.1.243 trunk)
  • Revision ID: garyvdm@gmail.com-20090819124114-jz8zf4o4dlcl0a4r
Merge Trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
405
405
                                          list(child_ids))
406
406
            for rev in revisions.itervalues():
407
407
                if not hasattr(rev, "revno"):
408
 
                    if rev.revision_id in gp.revid_msri:
409
 
                        revno_sequence = gp.merge_sorted_revisions[\
410
 
                                            gp.revid_msri[rev.revision_id]][3]
411
 
                        rev.revno = ".".join(["%d" % (revno)
412
 
                                                  for revno in revno_sequence])
 
408
                    if rev.revision_id in gp.revid_rev:
 
409
                        rev.revno = gp.revid_rev[rev.revision_id].revno_str
413
410
                    else:
414
411
                        rev.revno = ""
415
412