Comments
Patch
@@ -765,12 +765,17 @@ def summaryhook(ui, repo):
else:
ui.note(s)
- nbunstable = len(getrevs(repo, 'unstable'))
- nbbumped = len(getrevs(repo, 'bumped'))
- nbdivergent = len(getrevs(repo, 'divergent'))
- write('unstable: %i changesets\n', nbunstable)
- write('bumped: %i changesets\n', nbbumped)
- write('divergent: %i changesets\n', nbdivergent)
+ # util.versiontuple was introduced in 3.6.2
+ if not util.safehasattr(util, 'versiontuple'):
+ nbunstable = len(getrevs(repo, 'unstable'))
+ nbbumped = len(getrevs(repo, 'bumped'))
+ nbdivergent = len(getrevs(repo, 'divergent'))
+ write('unstable: %i changesets\n', nbunstable)
+ write('bumped: %i changesets\n', nbbumped)
+ write('divergent: %i changesets\n', nbdivergent)
+ else:
+ # In 3.6.2, summary in core gained this feature, no need to display it
+ pass
@eh.extsetup
def obssummarysetup(ui):
@@ -390,7 +390,7 @@ Test rollback support
commit: 1 deleted, 2 unknown (clean)
update: 2 new changesets, 2 branch heads (merge)
phases: 4 draft
- unstable: 1 changesets
+ unstable: 1 changeset
$ qlog
6
- 909a0fb57e5d
@@ -664,7 +664,7 @@ Check divergence detection (note: multip
commit: (clean)
update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
phases: 3 draft
- bumped: 1 changesets
+ bumped: 1 changeset
$ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
$ hg log -r 'divergent()'
changeset: 12:6db5e282cb91