Mercurial > public > mercurial-scm > hg
diff mercurial/bundle2.py @ 40147:58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Differential Revision: https://phab.mercurial-scm.org/D4933
| author | Taapas Agrawal <taapas2897@gmail.com> |
|---|---|
| date | Thu, 11 Oct 2018 03:38:23 +0530 |
| parents | 1ea80ac13f19 |
| children | af62936c2508 |
line wrap: on
line diff
--- a/mercurial/bundle2.py Thu Oct 11 07:27:24 2018 -0400 +++ b/mercurial/bundle2.py Thu Oct 11 03:38:23 2018 +0530 @@ -1900,11 +1900,11 @@ """ bookdata = bookmarks.binarydecode(inpart) - msgstandard = ('repository changed while pushing - please try again ' + msgstandard = ('remote repository changed while pushing - please try again ' '(bookmark "%s" move from %s to %s)') - msgmissing = ('repository changed while pushing - please try again ' + msgmissing = ('remote repository changed while pushing - please try again ' '(bookmark "%s" is missing, expected %s)') - msgexist = ('repository changed while pushing - please try again ' + msgexist = ('remote repository changed while pushing - please try again ' '(bookmark "%s" set on %s, expected missing)') for book, node in bookdata: currentnode = op.repo._bookmarks.get(book) @@ -1934,7 +1934,7 @@ if op.ui.configbool('experimental', 'bundle2lazylocking'): op.gettransaction() if sorted(heads) != sorted(op.repo.heads()): - raise error.PushRaced('repository changed while pushing - ' + raise error.PushRaced('remote repository changed while pushing - ' 'please try again') @parthandler('check:updated-heads') @@ -1963,7 +1963,7 @@ for h in heads: if h not in currentheads: - raise error.PushRaced('repository changed while pushing - ' + raise error.PushRaced('remote repository changed while pushing - ' 'please try again') @parthandler('check:phases') @@ -1976,7 +1976,7 @@ unfi = op.repo.unfiltered() cl = unfi.changelog phasecache = unfi._phasecache - msg = ('repository changed while pushing - please try again ' + msg = ('remote repository changed while pushing - please try again ' '(%s is %s expected %s)') for expectedphase, nodes in enumerate(phasetonodes): for n in nodes: