facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

obsolete: simplify push abort message

Browse Source 
to:   push includes xxx changeset: yyyyyyyyyy
This commit is contained in:
push includes an xxx changeset: yyyyyyyyyy 2012-10-19 00:46:39 +02:00
parent b3f5aa66c1
commit 8af08441ab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/localrepo.py
View File

@ -1870,8 +1870,8 @@ class localrepository(object):
# then, save the iteration
if self.obsstore:
# this message are here for 80 char limit reason
mso = _("push includes an obsolete changeset: %s!")
msu = _("push includes an unstable changeset: %s!")
mso = _("push includes obsolete changeset: %s!")
msu = _("push includes unstable changeset: %s!")
# If we are to push if there is at least one
# obsolete or unstable changeset in missing, at
# least one of the missinghead will be obsolete or

4
tests/test-obsolete.t
View File

@ -453,7 +453,7 @@ refuse to push obsolete changeset
$ hg push ../tmpc/ -r 'desc("original_d")'
pushing to ../tmpc/
searching for changes
abort: push includes an obsolete changeset: 94b33453f93b!
abort: push includes obsolete changeset: 94b33453f93b!
[255]
refuse to push unstable changeset
@ -461,7 +461,7 @@ refuse to push unstable changeset
$ hg push ../tmpc/
pushing to ../tmpc/
searching for changes
abort: push includes an unstable changeset: cda648ca50f5!
abort: push includes unstable changeset: cda648ca50f5!
[255]
Test that extinct changeset are properly detected