equal
deleted
inserted
replaced
1865 raise util.Abort(mso % ctx) |
1865 raise util.Abort(mso % ctx) |
1866 elif ctx.troubled(): |
1866 elif ctx.troubled(): |
1867 raise util.Abort(_(mst) |
1867 raise util.Abort(_(mst) |
1868 % (ctx.troubles()[0], |
1868 % (ctx.troubles()[0], |
1869 ctx)) |
1869 ctx)) |
|
1870 newbm = self.ui.configlist('bookmarks', 'pushing') |
1870 discovery.checkheads(unfi, remote, outgoing, |
1871 discovery.checkheads(unfi, remote, outgoing, |
1871 remoteheads, newbranch, |
1872 remoteheads, newbranch, |
1872 bool(inc)) |
1873 bool(inc), newbm) |
1873 |
1874 |
1874 # TODO: get bundlecaps from remote |
1875 # TODO: get bundlecaps from remote |
1875 bundlecaps = None |
1876 bundlecaps = None |
1876 # create a changegroup from local |
1877 # create a changegroup from local |
1877 if revs is None and not outgoing.excluded: |
1878 if revs is None and not outgoing.excluded: |