Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 1727:019e6a47a53e
fix names of parent changeset ids in hooks.
fix hook part of man page.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Thu, 16 Feb 2006 08:48:31 -0800 |
| parents | 56fb048b102c |
| children | d3e6da334b85 |
comparison
equal
deleted
inserted
replaced
| 1726:56fb048b102c | 1727:019e6a47a53e |
|---|---|
| 380 | 380 |
| 381 xp1 = hex(p1) | 381 xp1 = hex(p1) |
| 382 if p2 == nullid: xp2 = '' | 382 if p2 == nullid: xp2 = '' |
| 383 else: xp2 = hex(p2) | 383 else: xp2 = hex(p2) |
| 384 | 384 |
| 385 self.hook("precommit", throw=True, p1=xp1, p2=xp2) | 385 self.hook("precommit", throw=True, parent1=xp1, parent2=xp2) |
| 386 | 386 |
| 387 if not wlock: | 387 if not wlock: |
| 388 wlock = self.wlock() | 388 wlock = self.wlock() |
| 389 lock = self.lock() | 389 lock = self.lock() |
| 390 tr = self.transaction() | 390 tr = self.transaction() |
| 466 return None | 466 return None |
| 467 text = edittext | 467 text = edittext |
| 468 | 468 |
| 469 user = user or self.ui.username() | 469 user = user or self.ui.username() |
| 470 n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, user, date) | 470 n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, user, date) |
| 471 self.hook('pretxncommit', throw=True, node=hex(n), p1=xp1, p2=xp2) | 471 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
| 472 parent2=xp2) | |
| 472 tr.close() | 473 tr.close() |
| 473 | 474 |
| 474 self.dirstate.setparents(n) | 475 self.dirstate.setparents(n) |
| 475 self.dirstate.update(new, "n") | 476 self.dirstate.update(new, "n") |
| 476 self.dirstate.forget(remove) | 477 self.dirstate.forget(remove) |
| 477 | 478 |
| 478 self.hook("commit", node=hex(n), p1=xp1, p2=xp2) | 479 self.hook("commit", node=hex(n), parent1=xp1, parent2=xp2) |
| 479 return n | 480 return n |
| 480 | 481 |
| 481 def walk(self, node=None, files=[], match=util.always): | 482 def walk(self, node=None, files=[], match=util.always): |
| 482 if node: | 483 if node: |
| 483 fdict = dict.fromkeys(files) | 484 fdict = dict.fromkeys(files) |