Mercurial > public > mercurial-scm > hg
comparison mercurial/hg.py @ 772:f05deda58457
Make pull count jargon less confusing
revisions are now synonymous with changesets, and not file changes
author | mpm@selenic.com |
---|---|
date | Mon, 25 Jul 2005 12:02:29 -0500 |
parents | 20e95c245bc3 |
children | 5cb8a3a023b2 |
comparison
equal
deleted
inserted
replaced
771:0de223012086 | 772:f05deda58457 |
---|---|
1276 self.ui.status("adding manifests\n") | 1276 self.ui.status("adding manifests\n") |
1277 mm = self.manifest.tip() | 1277 mm = self.manifest.tip() |
1278 mo = self.manifest.addgroup(getgroup(), revmap, tr) | 1278 mo = self.manifest.addgroup(getgroup(), revmap, tr) |
1279 | 1279 |
1280 # process the files | 1280 # process the files |
1281 self.ui.status("adding file revisions\n") | 1281 self.ui.status("adding file changes\n") |
1282 while 1: | 1282 while 1: |
1283 f = getchunk() | 1283 f = getchunk() |
1284 if not f: break | 1284 if not f: break |
1285 self.ui.debug("adding %s revisions\n" % f) | 1285 self.ui.debug("adding %s revisions\n" % f) |
1286 fl = self.file(f) | 1286 fl = self.file(f) |
1287 o = fl.count() | 1287 o = fl.count() |
1288 n = fl.addgroup(getgroup(), revmap, tr) | 1288 n = fl.addgroup(getgroup(), revmap, tr) |
1289 revisions += fl.count() - o | 1289 revisions += fl.count() - o |
1290 files += 1 | 1290 files += 1 |
1291 | 1291 |
1292 self.ui.status(("modified %d files, added %d changesets" + | 1292 self.ui.status(("added %d changesets" + |
1293 " and %d new revisions\n") | 1293 " with %d changes to %d files\n") |
1294 % (files, changesets, revisions)) | 1294 % (changesets, revisions, files)) |
1295 | 1295 |
1296 tr.close() | 1296 tr.close() |
1297 return | 1297 return |
1298 | 1298 |
1299 def update(self, node, allow=False, force=False, choose=None, | 1299 def update(self, node, allow=False, force=False, choose=None, |