Rev 3115: Add -l short name for the --limit argument in log (Matt Nordhoff) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Dec 15 18:17:50 GMT 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3115
revision-id:pqm at pqm.ubuntu.com-20071215181742-1drv2xnx3fk682wq
parent: pqm at pqm.ubuntu.com-20071215171848-q9o5tmkf3mvvunp8
parent: aaron.bentley at utoronto.ca-20071215163713-chyxm1eao3b5u3jn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-12-15 18:17:42 +0000
message:
Add -l short name for the --limit argument in log (Matt Nordhoff)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3108.1.5
revision-id:aaron.bentley at utoronto.ca-20071215163713-chyxm1eao3b5u3jn
parent: aaron.bentley at utoronto.ca-20071215163540-g04zcop5aj5h1nwh
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sat 2007-12-15 11:37:13 -0500
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3108.1.4
revision-id:aaron.bentley at utoronto.ca-20071215163540-g04zcop5aj5h1nwh
parent: mnordhoff at mattnordhoff.com-20071215131112-qyzs73tac5v6aza2
parent: pqm at pqm.ubuntu.com-20071214163914-dqiqxlhho36ce54r
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Sat 2007-12-15 11:35:40 -0500
message:
Merge bzr.dev
added:
index.txt index.txt-20071121073725-0corxykv5irjal00-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3108.1.3
revision-id:mnordhoff at mattnordhoff.com-20071215131112-qyzs73tac5v6aza2
parent: mnordhoff at mattnordhoff.com-20071214070613-pjziavvzyjbvpj1w
committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
branch nick: log-l
timestamp: Sat 2007-12-15 08:11:12 -0500
message:
Use assertContainsRe/assertNotContainsRe in tests.
modified:
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3108.1.2
revision-id:mnordhoff at mattnordhoff.com-20071214070613-pjziavvzyjbvpj1w
parent: mnordhoff at mattnordhoff.com-20071214070610-6is2z7y9gh1y82m7
committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
branch nick: log-l
timestamp: Fri 2007-12-14 02:06:13 -0500
message:
Simple copied unit test.
modified:
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
------------------------------------------------------------
revno: 3108.1.1
revision-id:mnordhoff at mattnordhoff.com-20071214070610-6is2z7y9gh1y82m7
parent: pqm at pqm.ubuntu.com-20071213191437-c42q84tx9pf0e2tk
committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
branch nick: log-l
timestamp: Fri 2007-12-14 02:06:10 -0500
message:
bzr log: Add -l short name for the --limit argument.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'NEWS'
--- a/NEWS 2007-12-14 15:38:28 +0000
+++ b/NEWS 2007-12-15 16:37:13 +0000
@@ -22,6 +22,8 @@
* ``reconfigure`` can now convert from repositories. (Aaron Bentley)
+ * ``-l`` is now a short form for ``--limit`` in ``log``. (Matt Nordhoff)
+
BUGFIXES:
* Fix Makefile rules for doc generation. (Ian Clatworthy, #175207)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-12-14 14:30:21 +0000
+++ b/bzrlib/builtins.py 2007-12-15 16:35:40 +0000
@@ -1666,6 +1666,7 @@
'regular expression.',
type=str),
Option('limit',
+ short_name='l',
help='Limit the output to the first N revisions.',
argname='N',
type=_parse_limit),
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py 2007-11-17 09:37:33 +0000
+++ b/bzrlib/tests/blackbox/test_log.py 2007-12-15 13:11:12 +0000
@@ -168,9 +168,16 @@
def test_log_limit(self):
self._prepare()
log = self.run_bzr("log --limit 2")[0]
- self.assertTrue('revno: 1\n' not in log)
- self.assertTrue('revno: 2\n' in log)
- self.assertTrue('revno: 3\n' in log)
+ self.assertNotContainsRe(log, r'revno: 1\n')
+ self.assertContainsRe(log, r'revno: 2\n')
+ self.assertContainsRe(log, r'revno: 3\n')
+
+ def test_log_limit_short(self):
+ self._prepare()
+ log = self.run_bzr("log -l 2")[0]
+ self.assertNotContainsRe(log, r'revno: 1\n')
+ self.assertContainsRe(log, r'revno: 2\n')
+ self.assertContainsRe(log, r'revno: 3\n')
class TestLogMerges(ExternalBase):
More information about the bazaar-commits
mailing list