equal
deleted
inserted
replaced
5118 try: |
5118 try: |
5119 revs, checkout = hg.addbranchrevs(repo, other, branches, |
5119 revs, checkout = hg.addbranchrevs(repo, other, branches, |
5120 opts.get('rev')) |
5120 opts.get('rev')) |
5121 |
5121 |
5122 |
5122 |
|
5123 pullopargs = {} |
5123 if opts.get('bookmark'): |
5124 if opts.get('bookmark'): |
5124 if not revs: |
5125 if not revs: |
5125 revs = [] |
5126 revs = [] |
5126 # The list of bookmark used here is not the one used to actually |
5127 # The list of bookmark used here is not the one used to actually |
5127 # update the bookmark name. This can result in the revision pulled |
5128 # update the bookmark name. This can result in the revision pulled |
5150 "so a rev cannot be specified.") |
5151 "so a rev cannot be specified.") |
5151 raise util.Abort(err) |
5152 raise util.Abort(err) |
5152 |
5153 |
5153 modheads = exchange.pull(repo, other, heads=revs, |
5154 modheads = exchange.pull(repo, other, heads=revs, |
5154 force=opts.get('force'), |
5155 force=opts.get('force'), |
5155 bookmarks=opts.get('bookmark', ())).cgresult |
5156 bookmarks=opts.get('bookmark', ()), |
|
5157 opargs=pullopargs).cgresult |
5156 if checkout: |
5158 if checkout: |
5157 checkout = str(repo.changelog.rev(checkout)) |
5159 checkout = str(repo.changelog.rev(checkout)) |
5158 repo._subtoppath = source |
5160 repo._subtoppath = source |
5159 try: |
5161 try: |
5160 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) |
5162 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) |