comparison mercurial/hg.py @ 542:eda4c32c167a

Merge with upstream -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with upstream manifest hash: 78c3657547aa957be685a4d54462570eb4b5e181 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxFpbW7P1GVgWeRoRAqWGAKCkLQPbZpdLCBWKD+pecMtTRiu9EACfbuz4 dtHuM/86dYZ6CRqQHohJVjk= =v+Vv -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 30 Jun 2005 21:47:23 +0100
parents 2f1de824798a aace5b681fe9
children 4fc63e22b1fe
comparison
equal deleted inserted replaced
541:abaea35387a8 542:eda4c32c167a
1012 while 1: 1012 while 1:
1013 f = getchunk() 1013 f = getchunk()
1014 if not f: break 1014 if not f: break
1015 self.ui.debug("adding %s revisions\n" % f) 1015 self.ui.debug("adding %s revisions\n" % f)
1016 fl = self.file(f) 1016 fl = self.file(f)
1017 o = fl.tip() 1017 o = fl.count()
1018 n = fl.addgroup(getgroup(), revmap, tr) 1018 n = fl.addgroup(getgroup(), revmap, tr)
1019 revisions += fl.rev(n) - fl.rev(o) 1019 revisions += fl.count() - o
1020 files += 1 1020 files += 1
1021 1021
1022 self.ui.status(("modified %d files, added %d changesets" + 1022 self.ui.status(("modified %d files, added %d changesets" +
1023 " and %d new revisions\n") 1023 " and %d new revisions\n")
1024 % (files, changesets, revisions)) 1024 % (files, changesets, revisions))