Mercurial > hg

comparison mercurial/repair.py @ 21064:4d9d490d7bbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: add a ui argument to readbundle The bundle2 unbundler needs a ui argument. We are now passing this information to `readbundle`.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 14 Apr 2014 15:45:30 -0400
parents 7ca4f2049d3b
children 445472225ccd
comparison
equal deleted inserted replaced
21063:7ca4f2049d3b 21064:4d9d490d7bbe
145 raise 145 raise
146 146
147 if saveheads or savebases: 147 if saveheads or savebases:
148 ui.note(_("adding branch\n")) 148 ui.note(_("adding branch\n"))
149 f = vfs.open(chgrpfile, "rb") 149 f = vfs.open(chgrpfile, "rb")
150 gen = exchange.readbundle(f, chgrpfile, vfs) 150 gen = exchange.readbundle(ui, f, chgrpfile, vfs)
151 if not repo.ui.verbose: 151 if not repo.ui.verbose:
152 # silence internal shuffling chatter 152 # silence internal shuffling chatter
153 repo.ui.pushbuffer() 153 repo.ui.pushbuffer()
154 changegroup.addchangegroup(repo, gen, 'strip', 154 changegroup.addchangegroup(repo, gen, 'strip',
155 'bundle:' + vfs.join(chgrpfile), True) 155 'bundle:' + vfs.join(chgrpfile), True)