##// END OF EJS Templates
merge with crew
Matt Mackall -
r15644:43bb9c5a merge default
parent child Browse files
Show More
@@ -588,8 +588,14 b' def diffordiffstat(ui, repo, diffopts, n'
588 ctx1 = repo[node1]
588 ctx1 = repo[node1]
589 ctx2 = repo[node2]
589 ctx2 = repo[node2]
590 for subpath, sub in subrepo.itersubrepos(ctx1, ctx2):
590 for subpath, sub in subrepo.itersubrepos(ctx1, ctx2):
591 if node2 is not None:
591 try:
592 node2 = ctx2.substate[subpath][1]
592 if node2 is not None:
593 node2 = ctx2.substate[subpath][1]
594 except KeyError:
595 # A subrepo that existed in node1 was deleted between node1 and
596 # node2 (inclusive). Thus, ctx2's substate won't contain that
597 # subpath. The best we can do is to ignore it.
598 node2 = None
593 submatch = matchmod.narrowmatcher(subpath, match)
599 submatch = matchmod.narrowmatcher(subpath, match)
594 sub.diff(diffopts, node2, submatch, changes=changes,
600 sub.diff(diffopts, node2, submatch, changes=changes,
595 stat=stat, fp=fp, prefix=prefix)
601 stat=stat, fp=fp, prefix=prefix)
@@ -5157,7 +5157,8 b' def status(ui, repo, *pats, **opts):'
5157
5157
5158 Examples:
5158 Examples:
5159
5159
5160 - show changes in the working directory relative to a changeset:
5160 - show changes in the working directory relative to a
5161 changeset::
5161
5162
5162 hg status --rev 9353
5163 hg status --rev 9353
5163
5164
@@ -259,7 +259,6 b' class cmdalias(object):'
259 return 1
259 return 1
260 self.fn = fn
260 self.fn = fn
261 self.badalias = True
261 self.badalias = True
262
263 return
262 return
264
263
265 if self.definition.startswith('!'):
264 if self.definition.startswith('!'):
@@ -885,6 +885,22 b' Test that removing .hgsub removes .hgsub'
885 rm2
885 rm2
886
886
887
887
888 Test issue3153: diff -S with deleted subrepos
889
890 $ hg diff --nodates -S -c .
891 diff -r 3941e0aa5236 -r 8b31de9d13d1 .hgsub
892 --- a/.hgsub
893 +++ /dev/null
894 @@ -1,2 +0,0 @@
895 -s = s
896 -t = t
897 diff -r 3941e0aa5236 -r 8b31de9d13d1 .hgsubstate
898 --- a/.hgsubstate
899 +++ /dev/null
900 @@ -1,2 +0,0 @@
901 -fc627a69481fcbe5f1135069e8a3881c023e4cf5 s
902 -e95bcfa18a358dc4936da981ebf4147b4cad1362 t
903
888 Test behavior of add for explicit path in subrepo:
904 Test behavior of add for explicit path in subrepo:
889 $ cd ..
905 $ cd ..
890 $ hg init explicit
906 $ hg init explicit
General Comments 0
You need to be logged in to leave comments. Login now