##// END OF EJS Templates
Fix traceback when nothing was added during unbundle...
Benoit Boissinot -
r1375:f2b00be3 default
parent child Browse files
Show More
@@ -992,6 +992,8 b' class localrepository:'
992 co = self.changelog.tip()
992 co = self.changelog.tip()
993 cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique
993 cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique
994 cnr, cor = map(self.changelog.rev, (cn, co))
994 cnr, cor = map(self.changelog.rev, (cn, co))
995 if cn == nullid:
996 cnr = cor
995 changesets = cnr - cor
997 changesets = cnr - cor
996
998
997 # pull off the manifest group
999 # pull off the manifest group
@@ -1022,12 +1024,14 b' class localrepository:'
1022
1024
1023 tr.close()
1025 tr.close()
1024
1026
1025 if not self.hook("changegroup", node=hex(self.changelog.node(cor+1))):
1027 if changesets > 0:
1026 self.ui.warn("abort: changegroup hook returned failure!\n")
1028 if not self.hook("changegroup",
1027 return 1
1029 node=hex(self.changelog.node(cor+1))):
1030 self.ui.warn("abort: changegroup hook returned failure!\n")
1031 return 1
1028
1032
1029 for i in range(cor + 1, cnr + 1):
1033 for i in range(cor + 1, cnr + 1):
1030 self.hook("commit", node=hex(self.changelog.node(i)))
1034 self.hook("commit", node=hex(self.changelog.node(i)))
1031
1035
1032 return
1036 return
1033
1037
General Comments 0
You need to be logged in to leave comments. Login now