##// END OF EJS Templates
merge with stable
Martin Geisler -
r14357:cb4ff8ef merge default
parent child Browse files
Show More
@@ -333,7 +333,8 b' def closed(repo, subset, x):'
333
333
334 def contains(repo, subset, x):
334 def contains(repo, subset, x):
335 """``contains(pattern)``
335 """``contains(pattern)``
336 Revision contains pattern.
336 Revision contains a file matching pattern. See :hg:`help patterns`
337 for information about file patterns.
337 """
338 """
338 # i18n: "contains" is a keyword
339 # i18n: "contains" is a keyword
339 pat = getstring(x, _("contains requires a pattern"))
340 pat = getstring(x, _("contains requires a pattern"))
@@ -432,7 +433,8 b' def getall(repo, subset, x):'
432 def grep(repo, subset, x):
433 def grep(repo, subset, x):
433 """``grep(regex)``
434 """``grep(regex)``
434 Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``
435 Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``
435 to ensure special escape characters are handled correctly.
436 to ensure special escape characters are handled correctly. Unlike
437 ``keyword(string)``, the match is case-sensitive.
436 """
438 """
437 try:
439 try:
438 # i18n: "grep" is a keyword
440 # i18n: "grep" is a keyword
@@ -485,7 +487,7 b' def heads(repo, subset, x):'
485 def keyword(repo, subset, x):
487 def keyword(repo, subset, x):
486 """``keyword(string)``
488 """``keyword(string)``
487 Search commit message, user name, and names of changed files for
489 Search commit message, user name, and names of changed files for
488 string.
490 string. The match is case-insensitive.
489 """
491 """
490 # i18n: "keyword" is a keyword
492 # i18n: "keyword" is a keyword
491 kw = getstring(x, _("keyword requires a string")).lower()
493 kw = getstring(x, _("keyword requires a string")).lower()
@@ -780,7 +782,7 b' def sort(repo, subset, x):'
780 return [e[-1] for e in l]
782 return [e[-1] for e in l]
781
783
782 def tag(repo, subset, x):
784 def tag(repo, subset, x):
783 """``tag(name)``
785 """``tag([name])``
784 The specified tag by name, or all tagged revisions if no name is given.
786 The specified tag by name, or all tagged revisions if no name is given.
785 """
787 """
786 # i18n: "tag" is a keyword
788 # i18n: "tag" is a keyword
@@ -802,7 +804,7 b' def tagged(repo, subset, x):'
802
804
803 def user(repo, subset, x):
805 def user(repo, subset, x):
804 """``user(string)``
806 """``user(string)``
805 User name is string.
807 User name contains string. The match is case-insensitive.
806 """
808 """
807 return author(repo, subset, x)
809 return author(repo, subset, x)
808
810
General Comments 0
You need to be logged in to leave comments. Login now