Mercurial > hg-stable
changeset 11956:03b5ad552b42 stable
merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 17 Aug 2010 17:40:53 -0500 |
| parents | d157e040ac4c (diff) 7581be63baf9 (current diff) |
| children | 60bfb876dc45 df95b31bbdd7 |
| files | |
| diffstat | 2 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Tue Aug 17 12:02:34 2010 -0300 +++ b/mercurial/cmdutil.py Tue Aug 17 17:40:53 2010 -0500 @@ -663,7 +663,7 @@ fp.write(s) if stat: - diffopts.context = 0 + diffopts = diffopts.copy(context=0) width = 80 if not ui.plain(): width = util.termwidth() @@ -803,10 +803,17 @@ matchfn = self.patch if matchfn: stat = self.diffopts.get('stat') + diff = self.diffopts.get('patch') diffopts = patch.diffopts(self.ui, self.diffopts) prev = self.repo.changelog.parents(node)[0] - diffordiffstat(self.ui, self.repo, diffopts, prev, node, - match=matchfn, stat=stat) + if stat: + diffordiffstat(self.ui, self.repo, diffopts, prev, node, + match=matchfn, stat=True) + if diff: + if stat: + self.ui.write("\n") + diffordiffstat(self.ui, self.repo, diffopts, prev, node, + match=matchfn, stat=False) self.ui.write("\n") def _meaningful_parentrevs(self, log, rev):
--- a/mercurial/help/glossary.txt Tue Aug 17 12:02:34 2010 -0300 +++ b/mercurial/help/glossary.txt Tue Aug 17 17:40:53 2010 -0500 @@ -42,6 +42,17 @@ Branch head See 'Head, branch'. +Branch, inactive + If a named branch has no topological heads, it is considered to be + inactive. As an example, a feature branch becomes inactive when it + is merged into the default branch. The :hg:`branches` command + shows inactive branches by default, though they can be hidden with + :hg:`branches --active`. + + NOTE: this concept is deprecated because it is too implicit. + Branches should now be explicitly closed using :hg:`commit + --close-branch` when they are no longer needed. + Branch, named A collection of changesets which have the same branch name. By default, children of a changeset in a named branch belong to the