Mercurial > public > mercurial-scm > hg

comparison mercurial/exchange.py @ 23217:2f12ac53b528

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
exchange: fix indentation in _pullchangeset
author Mike Edgar <adgar@google.com>
date Sat, 25 Oct 2014 00:40:51 -0400
parents f606e07fa148
children 0e78ea8e592a
comparison
equal deleted inserted replaced
23216:4e5ac4a3a29b 23217:2f12ac53b528
1012 # rollback call 1012 # rollback call
1013 if 'changegroup' in pullop.stepsdone: 1013 if 'changegroup' in pullop.stepsdone:
1014 return 1014 return
1015 pullop.stepsdone.add('changegroup') 1015 pullop.stepsdone.add('changegroup')
1016 if not pullop.fetch: 1016 if not pullop.fetch:
1017 pullop.repo.ui.status(_("no changes found\n")) 1017 pullop.repo.ui.status(_("no changes found\n"))
1018 pullop.cgresult = 0 1018 pullop.cgresult = 0
1019 return 1019 return
1020 pullop.gettransaction() 1020 pullop.gettransaction()
1021 if pullop.heads is None and list(pullop.common) == [nullid]: 1021 if pullop.heads is None and list(pullop.common) == [nullid]:
1022 pullop.repo.ui.status(_("requesting all changes\n")) 1022 pullop.repo.ui.status(_("requesting all changes\n"))
1023 elif pullop.heads is None and pullop.remote.capable('changegroupsubset'): 1023 elif pullop.heads is None and pullop.remote.capable('changegroupsubset'):
1024 # issue1320, avoid a race if remote changed after discovery 1024 # issue1320, avoid a race if remote changed after discovery