##// END OF EJS Templates
subrepo: make the output references to subrepositories consistent...
Matt Harbison -
r33365:6d88468d default
parent child Browse files
Show More
@@ -73,7 +73,7 b' def annotatesubrepoerror(func):'
73 raise ex
73 raise ex
74 except error.Abort as ex:
74 except error.Abort as ex:
75 subrepo = subrelpath(self)
75 subrepo = subrelpath(self)
76 errormsg = str(ex) + ' ' + _('(in subrepo %s)') % subrepo
76 errormsg = str(ex) + ' ' + _('(in subrepository "%s")') % subrepo
77 # avoid handling this exception by raising a SubrepoAbort exception
77 # avoid handling this exception by raising a SubrepoAbort exception
78 raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo,
78 raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo,
79 cause=sys.exc_info())
79 cause=sys.exc_info())
@@ -147,7 +147,7 b' def state(ctx, ui):'
147 kind = 'hg'
147 kind = 'hg'
148 if src.startswith('['):
148 if src.startswith('['):
149 if ']' not in src:
149 if ']' not in src:
150 raise error.Abort(_('missing ] in subrepo source'))
150 raise error.Abort(_('missing ] in subrepository source'))
151 kind, src = src.split(']', 1)
151 kind, src = src.split(']', 1)
152 kind = kind[1:]
152 kind = kind[1:]
153 src = src.lstrip() # strip any extra whitespace after ']'
153 src = src.lstrip() # strip any extra whitespace after ']'
@@ -477,7 +477,7 b' class abstractsubrepo(object):'
477 This returns None, otherwise.
477 This returns None, otherwise.
478 """
478 """
479 if self.dirty(ignoreupdate=ignoreupdate, missing=missing):
479 if self.dirty(ignoreupdate=ignoreupdate, missing=missing):
480 return _("uncommitted changes in subrepository '%s'"
480 return _('uncommitted changes in subrepository "%s"'
481 ) % subrelpath(self)
481 ) % subrelpath(self)
482
482
483 def bailifchanged(self, ignoreupdate=False, hint=None):
483 def bailifchanged(self, ignoreupdate=False, hint=None):
@@ -896,7 +896,7 b' class hgsubrepo(abstractsubrepo):'
896 ctx = urepo[revision]
896 ctx = urepo[revision]
897 if ctx.hidden():
897 if ctx.hidden():
898 urepo.ui.warn(
898 urepo.ui.warn(
899 _('revision %s in subrepo %s is hidden\n') \
899 _('revision %s in subrepository "%s" is hidden\n') \
900 % (revision[0:12], self._path))
900 % (revision[0:12], self._path))
901 repo = urepo
901 repo = urepo
902 hg.updaterepo(repo, revision, overwrite)
902 hg.updaterepo(repo, revision, overwrite)
@@ -910,12 +910,14 b' class hgsubrepo(abstractsubrepo):'
910
910
911 def mergefunc():
911 def mergefunc():
912 if anc == cur and dst.branch() == cur.branch():
912 if anc == cur and dst.branch() == cur.branch():
913 self.ui.debug("updating subrepo %s\n" % subrelpath(self))
913 self.ui.debug('updating subrepository "%s"\n'
914 % subrelpath(self))
914 hg.update(self._repo, state[1])
915 hg.update(self._repo, state[1])
915 elif anc == dst:
916 elif anc == dst:
916 self.ui.debug("skipping subrepo %s\n" % subrelpath(self))
917 self.ui.debug('skipping subrepository "%s"\n'
918 % subrelpath(self))
917 else:
919 else:
918 self.ui.debug("merging subrepo %s\n" % subrelpath(self))
920 self.ui.debug('merging subrepository "%s"\n' % subrelpath(self))
919 hg.merge(self._repo, state[1], remind=False)
921 hg.merge(self._repo, state[1], remind=False)
920
922
921 wctx = self._repo[None]
923 wctx = self._repo[None]
@@ -1555,8 +1557,8 b' class gitsubrepo(abstractsubrepo):'
1555 # try only origin: the originally cloned repo
1557 # try only origin: the originally cloned repo
1556 self._gitcommand(['fetch'])
1558 self._gitcommand(['fetch'])
1557 if not self._githavelocally(revision):
1559 if not self._githavelocally(revision):
1558 raise error.Abort(_("revision %s does not exist in subrepo %s\n") %
1560 raise error.Abort(_('revision %s does not exist in subrepository '
1559 (revision, self._relpath))
1561 '"%s"\n') % (revision, self._relpath))
1560
1562
1561 @annotatesubrepoerror
1563 @annotatesubrepoerror
1562 def dirty(self, ignoreupdate=False, missing=False):
1564 def dirty(self, ignoreupdate=False, missing=False):
@@ -1611,8 +1613,8 b' class gitsubrepo(abstractsubrepo):'
1611
1613
1612 def rawcheckout():
1614 def rawcheckout():
1613 # no branch to checkout, check it out with no branch
1615 # no branch to checkout, check it out with no branch
1614 self.ui.warn(_('checking out detached HEAD in subrepo %s\n') %
1616 self.ui.warn(_('checking out detached HEAD in '
1615 self._relpath)
1617 'subrepository "%s"\n') % self._relpath)
1616 self.ui.warn(_('check out a git branch if you intend '
1618 self.ui.warn(_('check out a git branch if you intend '
1617 'to make changes\n'))
1619 'to make changes\n'))
1618 checkout(['-q', revision])
1620 checkout(['-q', revision])
@@ -1731,14 +1733,14 b' class gitsubrepo(abstractsubrepo):'
1731 # determine if the current branch is even useful
1733 # determine if the current branch is even useful
1732 if not self._gitisancestor(self._state[1], current):
1734 if not self._gitisancestor(self._state[1], current):
1733 self.ui.warn(_('unrelated git branch checked out '
1735 self.ui.warn(_('unrelated git branch checked out '
1734 'in subrepo %s\n') % self._relpath)
1736 'in subrepository "%s"\n') % self._relpath)
1735 return False
1737 return False
1736 self.ui.status(_('pushing branch %s of subrepo %s\n') %
1738 self.ui.status(_('pushing branch %s of subrepository "%s"\n') %
1737 (current.split('/', 2)[2], self._relpath))
1739 (current.split('/', 2)[2], self._relpath))
1738 ret = self._gitdir(cmd + ['origin', current])
1740 ret = self._gitdir(cmd + ['origin', current])
1739 return ret[1] == 0
1741 return ret[1] == 0
1740 else:
1742 else:
1741 self.ui.warn(_('no branch checked out in subrepo %s\n'
1743 self.ui.warn(_('no branch checked out in subrepository "%s"\n'
1742 'cannot push revision %s\n') %
1744 'cannot push revision %s\n') %
1743 (self._relpath, self._state[1]))
1745 (self._relpath, self._state[1]))
1744 return False
1746 return False
@@ -375,7 +375,7 b' test saving last-message.txt'
375 HG: changed changed
375 HG: changed changed
376 HG: removed removed
376 HG: removed removed
377 ====
377 ====
378 abort: precommit.test-saving-last-message hook exited with status 1 (in subrepo sub)
378 abort: precommit.test-saving-last-message hook exited with status 1 (in subrepository "sub")
379 [255]
379 [255]
380 $ cat .hg/last-message.txt
380 $ cat .hg/last-message.txt
381
381
@@ -270,7 +270,7 b' verify that large files in subrepos hand'
270 update: (current)
270 update: (current)
271 phases: 3 draft
271 phases: 3 draft
272 $ hg ci -m "this commit should fail without -S"
272 $ hg ci -m "this commit should fail without -S"
273 abort: uncommitted changes in subrepository 'subrepo'
273 abort: uncommitted changes in subrepository "subrepo"
274 (use --subrepos for recursive commit)
274 (use --subrepos for recursive commit)
275 [255]
275 [255]
276
276
@@ -21,7 +21,7 b''
21 Should fail, since there are added files to subrepo:
21 Should fail, since there are added files to subrepo:
22
22
23 $ hg merge
23 $ hg merge
24 abort: uncommitted changes in subrepository 'subrepo'
24 abort: uncommitted changes in subrepository "subrepo"
25 [255]
25 [255]
26
26
27 Deleted files trigger a '+' marker in top level repos. Deleted files are also
27 Deleted files trigger a '+' marker in top level repos. Deleted files are also
@@ -80,7 +80,7 b' Modified subrepo files are noticed by `u'
80 M subrepo/b
80 M subrepo/b
81
81
82 $ hg up -r '.^' --check
82 $ hg up -r '.^' --check
83 abort: uncommitted changes in subrepository 'subrepo'
83 abort: uncommitted changes in subrepository "subrepo"
84 [255]
84 [255]
85
85
86 $ hg sum
86 $ hg sum
@@ -103,7 +103,7 b' discrete unit, then this should probably'
103 missing file in the top level repo.
103 missing file in the top level repo.
104
104
105 $ hg up -r '.^' --check
105 $ hg up -r '.^' --check
106 abort: uncommitted changes in subrepository 'subrepo'
106 abort: uncommitted changes in subrepository "subrepo"
107 [255]
107 [255]
108
108
109 $ hg up -r '.^' --config ui.interactive=True << EOF
109 $ hg up -r '.^' --config ui.interactive=True << EOF
@@ -126,5 +126,5 b' missing file in the top level repo.'
126 Merge sees deleted subrepo files as an uncommitted change
126 Merge sees deleted subrepo files as an uncommitted change
127
127
128 $ hg merge @other
128 $ hg merge @other
129 abort: uncommitted changes in subrepository 'subrepo'
129 abort: uncommitted changes in subrepository "subrepo"
130 [255]
130 [255]
@@ -47,7 +47,7 b' qnew on repo w/svn subrepo'
47 $ cd ..
47 $ cd ..
48 $ hg status -S # doesn't show status for svn subrepos (yet)
48 $ hg status -S # doesn't show status for svn subrepos (yet)
49 $ hg qnew -m1 1.diff
49 $ hg qnew -m1 1.diff
50 abort: uncommitted changes in subrepository 'sub'
50 abort: uncommitted changes in subrepository "sub"
51 [255]
51 [255]
52
52
53 $ cd ..
53 $ cd ..
@@ -102,7 +102,7 b' handle subrepos safely on qnew'
102 A .hgsub
102 A .hgsub
103 A sub/a
103 A sub/a
104 % qnew -X path:no-effect -m0 0.diff
104 % qnew -X path:no-effect -m0 0.diff
105 abort: uncommitted changes in subrepository 'sub'
105 abort: uncommitted changes in subrepository "sub"
106 [255]
106 [255]
107 % update substate when adding .hgsub w/clean updated subrepo
107 % update substate when adding .hgsub w/clean updated subrepo
108 A .hgsub
108 A .hgsub
@@ -118,7 +118,7 b' handle subrepos safely on qnew'
118 M .hgsub
118 M .hgsub
119 A sub2/a
119 A sub2/a
120 % qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff
120 % qnew --cwd .. -R repo-2499-qnew -X path:no-effect -m1 1.diff
121 abort: uncommitted changes in subrepository 'sub2'
121 abort: uncommitted changes in subrepository "sub2"
122 [255]
122 [255]
123 % update substate when modifying .hgsub w/clean updated subrepo
123 % update substate when modifying .hgsub w/clean updated subrepo
124 M .hgsub
124 M .hgsub
@@ -163,7 +163,7 b' handle subrepos safely on qrefresh'
163 A .hgsub
163 A .hgsub
164 A sub/a
164 A sub/a
165 % qrefresh
165 % qrefresh
166 abort: uncommitted changes in subrepository 'sub'
166 abort: uncommitted changes in subrepository "sub"
167 [255]
167 [255]
168 % update substate when adding .hgsub w/clean updated subrepo
168 % update substate when adding .hgsub w/clean updated subrepo
169 A .hgsub
169 A .hgsub
@@ -180,7 +180,7 b' handle subrepos safely on qrefresh'
180 M .hgsub
180 M .hgsub
181 A sub2/a
181 A sub2/a
182 % qrefresh
182 % qrefresh
183 abort: uncommitted changes in subrepository 'sub2'
183 abort: uncommitted changes in subrepository "sub2"
184 [255]
184 [255]
185 % update substate when modifying .hgsub w/clean updated subrepo
185 % update substate when modifying .hgsub w/clean updated subrepo
186 M .hgsub
186 M .hgsub
@@ -305,7 +305,7 b' handle subrepos safely on qrecord'
305
305
306 warning: subrepo spec file '.hgsub' not found
306 warning: subrepo spec file '.hgsub' not found
307 warning: subrepo spec file '.hgsub' not found
307 warning: subrepo spec file '.hgsub' not found
308 abort: uncommitted changes in subrepository 'sub'
308 abort: uncommitted changes in subrepository "sub"
309 [255]
309 [255]
310 % update substate when adding .hgsub w/clean updated subrepo
310 % update substate when adding .hgsub w/clean updated subrepo
311 A .hgsub
311 A .hgsub
@@ -342,7 +342,7 b' handle subrepos safely on qrecord'
342 +sub2 = sub2
342 +sub2 = sub2
343 record this change to '.hgsub'? [Ynesfdaq?] y
343 record this change to '.hgsub'? [Ynesfdaq?] y
344
344
345 abort: uncommitted changes in subrepository 'sub2'
345 abort: uncommitted changes in subrepository "sub2"
346 [255]
346 [255]
347 % update substate when modifying .hgsub w/clean updated subrepo
347 % update substate when modifying .hgsub w/clean updated subrepo
348 M .hgsub
348 M .hgsub
@@ -127,7 +127,7 b' Abort pull early with unclean subrepo:'
127 $ echo a > s/a
127 $ echo a > s/a
128 $ hg -R s add s/a
128 $ hg -R s add s/a
129 $ hg pull --rebase
129 $ hg pull --rebase
130 abort: uncommitted changes in subrepository 's'
130 abort: uncommitted changes in subrepository "s"
131 (cannot pull with rebase: please commit or shelve your changes first)
131 (cannot pull with rebase: please commit or shelve your changes first)
132 [255]
132 [255]
133
133
@@ -156,7 +156,7 b' user b push changes'
156
156
157 $ hg push 2>/dev/null
157 $ hg push 2>/dev/null
158 pushing to $TESTTMP/t (glob)
158 pushing to $TESTTMP/t (glob)
159 pushing branch testing of subrepo s
159 pushing branch testing of subrepository "s"
160 searching for changes
160 searching for changes
161 adding changesets
161 adding changesets
162 adding manifests
162 adding manifests
@@ -200,7 +200,7 b' user a pulls, merges, commits'
200 revision f47b465e1bce645dbf37232a00574aa1546ca8d3
200 revision f47b465e1bce645dbf37232a00574aa1546ca8d3
201 $ hg push 2>/dev/null
201 $ hg push 2>/dev/null
202 pushing to $TESTTMP/t (glob)
202 pushing to $TESTTMP/t (glob)
203 pushing branch testing of subrepo s
203 pushing branch testing of subrepository "s"
204 searching for changes
204 searching for changes
205 adding changesets
205 adding changesets
206 adding manifests
206 adding manifests
@@ -224,7 +224,7 b' make and push changes to hg without upda'
224 $ hg clone . ../td 2>&1 | egrep -v '^Cloning into|^done\.'
224 $ hg clone . ../td 2>&1 | egrep -v '^Cloning into|^done\.'
225 updating to branch default
225 updating to branch default
226 cloning subrepo s from $TESTTMP/gitroot
226 cloning subrepo s from $TESTTMP/gitroot
227 checking out detached HEAD in subrepo s
227 checking out detached HEAD in subrepository "s"
228 check out a git branch if you intend to make changes
228 check out a git branch if you intend to make changes
229 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
229 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
230 $ cd ../td
230 $ cd ../td
@@ -389,10 +389,10 b" Don't crash if the subrepo is missing"
389 $ hg sum | grep commit
389 $ hg sum | grep commit
390 commit: 1 subrepos
390 commit: 1 subrepos
391 $ hg push -q
391 $ hg push -q
392 abort: subrepo s is missing (in subrepo s)
392 abort: subrepo s is missing (in subrepository "s")
393 [255]
393 [255]
394 $ hg commit --subrepos -qm missing
394 $ hg commit --subrepos -qm missing
395 abort: subrepo s is missing (in subrepo s)
395 abort: subrepo s is missing (in subrepository "s")
396 [255]
396 [255]
397
397
398 #if symlink
398 #if symlink
@@ -400,10 +400,10 b" Don't crash if subrepo is a broken symli"
400 $ ln -s broken s
400 $ ln -s broken s
401 $ hg status -S
401 $ hg status -S
402 $ hg push -q
402 $ hg push -q
403 abort: subrepo s is missing (in subrepo s)
403 abort: subrepo s is missing (in subrepository "s")
404 [255]
404 [255]
405 $ hg commit --subrepos -qm missing
405 $ hg commit --subrepos -qm missing
406 abort: subrepo s is missing (in subrepo s)
406 abort: subrepo s is missing (in subrepository "s")
407 [255]
407 [255]
408 $ rm s
408 $ rm s
409 #endif
409 #endif
@@ -702,7 +702,7 b' Test that sanitizing is omitted in meta '
702 $ mkdir s/.git/.hg
702 $ mkdir s/.git/.hg
703 $ echo '.hg/hgrc in git metadata area' > s/.git/.hg/hgrc
703 $ echo '.hg/hgrc in git metadata area' > s/.git/.hg/hgrc
704 $ hg update -q -C af6d2edbb0d3
704 $ hg update -q -C af6d2edbb0d3
705 checking out detached HEAD in subrepo s
705 checking out detached HEAD in subrepository "s"
706 check out a git branch if you intend to make changes
706 check out a git branch if you intend to make changes
707
707
708 check differences made by most recent change
708 check differences made by most recent change
@@ -1160,7 +1160,7 b' test for Git CVE-2016-3068'
1160 fatal: transport 'ext' not allowed
1160 fatal: transport 'ext' not allowed
1161 updating to branch default
1161 updating to branch default
1162 cloning subrepo s from ext::sh -c echo% pwned:% $PWNED_MSG% >pwned.txt
1162 cloning subrepo s from ext::sh -c echo% pwned:% $PWNED_MSG% >pwned.txt
1163 abort: git clone error 128 in s (in subrepo s)
1163 abort: git clone error 128 in s (in subrepository "s")
1164 [255]
1164 [255]
1165 $ f -Dq pwned.txt
1165 $ f -Dq pwned.txt
1166 pwned.txt: file not found
1166 pwned.txt: file not found
@@ -1176,7 +1176,7 b' whitelisting of ext should be respected '
1176 and the repository exists.
1176 and the repository exists.
1177 updating to branch default
1177 updating to branch default
1178 cloning subrepo s from ext::sh -c echo% pwned:% $PWNED_MSG% >pwned.txt
1178 cloning subrepo s from ext::sh -c echo% pwned:% $PWNED_MSG% >pwned.txt
1179 abort: git clone error 128 in s (in subrepo s)
1179 abort: git clone error 128 in s (in subrepository "s")
1180 [255]
1180 [255]
1181 $ f -Dq pwned.txt
1181 $ f -Dq pwned.txt
1182 pwned: you asked for it
1182 pwned: you asked for it
@@ -92,7 +92,7 b' check that we can update parent repo wit'
92 $ hg commit --amend -m "addb (amended)"
92 $ hg commit --amend -m "addb (amended)"
93 $ cd ..
93 $ cd ..
94 $ hg update --clean .
94 $ hg update --clean .
95 revision 102a90ea7b4a in subrepo subrepo is hidden
95 revision 102a90ea7b4a in subrepository "subrepo" is hidden
96 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
96 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
97
97
98 check that --hidden is propagated to the subrepo
98 check that --hidden is propagated to the subrepo
@@ -59,7 +59,7 b' Test recursive diff without committing a'
59 Commits:
59 Commits:
60
60
61 $ hg commit -m fails
61 $ hg commit -m fails
62 abort: uncommitted changes in subrepository 'foo'
62 abort: uncommitted changes in subrepository "foo"
63 (use --subrepos for recursive commit)
63 (use --subrepos for recursive commit)
64 [255]
64 [255]
65
65
@@ -495,7 +495,7 b' created by archive:'
495 $ echo f > foo/f
495 $ echo f > foo/f
496 $ hg archive --subrepos -r tip archive
496 $ hg archive --subrepos -r tip archive
497 cloning subrepo foo from $TESTTMP/empty/foo
497 cloning subrepo foo from $TESTTMP/empty/foo
498 abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepo foo) (glob)
498 abort: destination '$TESTTMP/almost-empty/foo' is not empty (in subrepository "foo") (glob)
499 [255]
499 [255]
500
500
501 Clone and test outgoing:
501 Clone and test outgoing:
@@ -113,7 +113,7 b' missing svn file, commit should fail'
113 $ rm s/alpha
113 $ rm s/alpha
114 $ hg commit --subrepos -m 'abort on missing file'
114 $ hg commit --subrepos -m 'abort on missing file'
115 committing subrepository s
115 committing subrepository s
116 abort: cannot commit missing svn entries (in subrepo s)
116 abort: cannot commit missing svn entries (in subrepository "s")
117 [255]
117 [255]
118 $ svn revert s/alpha > /dev/null
118 $ svn revert s/alpha > /dev/null
119
119
@@ -170,7 +170,7 b' this commit fails because of externals c'
170 $ echo zzz > s/externals/other
170 $ echo zzz > s/externals/other
171 $ hg ci --subrepos -m 'amend externals from hg'
171 $ hg ci --subrepos -m 'amend externals from hg'
172 committing subrepository s
172 committing subrepository s
173 abort: cannot commit svn externals (in subrepo s)
173 abort: cannot commit svn externals (in subrepository "s")
174 [255]
174 [255]
175 $ hg diff --subrepos -r 1:2 | grep -v diff
175 $ hg diff --subrepos -r 1:2 | grep -v diff
176 --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
176 --- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
@@ -192,7 +192,7 b' this commit fails because of externals m'
192 property 'svn:mime-type' set on 's/externals/other' (glob)
192 property 'svn:mime-type' set on 's/externals/other' (glob)
193 $ hg ci --subrepos -m 'amend externals from hg'
193 $ hg ci --subrepos -m 'amend externals from hg'
194 committing subrepository s
194 committing subrepository s
195 abort: cannot commit svn externals (in subrepo s)
195 abort: cannot commit svn externals (in subrepository "s")
196 [255]
196 [255]
197 $ svn revert -q s/externals/other
197 $ svn revert -q s/externals/other
198
198
@@ -111,7 +111,7 b' commands that require a clean repo shoul'
111
111
112 $ echo b >> s/a
112 $ echo b >> s/a
113 $ hg backout tip
113 $ hg backout tip
114 abort: uncommitted changes in subrepository 's'
114 abort: uncommitted changes in subrepository "s"
115 [255]
115 [255]
116 $ hg revert -C -R s s/a
116 $ hg revert -C -R s s/a
117
117
@@ -163,7 +163,7 b' leave sub dirty (and check ui.commitsubr'
163
163
164 $ echo c > s/a
164 $ echo c > s/a
165 $ hg --config ui.commitsubrepos=no ci -m4
165 $ hg --config ui.commitsubrepos=no ci -m4
166 abort: uncommitted changes in subrepository 's'
166 abort: uncommitted changes in subrepository "s"
167 (use --subrepos for recursive commit)
167 (use --subrepos for recursive commit)
168 [255]
168 [255]
169 $ hg id
169 $ hg id
@@ -305,7 +305,7 b' merge tests'
305 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)
305 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)
306 starting 4 threads for background file closing (?)
306 starting 4 threads for background file closing (?)
307 (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m
307 (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m
308 merging subrepo t
308 merging subrepository "t"
309 searching for copies back to rev 2
309 searching for copies back to rev 2
310 resolving manifests
310 resolving manifests
311 branchmerge: True, force: False, partial: False
311 branchmerge: True, force: False, partial: False
@@ -516,7 +516,7 b' push -f'
516 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
516 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
517 pushing subrepo s to $TESTTMP/t/s
517 pushing subrepo s to $TESTTMP/t/s
518 searching for changes
518 searching for changes
519 abort: push creates new remote head 12a213df6fa9! (in subrepo s)
519 abort: push creates new remote head 12a213df6fa9! (in subrepository "s")
520 (merge or see 'hg help push' for details about pushing new heads)
520 (merge or see 'hg help push' for details about pushing new heads)
521 [255]
521 [255]
522 $ hg push -f
522 $ hg push -f
@@ -747,7 +747,7 b' bogus subrepo path aborts'
747
747
748 $ echo 'bogus=[boguspath' >> .hgsub
748 $ echo 'bogus=[boguspath' >> .hgsub
749 $ hg ci -m 'bogus subrepo path'
749 $ hg ci -m 'bogus subrepo path'
750 abort: missing ] in subrepo source
750 abort: missing ] in subrepository source
751 [255]
751 [255]
752
752
753 Issue1986: merge aborts when trying to merge a subrepo that
753 Issue1986: merge aborts when trying to merge a subrepo that
@@ -955,7 +955,7 b' Issue1977: multirepo push should fail if'
955 created new head
955 created new head
956 $ hg -R repo2 ci -m3
956 $ hg -R repo2 ci -m3
957 $ hg -q -R repo2 push
957 $ hg -q -R repo2 push
958 abort: push creates new remote head cc505f09a8b2! (in subrepo s)
958 abort: push creates new remote head cc505f09a8b2! (in subrepository "s")
959 (merge or see 'hg help push' for details about pushing new heads)
959 (merge or see 'hg help push' for details about pushing new heads)
960 [255]
960 [255]
961 $ hg -R repo update
961 $ hg -R repo update
@@ -983,7 +983,7 b' filesystem (see also issue4583))'
983 > EOF
983 > EOF
984 $ hg -R repo update
984 $ hg -R repo update
985 b: untracked file differs
985 b: untracked file differs
986 abort: untracked files in working directory differ from files in requested revision (in subrepo s)
986 abort: untracked files in working directory differ from files in requested revision (in subrepository "s")
987 [255]
987 [255]
988 $ cat >> repo/.hg/hgrc <<EOF
988 $ cat >> repo/.hg/hgrc <<EOF
989 > [extensions]
989 > [extensions]
@@ -1055,7 +1055,7 b' Create repo without default path, pull t'
1055 added 2 changesets with 3 changes to 2 files
1055 added 2 changesets with 3 changes to 2 files
1056 (run 'hg update' to get a working copy)
1056 (run 'hg update' to get a working copy)
1057 $ hg -R issue1852b update
1057 $ hg -R issue1852b update
1058 abort: default path for subrepository not found (in subrepo sub/repo) (glob)
1058 abort: default path for subrepository not found (in subrepository "sub/repo") (glob)
1059 [255]
1059 [255]
1060
1060
1061 Ensure a full traceback, not just the SubrepoAbort part
1061 Ensure a full traceback, not just the SubrepoAbort part
@@ -173,7 +173,7 b' Cases are run as shown in that table, ro'
173 M foo
173 M foo
174
174
175 $ revtest '-c dirtysub linear' dirtysub 1 2 -c
175 $ revtest '-c dirtysub linear' dirtysub 1 2 -c
176 abort: uncommitted changes in subrepository 'sub'
176 abort: uncommitted changes in subrepository "sub"
177 parent=1
177 parent=1
178 M sub/suba
178 M sub/suba
179
179
General Comments 0
You need to be logged in to leave comments. Login now