Show More
@@ -465,8 +465,7 b' class localrepository(object):' | |||
|
465 | 465 | self.dirstate.update(new, "n") |
|
466 | 466 | self.dirstate.forget(remove) |
|
467 | 467 | |
|
468 |
|
|
|
469 | return None | |
|
468 | self.hook("commit", node=hex(n)) | |
|
470 | 469 | return n |
|
471 | 470 | |
|
472 | 471 | def walk(self, node=None, files=[], match=util.always): |
@@ -1380,16 +1379,11 b' class localrepository(object):' | |||
|
1380 | 1379 | tr.close() |
|
1381 | 1380 | |
|
1382 | 1381 | if changesets > 0: |
|
1383 |
|
|
|
1384 | node=hex(self.changelog.node(cor+1))): | |
|
1385 | self.ui.warn(_("abort: changegroup hook returned failure!\n")) | |
|
1386 | return 1 | |
|
1382 | self.hook("changegroup", node=hex(self.changelog.node(cor+1))) | |
|
1387 | 1383 | |
|
1388 | 1384 | for i in range(cor + 1, cnr + 1): |
|
1389 | 1385 | self.hook("incoming", node=hex(self.changelog.node(i))) |
|
1390 | 1386 | |
|
1391 | return | |
|
1392 | ||
|
1393 | 1387 | def update(self, node, allow=False, force=False, choose=None, |
|
1394 | 1388 | moddirstate=True, forcemerge=False, wlock=None): |
|
1395 | 1389 | pl = self.dirstate.parents() |
General Comments 0
You need to be logged in to leave comments.
Login now