Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 2424:092039246d73
Report on push/pull if heads are merged, too, like for new heads.
Use case: If a remote repo has two heads and I _want_ to merge them, I merge
and push. Meanwhile someone else pushed on top of one of the heads. He won't
get a warning, because he doesn't create a new head, I won't notice that I
don't close a head, because I don't get a message telling me.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sat, 10 Jun 2006 17:39:29 +0200 |
| parents | 8ed45fb1053a |
| children | e8c4f3d3df8c |
comparison
equal
deleted
inserted
replaced
| 2423:f328e8aeff8b | 2424:092039246d73 |
|---|---|
| 1548 self.changelog = changelog.changelog(self.opener, self.changelog.version) | 1548 self.changelog = changelog.changelog(self.opener, self.changelog.version) |
| 1549 self.changelog.checkinlinesize(tr) | 1549 self.changelog.checkinlinesize(tr) |
| 1550 | 1550 |
| 1551 newheads = len(self.changelog.heads()) | 1551 newheads = len(self.changelog.heads()) |
| 1552 heads = "" | 1552 heads = "" |
| 1553 if oldheads and newheads > oldheads: | 1553 if oldheads and newheads != oldheads: |
| 1554 heads = _(" (+%d heads)") % (newheads - oldheads) | 1554 heads = _(" (%+d heads)") % (newheads - oldheads) |
| 1555 | 1555 |
| 1556 self.ui.status(_("added %d changesets" | 1556 self.ui.status(_("added %d changesets" |
| 1557 " with %d changes to %d files%s\n") | 1557 " with %d changes to %d files%s\n") |
| 1558 % (changesets, revisions, files, heads)) | 1558 % (changesets, revisions, files, heads)) |
| 1559 | 1559 |