Mercurial > hg
changeset 18324:2eae2f9e85ef
merge with stable
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Mon, 14 Jan 2013 10:17:06 -0600 |
parents | 60680d691a0b (current diff) 7648b87e76db (diff) |
children | 297bf69966a0 |
files | hgext/convert/__init__.py hgext/histedit.py tests/test-convert.t |
diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/__init__.py Sun Jan 13 21:36:35 2013 +0100 +++ b/hgext/convert/__init__.py Mon Jan 14 10:17:06 2013 -0600 @@ -195,12 +195,12 @@ environment variable) for changeset date/times. The default is False (use UTC). - :hook.cvslog: Specify a Python function to be called at the end of + :hooks.cvslog: Specify a Python function to be called at the end of gathering the CVS log. The function is passed a list with the log entries, and can modify the entries in-place, or add or delete them. - :hook.cvschangesets: Specify a Python function to be called after + :hooks.cvschangesets: Specify a Python function to be called after the changesets are calculated from the CVS log. The function is passed a list with the changeset entries, and can modify the changesets in-place, or add or delete them.
--- a/hgext/histedit.py Sun Jan 13 21:36:35 2013 +0100 +++ b/hgext/histedit.py Mon Jan 14 10:17:06 2013 -0600 @@ -28,7 +28,7 @@ pick 030b686bedc4 Add gamma pick 7c2fd3b9020c Add delta - # Edit history between 633536316234 and 7c2fd3b9020c + # Edit history between c561b4e977df and 7c2fd3b9020c # # Commands: # p, pick = use commit @@ -47,7 +47,7 @@ pick c561b4e977df Add beta fold 7c2fd3b9020c Add delta - # Edit history between 633536316234 and 7c2fd3b9020c + # Edit history between c561b4e977df and 7c2fd3b9020c # # Commands: # p, pick = use commit @@ -108,8 +108,8 @@ have made and return to the state before you attempted to edit your history. -If we clone the example repository above and add three more changes, such that -we have the following history:: +If we clone the histedit-ed example repository above and add four more +changes, such that we have the following history:: @ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan | Add theta
--- a/tests/test-convert.t Sun Jan 13 21:36:35 2013 +0100 +++ b/tests/test-convert.t Mon Jan 14 10:17:06 2013 -0600 @@ -176,11 +176,11 @@ use local time (as determined by the TZ environment variable) for changeset date/times. The default is False (use UTC). - hook.cvslog Specify a Python function to be called at the end of + hooks.cvslog Specify a Python function to be called at the end of gathering the CVS log. The function is passed a list with the log entries, and can modify the entries in-place, or add or delete them. - hook.cvschangesets + hooks.cvschangesets Specify a Python function to be called after the changesets are calculated from the CVS log. The function is passed a list with the changeset entries, and can modify the