##// END OF EJS Templates
wireproto: clarify cryptic 'remote: unsynced changes' error message on push...
Mads Kiilerich -
r18957:6b618aa0 default
parent child Browse files
Show More
@@ -602,7 +602,8 b' def unbundle(repo, proto, heads):'
602
602
603 # fail early if possible
603 # fail early if possible
604 if not check_heads():
604 if not check_heads():
605 return pusherr('unsynced changes')
605 return pusherr('repository changed while preparing changes - '
606 'please try again')
606
607
607 # write bundle data to temporary file because it can be big
608 # write bundle data to temporary file because it can be big
608 fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
609 fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
@@ -615,7 +616,8 b' def unbundle(repo, proto, heads):'
615 if not check_heads():
616 if not check_heads():
616 # someone else committed/pushed/unbundled while we
617 # someone else committed/pushed/unbundled while we
617 # were transferring data
618 # were transferring data
618 return pusherr('unsynced changes')
619 return pusherr('repository changed while uploading changes - '
620 'please try again')
619
621
620 # push can proceed
622 # push can proceed
621 fp.seek(0)
623 fp.seek(0)
@@ -35,17 +35,17 b' test preparation'
35 1 changesets found
35 1 changesets found
36 $ CONTENT_LENGTH=279; export CONTENT_LENGTH;
36 $ CONTENT_LENGTH=279; export CONTENT_LENGTH;
37
37
38 expect unsynced changes
38 expect failure because heads doesn't match (formerly known as 'unsynced changes')
39
39
40 $ QUERY_STRING="cmd=unbundle&heads=0000000000000000000000000000000000000000"; export QUERY_STRING
40 $ QUERY_STRING="cmd=unbundle&heads=0000000000000000000000000000000000000000"; export QUERY_STRING
41 $ python hgweb.cgi <bundle.hg >page1 2>&1
41 $ python hgweb.cgi <bundle.hg >page1 2>&1
42 $ cat page1
42 $ cat page1
43 Status: 200 Script output follows\r (esc)
43 Status: 200 Script output follows\r (esc)
44 Content-Type: application/mercurial-0.1\r (esc)
44 Content-Type: application/mercurial-0.1\r (esc)
45 Content-Length: 19\r (esc)
45 Content-Length: 64\r (esc)
46 \r (esc)
46 \r (esc)
47 0
47 0
48 unsynced changes
48 repository changed while preparing changes - please try again
49
49
50 successful force push
50 successful force push
51
51
General Comments 0
You need to be logged in to leave comments. Login now