##// END OF EJS Templates
push: return 1 if no changes found (issue3228)...
Matt Mackall -
r16023:90f8b8dd stable
parent child Browse files
Show More
@@ -4426,7 +4426,7 b' def push(ui, repo, dest=None, **opts):'
4426 result = repo.push(other, opts.get('force'), revs=revs,
4426 result = repo.push(other, opts.get('force'), revs=revs,
4427 newbranch=opts.get('new_branch'))
4427 newbranch=opts.get('new_branch'))
4428
4428
4429 result = (result == 0)
4429 result = not result
4430
4430
4431 if opts.get('bookmark'):
4431 if opts.get('bookmark'):
4432 rb = other.listkeys('bookmarks')
4432 rb = other.listkeys('bookmarks')
@@ -1592,7 +1592,8 b' class localrepository(repo.repository):'
1592 def push(self, remote, force=False, revs=None, newbranch=False):
1592 def push(self, remote, force=False, revs=None, newbranch=False):
1593 '''Push outgoing changesets (limited by revs) from the current
1593 '''Push outgoing changesets (limited by revs) from the current
1594 repository to remote. Return an integer:
1594 repository to remote. Return an integer:
1595 - 0 means HTTP error *or* nothing to push
1595 - None means nothing to push
1596 - 0 means HTTP error
1596 - 1 means we pushed and remote head count is unchanged *or*
1597 - 1 means we pushed and remote head count is unchanged *or*
1597 we have outgoing changesets but refused to push
1598 we have outgoing changesets but refused to push
1598 - other values as described by addchangegroup()
1599 - other values as described by addchangegroup()
@@ -1626,7 +1627,7 b' class localrepository(repo.repository):'
1626 if not outgoing.missing:
1627 if not outgoing.missing:
1627 # nothing to push
1628 # nothing to push
1628 scmutil.nochangesfound(self.ui, outgoing.excluded)
1629 scmutil.nochangesfound(self.ui, outgoing.excluded)
1629 ret = 1
1630 ret = None
1630 else:
1631 else:
1631 # something to push
1632 # something to push
1632 if not force:
1633 if not force:
@@ -173,6 +173,7 b' Pushing applied patch with --force'
173 pushing to ../forcepush2
173 pushing to ../forcepush2
174 searching for changes
174 searching for changes
175 no changes found (ignored 1 secret changesets)
175 no changes found (ignored 1 secret changesets)
176 [1]
176 $ hg phase --draft 'mq()'
177 $ hg phase --draft 'mq()'
177 $ hg push --force -r default ../forcepush2
178 $ hg push --force -r default ../forcepush2
178 pushing to ../forcepush2
179 pushing to ../forcepush2
@@ -98,6 +98,7 b' push from alpha to beta should update ph'
98 pushing to ../beta
98 pushing to ../beta
99 searching for changes
99 searching for changes
100 no changes found
100 no changes found
101 [1]
101 $ hgph
102 $ hgph
102 @ 3 public a-D - b555f63b6063
103 @ 3 public a-D - b555f63b6063
103 |
104 |
@@ -372,6 +373,7 b' Push back to alpha'
372 pushing to ../alpha
373 pushing to ../alpha
373 searching for changes
374 searching for changes
374 no changes found
375 no changes found
376 [1]
375 $ cd ..
377 $ cd ..
376 $ cd alpha
378 $ cd alpha
377 $ hgph
379 $ hgph
@@ -555,6 +557,7 b' Pushing to Publish=True (common changese'
555 pushing to ../alpha
557 pushing to ../alpha
556 searching for changes
558 searching for changes
557 no changes found
559 no changes found
560 [1]
558 $ hgph
561 $ hgph
559 o 6 public a-F - b740e3e5c05d
562 o 6 public a-F - b740e3e5c05d
560 |
563 |
@@ -659,6 +662,7 b' Pushing to Publish=True (common changese'
659 pushing to ../alpha
662 pushing to ../alpha
660 searching for changes
663 searching for changes
661 no changes found
664 no changes found
665 [1]
662 $ hgph
666 $ hgph
663 o 9 public a-H - 967b449fbc94
667 o 9 public a-H - 967b449fbc94
664 |
668 |
@@ -932,6 +936,7 b' check that secret local on both side are'
932 pushing to http://localhost:$HGPORT/
936 pushing to http://localhost:$HGPORT/
933 searching for changes
937 searching for changes
934 no changes found
938 no changes found
939 [1]
935 $ hg phase f54f1bb90ff3
940 $ hg phase f54f1bb90ff3
936 2: draft
941 2: draft
937
942
@@ -116,6 +116,7 b''
116 pushing to ../c
116 pushing to ../c
117 searching for changes
117 searching for changes
118 no changes found
118 no changes found
119 [1]
119
120
120 $ hg push -r 3 ../c
121 $ hg push -r 3 ../c
121 pushing to ../c
122 pushing to ../c
@@ -185,6 +185,7 b' test pushkeys and bookmarks'
185 searching for changes
185 searching for changes
186 no changes found
186 no changes found
187 updating bookmark foo
187 updating bookmark foo
188 [1]
188 $ hg book -d foo
189 $ hg book -d foo
189 $ hg in -B
190 $ hg in -B
190 comparing with ssh://user@dummy/remote
191 comparing with ssh://user@dummy/remote
@@ -96,6 +96,7 b' subrepo paths with ssh urls'
96 no changes found
96 no changes found
97 searching for changes
97 searching for changes
98 no changes found
98 no changes found
99 [1]
99
100
100 $ cat dummylog
101 $ cat dummylog
101 Got arguments 1:user@dummy 2:hg -R cloned serve --stdio
102 Got arguments 1:user@dummy 2:hg -R cloned serve --stdio
@@ -51,6 +51,7 b' Both are empty:'
51 $ hg push -R empty1 $remote
51 $ hg push -R empty1 $remote
52 pushing to http://localhost:$HGPORT/
52 pushing to http://localhost:$HGPORT/
53 no changes found
53 no changes found
54 [1]
54 $ tstop
55 $ tstop
55
56
56 Base repo:
57 Base repo:
@@ -110,6 +111,7 b' Full clone:'
110 pushing to http://localhost:$HGPORT/
111 pushing to http://localhost:$HGPORT/
111 searching for changes
112 searching for changes
112 no changes found
113 no changes found
114 [1]
113 $ cd ..
115 $ cd ..
114
116
115 Local is empty:
117 Local is empty:
@@ -140,6 +142,7 b' Local is empty:'
140 $ hg push $remote
142 $ hg push $remote
141 pushing to http://localhost:$HGPORT/
143 pushing to http://localhost:$HGPORT/
142 no changes found
144 no changes found
145 [1]
143 $ hg pull $remote
146 $ hg pull $remote
144 pulling from http://localhost:$HGPORT/
147 pulling from http://localhost:$HGPORT/
145 requesting all changes
148 requesting all changes
@@ -184,6 +187,7 b' Local is subset:'
184 pushing to http://localhost:$HGPORT/
187 pushing to http://localhost:$HGPORT/
185 searching for changes
188 searching for changes
186 no changes found
189 no changes found
190 [1]
187 $ hg pull $remote
191 $ hg pull $remote
188 pulling from http://localhost:$HGPORT/
192 pulling from http://localhost:$HGPORT/
189 searching for changes
193 searching for changes
@@ -45,6 +45,7 b' Both are empty:'
45 $ hg push -R empty1 $remote
45 $ hg push -R empty1 $remote
46 pushing to http://localhost:$HGPORT/
46 pushing to http://localhost:$HGPORT/
47 no changes found
47 no changes found
48 [1]
48 $ tstop
49 $ tstop
49
50
50 Base repo:
51 Base repo:
@@ -104,6 +105,7 b' Full clone:'
104 pushing to http://localhost:$HGPORT/
105 pushing to http://localhost:$HGPORT/
105 searching for changes
106 searching for changes
106 no changes found
107 no changes found
108 [1]
107 $ cd ..
109 $ cd ..
108
110
109 Local is empty:
111 Local is empty:
@@ -130,6 +132,7 b' Local is empty:'
130 $ hg push $remote
132 $ hg push $remote
131 pushing to http://localhost:$HGPORT/
133 pushing to http://localhost:$HGPORT/
132 no changes found
134 no changes found
135 [1]
133 $ hg pull $remote
136 $ hg pull $remote
134 pulling from http://localhost:$HGPORT/
137 pulling from http://localhost:$HGPORT/
135 requesting all changes
138 requesting all changes
@@ -172,6 +175,7 b' Local is subset:'
172 pushing to http://localhost:$HGPORT/
175 pushing to http://localhost:$HGPORT/
173 searching for changes
176 searching for changes
174 no changes found
177 no changes found
178 [1]
175 $ hg pull $remote
179 $ hg pull $remote
176 pulling from http://localhost:$HGPORT/
180 pulling from http://localhost:$HGPORT/
177 searching for changes
181 searching for changes
General Comments 0
You need to be logged in to leave comments. Login now