Show More
@@ -174,9 +174,9 b' def prepush(repo, remote, force, revs, n' | |||||
174 | hint = _("did you forget to merge? " |
|
174 | hint = _("did you forget to merge? " | |
175 | "use push -f to force") |
|
175 | "use push -f to force") | |
176 | if branch is not None: |
|
176 | if branch is not None: | |
177 | repo.ui.note("new remote heads on branch '%s'\n" % branch) |
|
177 | repo.ui.note(_("new remote heads on branch '%s'\n") % branch) | |
178 | for h in dhs: |
|
178 | for h in dhs: | |
179 | repo.ui.note("new remote head %s\n" % short(h)) |
|
179 | repo.ui.note(_("new remote head %s\n") % short(h)) | |
180 | if error: |
|
180 | if error: | |
181 | raise util.Abort(error, hint=hint) |
|
181 | raise util.Abort(error, hint=hint) | |
182 |
|
182 |
@@ -124,7 +124,7 b' def _runcatch(req):' | |||||
124 | ui.warn(_("hg: %s\n") % inst.args[1]) |
|
124 | ui.warn(_("hg: %s\n") % inst.args[1]) | |
125 | commands.help_(ui, 'shortlist') |
|
125 | commands.help_(ui, 'shortlist') | |
126 | except error.OutOfBandError, inst: |
|
126 | except error.OutOfBandError, inst: | |
127 | ui.warn("abort: remote error:\n") |
|
127 | ui.warn(_("abort: remote error:\n")) | |
128 | ui.warn(''.join(inst.args)) |
|
128 | ui.warn(''.join(inst.args)) | |
129 | except error.RepoError, inst: |
|
129 | except error.RepoError, inst: | |
130 | ui.warn(_("abort: %s!\n") % inst) |
|
130 | ui.warn(_("abort: %s!\n") % inst) |
@@ -128,7 +128,7 b' def findcommonheads(ui, local, remote,' | |||||
128 | return (srvheadhashes, False, srvheadhashes,) |
|
128 | return (srvheadhashes, False, srvheadhashes,) | |
129 |
|
129 | |||
130 | if sample and util.all(yesno): |
|
130 | if sample and util.all(yesno): | |
131 | ui.note("all local heads known remotely\n") |
|
131 | ui.note(_("all local heads known remotely\n")) | |
132 | ownheadhashes = dag.externalizeall(ownheads) |
|
132 | ownheadhashes = dag.externalizeall(ownheads) | |
133 | return (ownheadhashes, True, srvheadhashes,) |
|
133 | return (ownheadhashes, True, srvheadhashes,) | |
134 |
|
134 | |||
@@ -158,7 +158,7 b' def findcommonheads(ui, local, remote,' | |||||
158 | break |
|
158 | break | |
159 |
|
159 | |||
160 | if full: |
|
160 | if full: | |
161 | ui.note("sampling from both directions\n") |
|
161 | ui.note(_("sampling from both directions\n")) | |
162 | sample = _takefullsample(dag, undecided, size=fullsamplesize) |
|
162 | sample = _takefullsample(dag, undecided, size=fullsamplesize) | |
163 | elif common: |
|
163 | elif common: | |
164 | # use cheapish initial sample |
|
164 | # use cheapish initial sample |
General Comments 0
You need to be logged in to leave comments.
Login now